diff --git a/.core_files.yaml b/.core_files.yaml
index 6fd3a74df92..e211b8ca5ec 100644
--- a/.core_files.yaml
+++ b/.core_files.yaml
@@ -79,7 +79,6 @@ components: &components
   - homeassistant/components/group/**
   - homeassistant/components/hassio/**
   - homeassistant/components/homeassistant/**
-  - homeassistant/components/homeassistant_hardware/**
   - homeassistant/components/http/**
   - homeassistant/components/image/**
   - homeassistant/components/input_boolean/**
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 44c38afdec6..df92976fb76 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -58,13 +58,7 @@
         ],
         "[python]": {
           "editor.defaultFormatter": "charliermarsh.ruff"
-        },
-        "json.schemas": [
-          {
-            "fileMatch": ["homeassistant/components/*/manifest.json"],
-            "url": "./script/json_schemas/manifest_schema.json"
-          }
-        ]
+        }
       }
     }
   }
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 9deb34d20e9..ad3205c51c8 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
-custom: https://www.openhomefoundation.org
+custom: https://www.nabucasa.com
+github: balloob
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index cc100c48fd8..66bf65eaaf5 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   BUILD_TYPE: core
-  DEFAULT_PYTHON: "3.13"
+  DEFAULT_PYTHON: "3.12"
   PIP_TIMEOUT: 60
   UV_HTTP_TIMEOUT: 60
   UV_SYSTEM_PYTHON: "true"
@@ -27,12 +27,12 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -90,7 +90,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -116,7 +116,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -242,7 +242,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Set build additional args
         run: |
@@ -279,7 +279,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -321,7 +321,7 @@ jobs:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Install Cosign
         uses: sigstore/cosign-installer@v3.7.0
@@ -451,10 +451,10 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -499,7 +499,7 @@ jobs:
       HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -531,7 +531,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
+        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fa05f6082a2..383243b5165 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -40,9 +40,9 @@ env:
   CACHE_VERSION: 11
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 9
-  HA_SHORT_VERSION: "2024.12"
+  HA_SHORT_VERSION: "2024.11"
   DEFAULT_PYTHON: "3.12"
-  ALL_PYTHON_VERSIONS: "['3.12', '3.13']"
+  ALL_PYTHON_VERSIONS: "['3.12']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: |
@@ -231,16 +231,16 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.1.1
         with:
           path: venv
           key: >-
@@ -256,7 +256,7 @@ jobs:
           uv pip install "$(cat requirements_test.txt | grep pre-commit)"
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.1.1
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           lookup-only: true
@@ -277,16 +277,16 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.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@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -295,7 +295,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -317,16 +317,16 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.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@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -335,7 +335,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -357,16 +357,16 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.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@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -375,7 +375,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -447,7 +447,7 @@ jobs:
           - script/hassfest/docker/Dockerfile
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Register hadolint problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/hadolint.json"
@@ -466,10 +466,10 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -482,7 +482,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.1.1
         with:
           path: venv
           lookup-only: true
@@ -491,7 +491,7 @@ jobs:
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.1.1
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
@@ -550,16 +550,16 @@ jobs:
           sudo apt-get -y install \
             libturbojpeg
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -583,16 +583,16 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -615,41 +615,37 @@ jobs:
         && github.event.inputs.mypy-only != 'true'
         || github.event.inputs.audit-licenses-only == 'true')
       && needs.info.outputs.requirements == 'true'
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/checkout@v4.2.1
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
           key: >-
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
-      - name: Extract license data
+      - name: Run pip-licenses
         run: |
           . venv/bin/activate
-          python -m script.licenses extract --output-file=licenses-${{ matrix.python-version }}.json
+          pip-licenses --format=json --output-file=licenses.json
       - name: Upload licenses
         uses: actions/upload-artifact@v4.4.3
         with:
-          name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
-          path: licenses-${{ matrix.python-version }}.json
-      - name: Check licenses
+          name: licenses
+          path: licenses.json
+      - name: Process licenses
         run: |
           . venv/bin/activate
-          python -m script.licenses check licenses-${{ matrix.python-version }}.json
+          python -m script.licenses licenses.json
 
   pylint:
     name: Check pylint
@@ -664,16 +660,16 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -711,16 +707,16 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -756,10 +752,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -772,7 +768,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -780,7 +776,7 @@ jobs:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.1.1
         with:
           path: .mypy_cache
           key: >-
@@ -819,7 +815,11 @@ jobs:
     needs:
       - info
       - base
-    name: Split tests for full run
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
+    name: Split tests for full run Python ${{ matrix.python-version }}
     steps:
       - name: Install additional OS dependencies
         run: |
@@ -831,16 +831,16 @@ jobs:
             libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/checkout@v4.2.1
+      - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
+          python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -854,7 +854,7 @@ jobs:
       - name: Upload pytest_buckets
         uses: actions/upload-artifact@v4.4.3
         with:
-          name: pytest_buckets
+          name: pytest_buckets-${{ matrix.python-version }}
           path: pytest_buckets.txt
           overwrite: true
 
@@ -895,16 +895,16 @@ jobs:
             libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -919,7 +919,7 @@ jobs:
       - name: Download pytest_buckets
         uses: actions/download-artifact@v4.1.8
         with:
-          name: pytest_buckets
+          name: pytest_buckets-${{ matrix.python-version }}
       - name: Compile English translations
         run: |
           . venv/bin/activate
@@ -945,7 +945,6 @@ jobs:
             --timeout=9 \
             --durations=10 \
             --numprocesses auto \
-            --snapshot-details \
             --dist=loadfile \
             ${cov_params[@]} \
             -o console_output_style=count \
@@ -1016,16 +1015,16 @@ jobs:
             libturbojpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1068,7 +1067,6 @@ jobs:
             -qq \
             --timeout=20 \
             --numprocesses 1 \
-            --snapshot-details \
             ${cov_params[@]} \
             -o console_output_style=count \
             --durations=10 \
@@ -1100,7 +1098,7 @@ jobs:
           ./script/check_dirty
 
   pytest-postgres:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: ${{ matrix.postgresql-group }}
@@ -1140,21 +1138,19 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
-            libturbojpeg
-          sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
-          sudo apt-get -y install \
+            libturbojpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1197,7 +1193,6 @@ jobs:
             -qq \
             --timeout=9 \
             --numprocesses 1 \
-            --snapshot-details \
             ${cov_params[@]} \
             -o console_output_style=count \
             --durations=0 \
@@ -1241,7 +1236,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v4.1.8
         with:
@@ -1292,16 +1287,16 @@ jobs:
             libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.1.1
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1344,7 +1339,6 @@ jobs:
             -qq \
             --timeout=9 \
             --numprocesses auto \
-            --snapshot-details \
             ${cov_params[@]} \
             -o console_output_style=count \
             --durations=0 \
@@ -1380,7 +1374,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v4.1.8
         with:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 48e37717232..1996843b247 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.27.3
+        uses: github/codeql-action/init@v3.26.13
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.27.3
+        uses: github/codeql-action/analyze@v3.26.13
         with:
           category: "/language:python"
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index 3fffc41e60c..b90f38b69bc 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b9f54bba081..78db2d3ae43 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -32,11 +32,11 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -112,11 +112,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp312", "cp313"]
+        abi: ["cp312"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Download env_file
         uses: actions/download-artifact@v4.1.8
@@ -135,14 +135,14 @@ jobs:
           sed -i "/uv/d" requirements_diff.txt
 
       - name: Build wheels
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.07.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
-          apk: "libffi-dev;openssl-dev;yaml-dev;nasm;zlib-dev"
+          apk: "libffi-dev;openssl-dev;yaml-dev;nasm"
           skip-binary: aiohttp;multidict;yarl
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
@@ -156,11 +156,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp312", "cp313"]
+        abi: ["cp312"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.2.1
 
       - name: Download env_file
         uses: actions/download-artifact@v4.1.8
@@ -198,7 +198,6 @@ jobs:
           split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all_wheels_${{ matrix.arch }}.txt requirements_all.txt
 
       - name: Create requirements for cython<3
-        if: matrix.abi == 'cp312'
         run: |
           # Some dependencies still require 'cython<3'
           # and don't yet use isolated build environments.
@@ -209,8 +208,7 @@ jobs:
           cat homeassistant/package_constraints.txt | grep 'pydantic==' >> requirements_old-cython.txt
 
       - name: Build wheels (old cython)
-        uses: home-assistant/wheels@2024.11.0
-        if: matrix.abi == 'cp312'
+        uses: home-assistant/wheels@2024.07.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -225,43 +223,43 @@ jobs:
           pip: "'cython<3'"
 
       - name: Build wheels (part 1)
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.07.1
         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;nasm;zlib-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+          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;nasm"
+          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
 
       - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.07.1
         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;nasm;zlib-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+          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;nasm"
+          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
 
       - name: Build wheels (part 3)
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.07.1
         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;nasm;zlib-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+          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;nasm"
+          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
           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 56fbabe8087..9a6be9435b1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.3
+    rev: v0.7.0
     hooks:
       - id: ruff
         args:
@@ -90,7 +90,7 @@ repos:
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(script/hassfest/metadata\.py|homeassistant/const\.py$|pyproject\.toml|homeassistant/components/go2rtc/const\.py)$
+        files: ^(script/hassfest/metadata\.py|homeassistant/const\.py$|pyproject\.toml)$
       - id: hassfest-mypy-config
         name: hassfest-mypy-config
         entry: script/run-in-env.sh python3 -m script.hassfest -p mypy_config
diff --git a/.strict-typing b/.strict-typing
index b0fd74bce54..e30413a0421 100644
--- a/.strict-typing
+++ b/.strict-typing
@@ -124,7 +124,6 @@ homeassistant.components.bryant_evolution.*
 homeassistant.components.bthome.*
 homeassistant.components.button.*
 homeassistant.components.calendar.*
-homeassistant.components.cambridge_audio.*
 homeassistant.components.camera.*
 homeassistant.components.canary.*
 homeassistant.components.cert_expiry.*
@@ -209,7 +208,6 @@ homeassistant.components.geo_location.*
 homeassistant.components.geocaching.*
 homeassistant.components.gios.*
 homeassistant.components.glances.*
-homeassistant.components.go2rtc.*
 homeassistant.components.goalzero.*
 homeassistant.components.google.*
 homeassistant.components.google_assistant_sdk.*
@@ -324,13 +322,11 @@ homeassistant.components.moon.*
 homeassistant.components.mopeka.*
 homeassistant.components.motionmount.*
 homeassistant.components.mqtt.*
-homeassistant.components.music_assistant.*
 homeassistant.components.my.*
 homeassistant.components.mysensors.*
 homeassistant.components.myuplink.*
 homeassistant.components.nam.*
 homeassistant.components.nanoleaf.*
-homeassistant.components.nasweb.*
 homeassistant.components.neato.*
 homeassistant.components.nest.*
 homeassistant.components.netatmo.*
@@ -340,7 +336,6 @@ homeassistant.components.nfandroidtv.*
 homeassistant.components.nightscout.*
 homeassistant.components.nissan_leaf.*
 homeassistant.components.no_ip.*
-homeassistant.components.nordpool.*
 homeassistant.components.notify.*
 homeassistant.components.notion.*
 homeassistant.components.number.*
diff --git a/.vscode/settings.default.json b/.vscode/settings.default.json
index ace0a988bf5..681698d08b3 100644
--- a/.vscode/settings.default.json
+++ b/.vscode/settings.default.json
@@ -6,13 +6,5 @@
   // https://code.visualstudio.com/docs/python/testing#_pytest-configuration-settings
   "python.testing.pytestEnabled": false,
   // https://code.visualstudio.com/docs/python/linting#_general-settings
-  "pylint.importStrategy": "fromEnvironment",
-  "json.schemas": [
-        {
-            "fileMatch": [
-                "homeassistant/components/*/manifest.json"
-            ],
-            "url": "./script/json_schemas/manifest_schema.json"
-        }
-    ]
+  "pylint.importStrategy": "fromEnvironment"
 }
diff --git a/CODEOWNERS b/CODEOWNERS
index e204463695e..24160bcdbb1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -40,8 +40,6 @@ build.json @home-assistant/supervisor
 # Integrations
 /homeassistant/components/abode/ @shred86
 /tests/components/abode/ @shred86
-/homeassistant/components/acaia/ @zweckj
-/tests/components/acaia/ @zweckj
 /homeassistant/components/accuweather/ @bieniu
 /tests/components/accuweather/ @bieniu
 /homeassistant/components/acmeda/ @atmurray
@@ -498,8 +496,8 @@ build.json @home-assistant/supervisor
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
 /tests/components/freedompro/ @stefano055415
-/homeassistant/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
-/tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
+/homeassistant/components/fritz/ @mammuth @AaronDavidSchneider @chemelli74 @mib1185
+/tests/components/fritz/ @mammuth @AaronDavidSchneider @chemelli74 @mib1185
 /homeassistant/components/fritzbox/ @mib1185 @flabbamann
 /tests/components/fritzbox/ @mib1185 @flabbamann
 /homeassistant/components/fritzbox_callmonitor/ @cdce8p
@@ -619,8 +617,8 @@ build.json @home-assistant/supervisor
 /tests/components/hlk_sw16/ @jameshilliard
 /homeassistant/components/holiday/ @jrieger @gjohansson-ST
 /tests/components/holiday/ @jrieger @gjohansson-ST
-/homeassistant/components/home_connect/ @DavidMStraub @Diegorro98
-/tests/components/home_connect/ @DavidMStraub @Diegorro98
+/homeassistant/components/home_connect/ @DavidMStraub
+/tests/components/home_connect/ @DavidMStraub
 /homeassistant/components/homeassistant/ @home-assistant/core
 /tests/components/homeassistant/ @home-assistant/core
 /homeassistant/components/homeassistant_alerts/ @home-assistant/core
@@ -661,8 +659,6 @@ build.json @home-assistant/supervisor
 /tests/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /homeassistant/components/husqvarna_automower/ @Thomas55555
 /tests/components/husqvarna_automower/ @Thomas55555
-/homeassistant/components/husqvarna_automower_ble/ @alistair23
-/tests/components/husqvarna_automower_ble/ @alistair23
 /homeassistant/components/huum/ @frwickst
 /tests/components/huum/ @frwickst
 /homeassistant/components/hvv_departures/ @vigonotion
@@ -823,8 +819,6 @@ build.json @home-assistant/supervisor
 /tests/components/lektrico/ @lektrico
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
-/homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
-/tests/components/lg_thinq/ @LG-ThinQ-Integration
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/lifx/ @Djelibeybi
@@ -956,8 +950,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/msteams/ @peroyvind
 /homeassistant/components/mullvad/ @meichthys
 /tests/components/mullvad/ @meichthys
-/homeassistant/components/music_assistant/ @music-assistant
-/tests/components/music_assistant/ @music-assistant
 /homeassistant/components/mutesync/ @currentoor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
@@ -972,8 +964,6 @@ build.json @home-assistant/supervisor
 /tests/components/nam/ @bieniu
 /homeassistant/components/nanoleaf/ @milanmeu @joostlek
 /tests/components/nanoleaf/ @milanmeu @joostlek
-/homeassistant/components/nasweb/ @nasWebio
-/tests/components/nasweb/ @nasWebio
 /homeassistant/components/neato/ @Santobert
 /tests/components/neato/ @Santobert
 /homeassistant/components/nederlandse_spoorwegen/ @YarmoM
@@ -1014,8 +1004,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/noaa_tides/ @jdelaney72
 /homeassistant/components/nobo_hub/ @echoromeo @oyvindwe
 /tests/components/nobo_hub/ @echoromeo @oyvindwe
-/homeassistant/components/nordpool/ @gjohansson-ST
-/tests/components/nordpool/ @gjohansson-ST
 /homeassistant/components/notify/ @home-assistant/core
 /tests/components/notify/ @home-assistant/core
 /homeassistant/components/notify_events/ @matrozov @papajojo
@@ -1059,7 +1047,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/onewire/ @garbled1 @epenet
 /tests/components/onewire/ @garbled1 @epenet
 /homeassistant/components/onkyo/ @arturpragacz
-/tests/components/onkyo/ @arturpragacz
 /homeassistant/components/onvif/ @hunterjm
 /tests/components/onvif/ @hunterjm
 /homeassistant/components/open_meteo/ @frenck
@@ -1101,8 +1088,6 @@ build.json @home-assistant/supervisor
 /tests/components/ovo_energy/ @timmo001
 /homeassistant/components/p1_monitor/ @klaasnicolaas
 /tests/components/p1_monitor/ @klaasnicolaas
-/homeassistant/components/palazzetti/ @dotvav
-/tests/components/palazzetti/ @dotvav
 /homeassistant/components/panel_custom/ @home-assistant/frontend
 /tests/components/panel_custom/ @home-assistant/frontend
 /homeassistant/components/peco/ @IceBotYT
@@ -1346,8 +1331,6 @@ build.json @home-assistant/supervisor
 /tests/components/siren/ @home-assistant/core @raman325
 /homeassistant/components/sisyphus/ @jkeljo
 /homeassistant/components/sky_hub/ @rogerselwyn
-/homeassistant/components/sky_remote/ @dunnmj @saty9
-/tests/components/sky_remote/ @dunnmj @saty9
 /homeassistant/components/skybell/ @tkdrob
 /tests/components/skybell/ @tkdrob
 /homeassistant/components/slack/ @tkdrob @fletcherau
@@ -1366,7 +1349,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/smarttub/ @mdz
 /tests/components/smarttub/ @mdz
 /homeassistant/components/smarty/ @z0mbieprocess
-/tests/components/smarty/ @z0mbieprocess
 /homeassistant/components/smhi/ @gjohansson-ST
 /tests/components/smhi/ @gjohansson-ST
 /homeassistant/components/smlight/ @tl-sl
@@ -1430,8 +1412,8 @@ build.json @home-assistant/supervisor
 /tests/components/stt/ @home-assistant/core
 /homeassistant/components/subaru/ @G-Two
 /tests/components/subaru/ @G-Two
-/homeassistant/components/suez_water/ @ooii @jb101010-2
-/tests/components/suez_water/ @ooii @jb101010-2
+/homeassistant/components/suez_water/ @ooii
+/tests/components/suez_water/ @ooii
 /homeassistant/components/sun/ @Swamp-Ig
 /tests/components/sun/ @Swamp-Ig
 /homeassistant/components/sunweg/ @rokam
@@ -1489,8 +1471,8 @@ build.json @home-assistant/supervisor
 /tests/components/tedee/ @patrickhilker @zweckj
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
-/homeassistant/components/template/ @PhracturedBlue @home-assistant/core
-/tests/components/template/ @PhracturedBlue @home-assistant/core
+/homeassistant/components/template/ @PhracturedBlue @tetienne @home-assistant/core
+/tests/components/template/ @PhracturedBlue @tetienne @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
 /tests/components/tesla_fleet/ @Bre77
 /homeassistant/components/tesla_wall_connector/ @einarhauks
diff --git a/Dockerfile b/Dockerfile
index 15574192093..2d95cf68d16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,13 +7,12 @@ FROM ${BUILD_FROM}
 # Synchronize with homeassistant/core.py:async_stop
 ENV \
     S6_SERVICES_GRACETIME=240000 \
-    UV_SYSTEM_PYTHON=true \
-    UV_NO_CACHE=true
+    UV_SYSTEM_PYTHON=true
 
 ARG QEMU_CPU
 
 # Install uv
-RUN pip3 install uv==0.5.0
+RUN pip3 install uv==0.4.22
 
 WORKDIR /usr/src
 
@@ -55,7 +54,7 @@ RUN \
         "armv7") go2rtc_suffix='arm' ;; \
         *) go2rtc_suffix=${BUILD_ARCH} ;; \
     esac \
-    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.7/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
+    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.4/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
     && chmod +x /bin/go2rtc \
     # Verify go2rtc can be executed
     && go2rtc --version
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 48f582a1581..d05c6df425c 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -35,9 +35,6 @@ RUN \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Add go2rtc binary
-COPY --from=ghcr.io/alexxit/go2rtc:latest /usr/local/bin/go2rtc /bin/go2rtc
-
 # Install uv
 RUN pip3 install uv
 
diff --git a/build.yaml b/build.yaml
index a8755bbbf5c..13618740ab8 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,10 +1,10 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2024.11.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.11.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.11.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.11.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.11.0
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2024.06.1
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.06.1
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.06.1
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.06.1
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.06.1
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index b9d98832705..4c870e94b24 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -9,7 +9,6 @@ import os
 import sys
 import threading
 
-from .backup_restore import restore_backup
 from .const import REQUIRED_PYTHON_VER, RESTART_EXIT_CODE, __version__
 
 FAULT_LOG_FILENAME = "home-assistant.log.fault"
@@ -183,9 +182,6 @@ def main() -> int:
         return scripts.run(args.script)
 
     config_dir = os.path.abspath(os.path.join(os.getcwd(), args.config))
-    if restore_backup(config_dir):
-        return RESTART_EXIT_CODE
-
     ensure_config_path(config_dir)
 
     # pylint: disable-next=import-outside-toplevel
diff --git a/homeassistant/backup_restore.py b/homeassistant/backup_restore.py
deleted file mode 100644
index 32991dfb2d3..00000000000
--- a/homeassistant/backup_restore.py
+++ /dev/null
@@ -1,126 +0,0 @@
-"""Home Assistant module to handle restoring backups."""
-
-from dataclasses import dataclass
-import json
-import logging
-from pathlib import Path
-import shutil
-import sys
-from tempfile import TemporaryDirectory
-
-from awesomeversion import AwesomeVersion
-import securetar
-
-from .const import __version__ as HA_VERSION
-
-RESTORE_BACKUP_FILE = ".HA_RESTORE"
-KEEP_PATHS = ("backups",)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class RestoreBackupFileContent:
-    """Definition for restore backup file content."""
-
-    backup_file_path: Path
-
-
-def restore_backup_file_content(config_dir: Path) -> RestoreBackupFileContent | None:
-    """Return the contents of the restore backup file."""
-    instruction_path = config_dir.joinpath(RESTORE_BACKUP_FILE)
-    try:
-        instruction_content = json.loads(instruction_path.read_text(encoding="utf-8"))
-        return RestoreBackupFileContent(
-            backup_file_path=Path(instruction_content["path"])
-        )
-    except (FileNotFoundError, json.JSONDecodeError):
-        return None
-
-
-def _clear_configuration_directory(config_dir: Path) -> None:
-    """Delete all files and directories in the config directory except for the backups directory."""
-    keep_paths = [config_dir.joinpath(path) for path in KEEP_PATHS]
-    config_contents = sorted(
-        [entry for entry in config_dir.iterdir() if entry not in keep_paths]
-    )
-
-    for entry in config_contents:
-        entrypath = config_dir.joinpath(entry)
-
-        if entrypath.is_file():
-            entrypath.unlink()
-        elif entrypath.is_dir():
-            shutil.rmtree(entrypath)
-
-
-def _extract_backup(config_dir: Path, backup_file_path: Path) -> None:
-    """Extract the backup file to the config directory."""
-    with (
-        TemporaryDirectory() as tempdir,
-        securetar.SecureTarFile(
-            backup_file_path,
-            gzip=False,
-            mode="r",
-        ) as ostf,
-    ):
-        ostf.extractall(
-            path=Path(tempdir, "extracted"),
-            members=securetar.secure_path(ostf),
-            filter="fully_trusted",
-        )
-        backup_meta_file = Path(tempdir, "extracted", "backup.json")
-        backup_meta = json.loads(backup_meta_file.read_text(encoding="utf8"))
-
-        if (
-            backup_meta_version := AwesomeVersion(
-                backup_meta["homeassistant"]["version"]
-            )
-        ) > HA_VERSION:
-            raise ValueError(
-                f"You need at least Home Assistant version {backup_meta_version} to restore this backup"
-            )
-
-        with securetar.SecureTarFile(
-            Path(
-                tempdir,
-                "extracted",
-                f"homeassistant.tar{'.gz' if backup_meta["compressed"] else ''}",
-            ),
-            gzip=backup_meta["compressed"],
-            mode="r",
-        ) as istf:
-            for member in istf.getmembers():
-                if member.name == "data":
-                    continue
-                member.name = member.name.replace("data/", "")
-            _clear_configuration_directory(config_dir)
-            istf.extractall(
-                path=config_dir,
-                members=[
-                    member
-                    for member in securetar.secure_path(istf)
-                    if member.name != "data"
-                ],
-                filter="fully_trusted",
-            )
-
-
-def restore_backup(config_dir_path: str) -> bool:
-    """Restore the backup file if any.
-
-    Returns True if a restore backup file was found and restored, False otherwise.
-    """
-    config_dir = Path(config_dir_path)
-    if not (restore_content := restore_backup_file_content(config_dir)):
-        return False
-
-    logging.basicConfig(stream=sys.stdout, level=logging.INFO)
-    backup_file_path = restore_content.backup_file_path
-    _LOGGER.info("Restoring %s", backup_file_path)
-    try:
-        _extract_backup(config_dir, backup_file_path)
-    except FileNotFoundError as err:
-        raise ValueError(f"Backup file {backup_file_path} does not exist") from err
-    _LOGGER.info("Restore complete, restarting")
-    return True
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 1034223051c..742a293e4c4 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -70,7 +70,6 @@ from .const import (
     REQUIRED_NEXT_PYTHON_VER,
     SIGNAL_BOOTSTRAP_INTEGRATIONS,
 )
-from .core_config import async_process_ha_core_config
 from .exceptions import HomeAssistantError
 from .helpers import (
     area_registry,
@@ -480,7 +479,7 @@ async def async_from_config_dict(
     core_config = config.get(core.DOMAIN, {})
 
     try:
-        await async_process_ha_core_config(hass, core_config)
+        await conf_util.async_process_ha_core_config(hass, core_config)
     except vol.Invalid as config_err:
         conf_util.async_log_schema_error(config_err, core.DOMAIN, core_config, hass)
         async_notify_setup_error(hass, core.DOMAIN)
@@ -515,7 +514,7 @@ async def async_from_config_dict(
         issue_registry.async_create_issue(
             hass,
             core.DOMAIN,
-            f"python_version_{required_python_version}",
+            "python_version",
             is_fixable=False,
             severity=issue_registry.IssueSeverity.WARNING,
             breaks_in_ha_version=REQUIRED_NEXT_PYTHON_HA_RELEASE,
diff --git a/homeassistant/brands/husqvarna.json b/homeassistant/brands/husqvarna.json
deleted file mode 100644
index a01eba75232..00000000000
--- a/homeassistant/brands/husqvarna.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "domain": "husqvarna",
-  "name": "Husqvarna",
-  "integrations": ["husqvarna_automower", "husqvarna_automower_ble"]
-}
diff --git a/homeassistant/brands/lg.json b/homeassistant/brands/lg.json
index 02bd58c0d1c..350db80b5f3 100644
--- a/homeassistant/brands/lg.json
+++ b/homeassistant/brands/lg.json
@@ -1,5 +1,5 @@
 {
   "domain": "lg",
   "name": "LG",
-  "integrations": ["lg_netcast", "lg_soundbar", "lg_thinq", "webostv"]
+  "integrations": ["lg_netcast", "lg_soundbar", "webostv"]
 }
diff --git a/homeassistant/brands/sky.json b/homeassistant/brands/sky.json
deleted file mode 100644
index 3ab0cbbe5bd..00000000000
--- a/homeassistant/brands/sky.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "domain": "sky",
-  "name": "Sky",
-  "integrations": ["sky_hub", "sky_remote"]
-}
diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py
index 4ec59ca4c39..b58a4757785 100644
--- a/homeassistant/components/abode/alarm_control_panel.py
+++ b/homeassistant/components/abode/alarm_control_panel.py
@@ -7,9 +7,13 @@ from jaraco.abode.devices.alarm import Alarm
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -40,14 +44,14 @@ class AbodeAlarm(AbodeDevice, AlarmControlPanelEntity):
     _device: Alarm
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         if self._device.is_standby:
-            return AlarmControlPanelState.DISARMED
+            return STATE_ALARM_DISARMED
         if self._device.is_away:
-            return AlarmControlPanelState.ARMED_AWAY
+            return STATE_ALARM_ARMED_AWAY
         if self._device.is_home:
-            return AlarmControlPanelState.ARMED_HOME
+            return STATE_ALARM_ARMED_HOME
         return None
 
     def alarm_disarm(self, code: str | None = None) -> None:
diff --git a/homeassistant/components/acaia/__init__.py b/homeassistant/components/acaia/__init__.py
deleted file mode 100644
index dfdb4cb935d..00000000000
--- a/homeassistant/components/acaia/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Initialize the Acaia component."""
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AcaiaConfigEntry, AcaiaCoordinator
-
-PLATFORMS = [
-    Platform.BUTTON,
-]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AcaiaConfigEntry) -> bool:
-    """Set up acaia as config entry."""
-
-    coordinator = AcaiaCoordinator(hass, entry)
-    await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AcaiaConfigEntry) -> bool:
-    """Unload a config entry."""
-
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/acaia/button.py b/homeassistant/components/acaia/button.py
deleted file mode 100644
index 50671eecbba..00000000000
--- a/homeassistant/components/acaia/button.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""Button entities for Acaia scales."""
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from typing import Any
-
-from aioacaia.acaiascale import AcaiaScale
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .coordinator import AcaiaConfigEntry
-from .entity import AcaiaEntity
-
-
-@dataclass(kw_only=True, frozen=True)
-class AcaiaButtonEntityDescription(ButtonEntityDescription):
-    """Description for acaia button entities."""
-
-    press_fn: Callable[[AcaiaScale], Coroutine[Any, Any, None]]
-
-
-BUTTONS: tuple[AcaiaButtonEntityDescription, ...] = (
-    AcaiaButtonEntityDescription(
-        key="tare",
-        translation_key="tare",
-        press_fn=lambda scale: scale.tare(),
-    ),
-    AcaiaButtonEntityDescription(
-        key="reset_timer",
-        translation_key="reset_timer",
-        press_fn=lambda scale: scale.reset_timer(),
-    ),
-    AcaiaButtonEntityDescription(
-        key="start_stop",
-        translation_key="start_stop",
-        press_fn=lambda scale: scale.start_stop_timer(),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AcaiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up button entities and services."""
-
-    coordinator = entry.runtime_data
-    async_add_entities(AcaiaButton(coordinator, description) for description in BUTTONS)
-
-
-class AcaiaButton(AcaiaEntity, ButtonEntity):
-    """Representation of an Acaia button."""
-
-    entity_description: AcaiaButtonEntityDescription
-
-    async def async_press(self) -> None:
-        """Handle the button press."""
-        await self.entity_description.press_fn(self._scale)
diff --git a/homeassistant/components/acaia/config_flow.py b/homeassistant/components/acaia/config_flow.py
deleted file mode 100644
index 36727059c8a..00000000000
--- a/homeassistant/components/acaia/config_flow.py
+++ /dev/null
@@ -1,149 +0,0 @@
-"""Config flow for Acaia integration."""
-
-import logging
-from typing import Any
-
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError, AcaiaUnknownDevice
-from aioacaia.helpers import is_new_scale
-import voluptuous as vol
-
-from homeassistant.components.bluetooth import (
-    BluetoothServiceInfoBleak,
-    async_discovered_service_info,
-)
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ADDRESS, CONF_NAME
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.selector import (
-    SelectOptionDict,
-    SelectSelector,
-    SelectSelectorConfig,
-    SelectSelectorMode,
-)
-
-from .const import CONF_IS_NEW_STYLE_SCALE, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class AcaiaConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for acaia."""
-
-    def __init__(self) -> None:
-        """Initialize the config flow."""
-        self._discovered: dict[str, Any] = {}
-        self._discovered_devices: dict[str, str] = {}
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initialized by the user."""
-
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            mac = format_mac(user_input[CONF_ADDRESS])
-            try:
-                is_new_style_scale = await is_new_scale(mac)
-            except AcaiaDeviceNotFound:
-                errors["base"] = "device_not_found"
-            except AcaiaError:
-                _LOGGER.exception("Error occurred while connecting to the scale")
-                errors["base"] = "unknown"
-            except AcaiaUnknownDevice:
-                return self.async_abort(reason="unsupported_device")
-            else:
-                await self.async_set_unique_id(mac)
-                self._abort_if_unique_id_configured()
-
-            if not errors:
-                return self.async_create_entry(
-                    title=self._discovered_devices[user_input[CONF_ADDRESS]],
-                    data={
-                        CONF_ADDRESS: mac,
-                        CONF_IS_NEW_STYLE_SCALE: is_new_style_scale,
-                    },
-                )
-
-        for device in async_discovered_service_info(self.hass):
-            self._discovered_devices[device.address] = device.name
-
-        if not self._discovered_devices:
-            return self.async_abort(reason="no_devices_found")
-
-        options = [
-            SelectOptionDict(
-                value=device_mac,
-                label=f"{device_name} ({device_mac})",
-            )
-            for device_mac, device_name in self._discovered_devices.items()
-        ]
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_ADDRESS): SelectSelector(
-                        SelectSelectorConfig(
-                            options=options,
-                            mode=SelectSelectorMode.DROPDOWN,
-                        )
-                    )
-                }
-            ),
-            errors=errors,
-        )
-
-    async def async_step_bluetooth(
-        self, discovery_info: BluetoothServiceInfoBleak
-    ) -> ConfigFlowResult:
-        """Handle a discovered Bluetooth device."""
-
-        self._discovered[CONF_ADDRESS] = mac = format_mac(discovery_info.address)
-        self._discovered[CONF_NAME] = discovery_info.name
-
-        await self.async_set_unique_id(mac)
-        self._abort_if_unique_id_configured()
-
-        try:
-            self._discovered[CONF_IS_NEW_STYLE_SCALE] = await is_new_scale(
-                discovery_info.address
-            )
-        except AcaiaDeviceNotFound:
-            _LOGGER.debug("Device not found during discovery")
-            return self.async_abort(reason="device_not_found")
-        except AcaiaError:
-            _LOGGER.debug(
-                "Error occurred while connecting to the scale during discovery",
-                exc_info=True,
-            )
-            return self.async_abort(reason="unknown")
-        except AcaiaUnknownDevice:
-            _LOGGER.debug("Unsupported device during discovery")
-            return self.async_abort(reason="unsupported_device")
-
-        return await self.async_step_bluetooth_confirm()
-
-    async def async_step_bluetooth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle confirmation of Bluetooth discovery."""
-
-        if user_input is not None:
-            return self.async_create_entry(
-                title=self._discovered[CONF_NAME],
-                data={
-                    CONF_ADDRESS: self._discovered[CONF_ADDRESS],
-                    CONF_IS_NEW_STYLE_SCALE: self._discovered[CONF_IS_NEW_STYLE_SCALE],
-                },
-            )
-
-        self.context["title_placeholders"] = placeholders = {
-            CONF_NAME: self._discovered[CONF_NAME]
-        }
-
-        self._set_confirm_only()
-        return self.async_show_form(
-            step_id="bluetooth_confirm",
-            description_placeholders=placeholders,
-        )
diff --git a/homeassistant/components/acaia/const.py b/homeassistant/components/acaia/const.py
deleted file mode 100644
index c603578763d..00000000000
--- a/homeassistant/components/acaia/const.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""Constants for component."""
-
-DOMAIN = "acaia"
-CONF_IS_NEW_STYLE_SCALE = "is_new_style_scale"
diff --git a/homeassistant/components/acaia/coordinator.py b/homeassistant/components/acaia/coordinator.py
deleted file mode 100644
index bd915b42408..00000000000
--- a/homeassistant/components/acaia/coordinator.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""Coordinator for Acaia integration."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from aioacaia.acaiascale import AcaiaScale
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-from .const import CONF_IS_NEW_STYLE_SCALE
-
-SCAN_INTERVAL = timedelta(seconds=15)
-
-_LOGGER = logging.getLogger(__name__)
-
-type AcaiaConfigEntry = ConfigEntry[AcaiaCoordinator]
-
-
-class AcaiaCoordinator(DataUpdateCoordinator[None]):
-    """Class to handle fetching data from the scale."""
-
-    config_entry: AcaiaConfigEntry
-
-    def __init__(self, hass: HomeAssistant, entry: AcaiaConfigEntry) -> None:
-        """Initialize coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name="acaia coordinator",
-            update_interval=SCAN_INTERVAL,
-            config_entry=entry,
-        )
-
-        self._scale = AcaiaScale(
-            address_or_ble_device=entry.data[CONF_ADDRESS],
-            name=entry.title,
-            is_new_style_scale=entry.data[CONF_IS_NEW_STYLE_SCALE],
-            notify_callback=self.async_update_listeners,
-        )
-
-    @property
-    def scale(self) -> AcaiaScale:
-        """Return the scale object."""
-        return self._scale
-
-    async def _async_update_data(self) -> None:
-        """Fetch data."""
-
-        # scale is already connected, return
-        if self._scale.connected:
-            return
-
-        # scale is not connected, try to connect
-        try:
-            await self._scale.connect(setup_tasks=False)
-        except (AcaiaDeviceNotFound, AcaiaError, TimeoutError) as ex:
-            _LOGGER.debug(
-                "Could not connect to scale: %s, Error: %s",
-                self.config_entry.data[CONF_ADDRESS],
-                ex,
-            )
-            self._scale.device_disconnected_handler(notify=False)
-            return
-
-        # connected, set up background tasks
-        if not self._scale.heartbeat_task or self._scale.heartbeat_task.done():
-            self._scale.heartbeat_task = self.config_entry.async_create_background_task(
-                hass=self.hass,
-                target=self._scale.send_heartbeats(),
-                name="acaia_heartbeat_task",
-            )
-
-        if not self._scale.process_queue_task or self._scale.process_queue_task.done():
-            self._scale.process_queue_task = (
-                self.config_entry.async_create_background_task(
-                    hass=self.hass,
-                    target=self._scale.process_queue(),
-                    name="acaia_process_queue_task",
-                )
-            )
diff --git a/homeassistant/components/acaia/entity.py b/homeassistant/components/acaia/entity.py
deleted file mode 100644
index 8a2108d2687..00000000000
--- a/homeassistant/components/acaia/entity.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""Base class for Acaia entities."""
-
-from dataclasses import dataclass
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AcaiaCoordinator
-
-
-@dataclass
-class AcaiaEntity(CoordinatorEntity[AcaiaCoordinator]):
-    """Common elements for all entities."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AcaiaCoordinator,
-        entity_description: EntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._scale = coordinator.scale
-        self._attr_unique_id = f"{self._scale.mac}_{entity_description.key}"
-
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._scale.mac)},
-            manufacturer="Acaia",
-            model=self._scale.model,
-            suggested_area="Kitchen",
-        )
-
-    @property
-    def available(self) -> bool:
-        """Returns whether entity is available."""
-        return super().available and self._scale.connected
diff --git a/homeassistant/components/acaia/icons.json b/homeassistant/components/acaia/icons.json
deleted file mode 100644
index aeab07ee912..00000000000
--- a/homeassistant/components/acaia/icons.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "entity": {
-    "button": {
-      "tare": {
-        "default": "mdi:scale-balance"
-      },
-      "reset_timer": {
-        "default": "mdi:timer-refresh"
-      },
-      "start_stop": {
-        "default": "mdi:timer-play"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/acaia/manifest.json b/homeassistant/components/acaia/manifest.json
deleted file mode 100644
index c907a70a38e..00000000000
--- a/homeassistant/components/acaia/manifest.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "domain": "acaia",
-  "name": "Acaia",
-  "bluetooth": [
-    {
-      "manufacturer_id": 16962
-    },
-    {
-      "local_name": "ACAIA*"
-    },
-    {
-      "local_name": "PYXIS-*"
-    },
-    {
-      "local_name": "LUNAR-*"
-    },
-    {
-      "local_name": "PROCHBT001"
-    }
-  ],
-  "codeowners": ["@zweckj"],
-  "config_flow": true,
-  "dependencies": ["bluetooth_adapters"],
-  "documentation": "https://www.home-assistant.io/integrations/acaia",
-  "integration_type": "device",
-  "iot_class": "local_push",
-  "loggers": ["aioacaia"],
-  "requirements": ["aioacaia==0.1.6"]
-}
diff --git a/homeassistant/components/acaia/strings.json b/homeassistant/components/acaia/strings.json
deleted file mode 100644
index f6a1aeb66fd..00000000000
--- a/homeassistant/components/acaia/strings.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "config": {
-    "flow_title": "{name}",
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "unsupported_device": "This device is not supported."
-    },
-    "error": {
-      "device_not_found": "Device could not be found.",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "bluetooth_confirm": {
-        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
-      },
-      "user": {
-        "description": "[%key:component::bluetooth::config::step::user::description%]",
-        "data": {
-          "address": "[%key:common::config_flow::data::device%]"
-        }
-      }
-    }
-  },
-  "entity": {
-    "button": {
-      "tare": {
-        "name": "Tare"
-      },
-      "reset_timer": {
-        "name": "Reset timer"
-      },
-      "start_stop": {
-        "name": "Start/stop timer"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/adguard/config_flow.py b/homeassistant/components/adguard/config_flow.py
index 6fd50967c22..c07967ec2c5 100644
--- a/homeassistant/components/adguard/config_flow.py
+++ b/homeassistant/components/adguard/config_flow.py
@@ -7,6 +7,7 @@ from typing import Any
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 import voluptuous as vol
 
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import (
     CONF_HOST,
@@ -17,7 +18,6 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
 )
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/advantage_air/__init__.py b/homeassistant/components/advantage_air/__init__.py
index 8be1b719993..752c1ec26fc 100644
--- a/homeassistant/components/advantage_air/__init__.py
+++ b/homeassistant/components/advantage_air/__init__.py
@@ -55,7 +55,6 @@ async def async_setup_entry(
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="Advantage Air",
         update_method=async_get,
         update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
diff --git a/homeassistant/components/aemet/__init__.py b/homeassistant/components/aemet/__init__.py
index 29bc044c67d..e242d62a580 100644
--- a/homeassistant/components/aemet/__init__.py
+++ b/homeassistant/components/aemet/__init__.py
@@ -1,5 +1,6 @@
 """The AEMET OpenData component."""
 
+from dataclasses import dataclass
 import logging
 
 from aemet_opendata.exceptions import AemetError, TownNotFound
@@ -12,10 +13,20 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client
 
 from .const import CONF_STATION_UPDATES, PLATFORMS
-from .coordinator import AemetConfigEntry, AemetData, WeatherUpdateCoordinator
+from .coordinator import WeatherUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
+type AemetConfigEntry = ConfigEntry[AemetData]
+
+
+@dataclass
+class AemetData:
+    """Aemet runtime data."""
+
+    name: str
+    coordinator: WeatherUpdateCoordinator
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: AemetConfigEntry) -> bool:
     """Set up AEMET OpenData as config entry."""
@@ -35,7 +46,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AemetConfigEntry) -> boo
     except AemetError as err:
         raise ConfigEntryNotReady(err) from err
 
-    weather_coordinator = WeatherUpdateCoordinator(hass, entry, aemet)
+    weather_coordinator = WeatherUpdateCoordinator(hass, aemet)
     await weather_coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = AemetData(name=name, coordinator=weather_coordinator)
diff --git a/homeassistant/components/aemet/coordinator.py b/homeassistant/components/aemet/coordinator.py
index 2e8534c7466..8d179ccdb02 100644
--- a/homeassistant/components/aemet/coordinator.py
+++ b/homeassistant/components/aemet/coordinator.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from asyncio import timeout
-from dataclasses import dataclass
 from datetime import timedelta
 import logging
 from typing import Any, Final, cast
@@ -20,7 +19,6 @@ from aemet_opendata.helpers import dict_nested_value
 from aemet_opendata.interface import AEMET
 
 from homeassistant.components.weather import Forecast
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -31,16 +29,6 @@ _LOGGER = logging.getLogger(__name__)
 API_TIMEOUT: Final[int] = 120
 WEATHER_UPDATE_INTERVAL = timedelta(minutes=10)
 
-type AemetConfigEntry = ConfigEntry[AemetData]
-
-
-@dataclass
-class AemetData:
-    """Aemet runtime data."""
-
-    name: str
-    coordinator: WeatherUpdateCoordinator
-
 
 class WeatherUpdateCoordinator(DataUpdateCoordinator):
     """Weather data update coordinator."""
@@ -48,7 +36,6 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: AemetConfigEntry,
         aemet: AEMET,
     ) -> None:
         """Initialize coordinator."""
@@ -57,7 +44,6 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=DOMAIN,
             update_interval=WEATHER_UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/aemet/diagnostics.py b/homeassistant/components/aemet/diagnostics.py
index bc366fc6d44..2379bd34bc0 100644
--- a/homeassistant/components/aemet/diagnostics.py
+++ b/homeassistant/components/aemet/diagnostics.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .coordinator import AemetConfigEntry
+from . import AemetConfigEntry
 
 TO_REDACT_CONFIG = [
     CONF_API_KEY,
diff --git a/homeassistant/components/aemet/sensor.py b/homeassistant/components/aemet/sensor.py
index 88eb34b6f84..83d490f7fe2 100644
--- a/homeassistant/components/aemet/sensor.py
+++ b/homeassistant/components/aemet/sensor.py
@@ -55,6 +55,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
+from . import AemetConfigEntry
 from .const import (
     ATTR_API_CONDITION,
     ATTR_API_FORECAST_CONDITION,
@@ -86,7 +87,7 @@ from .const import (
     ATTR_API_WIND_SPEED,
     CONDITIONS_MAP,
 )
-from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
+from .coordinator import WeatherUpdateCoordinator
 from .entity import AemetEntity
 
 
@@ -248,7 +249,6 @@ WEATHER_SENSORS: Final[tuple[AemetSensorEntityDescription, ...]] = (
         name="Rain",
         native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
         device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
-        state_class=SensorStateClass.MEASUREMENT,
     ),
     AemetSensorEntityDescription(
         key=ATTR_API_RAIN_PROB,
@@ -263,7 +263,6 @@ WEATHER_SENSORS: Final[tuple[AemetSensorEntityDescription, ...]] = (
         name="Snow",
         native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
         device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
-        state_class=SensorStateClass.MEASUREMENT,
     ),
     AemetSensorEntityDescription(
         key=ATTR_API_SNOW_PROB,
diff --git a/homeassistant/components/aemet/weather.py b/homeassistant/components/aemet/weather.py
index a156652eadd..341b81d71c4 100644
--- a/homeassistant/components/aemet/weather.py
+++ b/homeassistant/components/aemet/weather.py
@@ -27,8 +27,9 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AemetConfigEntry
 from .const import CONDITIONS_MAP
-from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
+from .coordinator import WeatherUpdateCoordinator
 from .entity import AemetEntity
 
 
diff --git a/homeassistant/components/agent_dvr/alarm_control_panel.py b/homeassistant/components/agent_dvr/alarm_control_panel.py
index 23328315e42..f098184321f 100644
--- a/homeassistant/components/agent_dvr/alarm_control_panel.py
+++ b/homeassistant/components/agent_dvr/alarm_control_panel.py
@@ -5,7 +5,12 @@ from __future__ import annotations
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
+)
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -60,37 +65,37 @@ class AgentBaseStation(AlarmControlPanelEntity):
         self._attr_available = self._client.is_available
         armed = self._client.is_armed
         if armed is None:
-            self._attr_alarm_state = None
+            self._attr_state = None
             return
         if armed:
             prof = (await self._client.get_active_profile()).lower()
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+            self._attr_state = STATE_ALARM_ARMED_AWAY
             if prof == CONF_HOME_MODE_NAME:
-                self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+                self._attr_state = STATE_ALARM_ARMED_HOME
             elif prof == CONF_NIGHT_MODE_NAME:
-                self._attr_alarm_state = AlarmControlPanelState.ARMED_NIGHT
+                self._attr_state = STATE_ALARM_ARMED_NIGHT
         else:
-            self._attr_alarm_state = AlarmControlPanelState.DISARMED
+            self._attr_state = STATE_ALARM_DISARMED
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
         await self._client.disarm()
-        self._attr_alarm_state = AlarmControlPanelState.DISARMED
+        self._attr_state = STATE_ALARM_DISARMED
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command. Uses custom mode."""
         await self._client.arm()
         await self._client.set_active_profile(CONF_AWAY_MODE_NAME)
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+        self._attr_state = STATE_ALARM_ARMED_AWAY
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command. Uses custom mode."""
         await self._client.arm()
         await self._client.set_active_profile(CONF_HOME_MODE_NAME)
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+        self._attr_state = STATE_ALARM_ARMED_HOME
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command. Uses custom mode."""
         await self._client.arm()
         await self._client.set_active_profile(CONF_NIGHT_MODE_NAME)
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_NIGHT
+        self._attr_state = STATE_ALARM_ARMED_NIGHT
diff --git a/homeassistant/components/agent_dvr/manifest.json b/homeassistant/components/agent_dvr/manifest.json
index 4ec14296363..9a6c528c336 100644
--- a/homeassistant/components/agent_dvr/manifest.json
+++ b/homeassistant/components/agent_dvr/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/agent_dvr",
   "iot_class": "local_polling",
   "loggers": ["agent"],
-  "requirements": ["agent-py==0.0.24"]
+  "requirements": ["agent-py==0.0.23"]
 }
diff --git a/homeassistant/components/airnow/config_flow.py b/homeassistant/components/airnow/config_flow.py
index d0ab16e9758..e839acdcb7b 100644
--- a/homeassistant/components/airnow/config_flow.py
+++ b/homeassistant/components/airnow/config_flow.py
@@ -1,7 +1,5 @@
 """Config flow for AirNow integration."""
 
-from __future__ import annotations
-
 import logging
 from typing import Any
 
@@ -14,6 +12,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS
 from homeassistant.core import HomeAssistant, callback
@@ -121,12 +120,12 @@ class AirNowConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> AirNowOptionsFlowHandler:
+    ) -> OptionsFlow:
         """Return the options flow."""
-        return AirNowOptionsFlowHandler()
+        return AirNowOptionsFlowHandler(config_entry)
 
 
-class AirNowOptionsFlowHandler(OptionsFlow):
+class AirNowOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle an options flow for AirNow."""
 
     async def async_step_init(
@@ -137,7 +136,12 @@ class AirNowOptionsFlowHandler(OptionsFlow):
             return self.async_create_entry(data=user_input)
 
         options_schema = vol.Schema(
-            {vol.Optional(CONF_RADIUS): vol.All(int, vol.Range(min=5))}
+            {
+                vol.Optional(CONF_RADIUS): vol.All(
+                    int,
+                    vol.Range(min=5),
+                ),
+            }
         )
 
         return self.async_show_form(
diff --git a/homeassistant/components/airthings/__init__.py b/homeassistant/components/airthings/__init__.py
index 14e2f28370f..22138c7d4fc 100644
--- a/homeassistant/components/airthings/__init__.py
+++ b/homeassistant/components/airthings/__init__.py
@@ -42,7 +42,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirthingsConfigEntry) ->
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=_update_method,
         update_interval=SCAN_INTERVAL,
diff --git a/homeassistant/components/airthings_ble/__init__.py b/homeassistant/components/airthings_ble/__init__.py
index 1c3c6084739..79384eed4ef 100644
--- a/homeassistant/components/airthings_ble/__init__.py
+++ b/homeassistant/components/airthings_ble/__init__.py
@@ -2,27 +2,75 @@
 
 from __future__ import annotations
 
+from datetime import timedelta
+import logging
+
+from airthings_ble import AirthingsBluetoothDeviceData, AirthingsDevice
+from bleak_retry_connector import close_stale_connections_by_address
+
+from homeassistant.components import bluetooth
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util.unit_system import METRIC_SYSTEM
 
-from .const import MAX_RETRIES_AFTER_STARTUP
-from .coordinator import AirthingsBLEConfigEntry, AirthingsBLEDataUpdateCoordinator
+from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, MAX_RETRIES_AFTER_STARTUP
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
+_LOGGER = logging.getLogger(__name__)
+
+AirthingsBLEDataUpdateCoordinator = DataUpdateCoordinator[AirthingsDevice]
+AirthingsBLEConfigEntry = ConfigEntry[AirthingsBLEDataUpdateCoordinator]
+
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: AirthingsBLEConfigEntry
 ) -> bool:
     """Set up Airthings BLE device from a config entry."""
-    coordinator = AirthingsBLEDataUpdateCoordinator(hass, entry)
+    hass.data.setdefault(DOMAIN, {})
+    address = entry.unique_id
+
+    is_metric = hass.config.units is METRIC_SYSTEM
+    assert address is not None
+
+    await close_stale_connections_by_address(address)
+
+    ble_device = bluetooth.async_ble_device_from_address(hass, address)
+
+    if not ble_device:
+        raise ConfigEntryNotReady(
+            f"Could not find Airthings device with address {address}"
+        )
+
+    airthings = AirthingsBluetoothDeviceData(_LOGGER, is_metric)
+
+    async def _async_update_method() -> AirthingsDevice:
+        """Get data from Airthings BLE."""
+        try:
+            data = await airthings.update_device(ble_device)
+        except Exception as err:
+            raise UpdateFailed(f"Unable to fetch data: {err}") from err
+
+        return data
+
+    coordinator: AirthingsBLEDataUpdateCoordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        name=DOMAIN,
+        update_method=_async_update_method,
+        update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
+    )
+
     await coordinator.async_config_entry_first_refresh()
 
     # Once its setup and we know we are not going to delay
     # the startup of Home Assistant, we can set the max attempts
     # to a higher value. If the first connection attempt fails,
     # Home Assistant's built-in retry logic will take over.
-    coordinator.airthings.set_max_attempts(MAX_RETRIES_AFTER_STARTUP)
+    airthings.set_max_attempts(MAX_RETRIES_AFTER_STARTUP)
 
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/airthings_ble/coordinator.py b/homeassistant/components/airthings_ble/coordinator.py
deleted file mode 100644
index 81009dcea81..00000000000
--- a/homeassistant/components/airthings_ble/coordinator.py
+++ /dev/null
@@ -1,68 +0,0 @@
-"""The Airthings BLE integration."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from airthings_ble import AirthingsBluetoothDeviceData, AirthingsDevice
-from bleak.backends.device import BLEDevice
-from bleak_retry_connector import close_stale_connections_by_address
-
-from homeassistant.components import bluetooth
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util.unit_system import METRIC_SYSTEM
-
-from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-type AirthingsBLEConfigEntry = ConfigEntry[AirthingsBLEDataUpdateCoordinator]
-
-
-class AirthingsBLEDataUpdateCoordinator(DataUpdateCoordinator[AirthingsDevice]):
-    """Class to manage fetching Airthings BLE data."""
-
-    ble_device: BLEDevice
-    config_entry: AirthingsBLEConfigEntry
-
-    def __init__(self, hass: HomeAssistant, entry: AirthingsBLEConfigEntry) -> None:
-        """Initialize the coordinator."""
-        self.airthings = AirthingsBluetoothDeviceData(
-            _LOGGER, hass.config.units is METRIC_SYSTEM
-        )
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=entry,
-            name=DOMAIN,
-            update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
-        )
-
-    async def _async_setup(self) -> None:
-        """Set up the coordinator."""
-        address = self.config_entry.unique_id
-
-        assert address is not None
-
-        await close_stale_connections_by_address(address)
-
-        ble_device = bluetooth.async_ble_device_from_address(self.hass, address)
-
-        if not ble_device:
-            raise ConfigEntryNotReady(
-                f"Could not find Airthings device with address {address}"
-            )
-        self.ble_device = ble_device
-
-    async def _async_update_data(self) -> AirthingsDevice:
-        """Get data from Airthings BLE."""
-        try:
-            data = await self.airthings.update_device(self.ble_device)
-        except Exception as err:
-            raise UpdateFailed(f"Unable to fetch data: {err}") from err
-
-        return data
diff --git a/homeassistant/components/airthings_ble/manifest.json b/homeassistant/components/airthings_ble/manifest.json
index fe2cc0eeb36..6c00fe79e7b 100644
--- a/homeassistant/components/airthings_ble/manifest.json
+++ b/homeassistant/components/airthings_ble/manifest.json
@@ -24,5 +24,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/airthings_ble",
   "iot_class": "local_polling",
-  "requirements": ["airthings-ble==0.9.2"]
+  "requirements": ["airthings-ble==0.9.1"]
 }
diff --git a/homeassistant/components/airthings_ble/sensor.py b/homeassistant/components/airthings_ble/sensor.py
index 0dfd82a38c4..b1ae7d533d8 100644
--- a/homeassistant/components/airthings_ble/sensor.py
+++ b/homeassistant/components/airthings_ble/sensor.py
@@ -34,8 +34,8 @@ from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
+from . import AirthingsBLEConfigEntry, AirthingsBLEDataUpdateCoordinator
 from .const import DOMAIN, VOLUME_BECQUEREL, VOLUME_PICOCURIE
-from .coordinator import AirthingsBLEConfigEntry, AirthingsBLEDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/airtouch5/__init__.py b/homeassistant/components/airtouch5/__init__.py
index f0c7ba8123c..8aab41d72cb 100644
--- a/homeassistant/components/airtouch5/__init__.py
+++ b/homeassistant/components/airtouch5/__init__.py
@@ -9,6 +9,8 @@ from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
+from .const import DOMAIN
+
 PLATFORMS: list[Platform] = [Platform.CLIMATE, Platform.COVER]
 
 type Airtouch5ConfigEntry = ConfigEntry[Airtouch5SimpleClient]
@@ -17,6 +19,8 @@ type Airtouch5ConfigEntry = ConfigEntry[Airtouch5SimpleClient]
 async def async_setup_entry(hass: HomeAssistant, entry: Airtouch5ConfigEntry) -> bool:
     """Set up Airtouch 5 from a config entry."""
 
+    hass.data.setdefault(DOMAIN, {})
+
     # Create API instance
     host = entry.data[CONF_HOST]
     client = Airtouch5SimpleClient(host)
diff --git a/homeassistant/components/airvisual/__init__.py b/homeassistant/components/airvisual/__init__.py
index d2e5e7169b9..dac34b170c9 100644
--- a/homeassistant/components/airvisual/__init__.py
+++ b/homeassistant/components/airvisual/__init__.py
@@ -204,7 +204,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirVisualConfigEntry) ->
     coordinator = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name=async_get_geography_id(entry.data),
         # We give a placeholder update interval in order to create the coordinator;
         # then, below, we use the coordinator's presence (along with any other
diff --git a/homeassistant/components/airvisual_pro/__init__.py b/homeassistant/components/airvisual_pro/__init__.py
index 3b3ac6df232..b95d0597bab 100644
--- a/homeassistant/components/airvisual_pro/__init__.py
+++ b/homeassistant/components/airvisual_pro/__init__.py
@@ -81,7 +81,6 @@ async def async_setup_entry(
     coordinator = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name="Node/Pro data",
         update_interval=UPDATE_INTERVAL,
         update_method=async_get_data,
diff --git a/homeassistant/components/airzone/manifest.json b/homeassistant/components/airzone/manifest.json
index 6bf374087a6..10fb20bb2ce 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.9.6"]
+  "requirements": ["aioairzone==0.9.5"]
 }
diff --git a/homeassistant/components/airzone_cloud/climate.py b/homeassistant/components/airzone_cloud/climate.py
index d32b070ad8c..d051d561015 100644
--- a/homeassistant/components/airzone_cloud/climate.py
+++ b/homeassistant/components/airzone_cloud/climate.py
@@ -310,10 +310,6 @@ class AirzoneDeviceClimate(AirzoneClimate):
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
-        hvac_mode = kwargs.get(ATTR_HVAC_MODE)
-        if hvac_mode is not None:
-            await self.async_set_hvac_mode(hvac_mode)
-
         params: dict[str, Any] = {}
         if ATTR_TEMPERATURE in kwargs:
             params[API_SETPOINT] = {
@@ -337,6 +333,9 @@ class AirzoneDeviceClimate(AirzoneClimate):
             }
         await self._async_update_params(params)
 
+        if ATTR_HVAC_MODE in kwargs:
+            await self.async_set_hvac_mode(kwargs[ATTR_HVAC_MODE])
+
 
 class AirzoneDeviceGroupClimate(AirzoneClimate):
     """Define an Airzone Cloud DeviceGroup base class."""
@@ -367,10 +366,6 @@ class AirzoneDeviceGroupClimate(AirzoneClimate):
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
-        hvac_mode = kwargs.get(ATTR_HVAC_MODE)
-        if hvac_mode is not None:
-            await self.async_set_hvac_mode(hvac_mode)
-
         params: dict[str, Any] = {}
         if ATTR_TEMPERATURE in kwargs:
             params[API_PARAMS] = {
@@ -381,6 +376,9 @@ class AirzoneDeviceGroupClimate(AirzoneClimate):
             }
         await self._async_update_params(params)
 
+        if ATTR_HVAC_MODE in kwargs:
+            await self.async_set_hvac_mode(kwargs[ATTR_HVAC_MODE])
+
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
         params: dict[str, Any] = {
diff --git a/homeassistant/components/airzone_cloud/manifest.json b/homeassistant/components/airzone_cloud/manifest.json
index 0e21e57ec52..8bfc5bb8d21 100644
--- a/homeassistant/components/airzone_cloud/manifest.json
+++ b/homeassistant/components/airzone_cloud/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
   "iot_class": "cloud_push",
   "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.6.10"]
+  "requirements": ["aioairzone-cloud==0.6.7"]
 }
diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py
index a9e433a3650..e5c2745104d 100644
--- a/homeassistant/components/alarm_control_panel/__init__.py
+++ b/homeassistant/components/alarm_control_panel/__init__.py
@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-import asyncio
 from datetime import timedelta
 from functools import partial
 import logging
-from typing import TYPE_CHECKING, Any, Final, final
+from typing import Any, Final, final
 
 from propcache import cached_property
 import voluptuous as vol
@@ -34,7 +33,6 @@ from homeassistant.helpers.deprecation import (
 )
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.entity_platform import EntityPlatform
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
@@ -51,7 +49,6 @@ from .const import (  # noqa: F401
     ATTR_CODE_ARM_REQUIRED,
     DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 
@@ -145,7 +142,6 @@ CACHED_PROPERTIES_WITH_ATTR_ = {
     "changed_by",
     "code_arm_required",
     "supported_features",
-    "alarm_state",
 }
 
 
@@ -153,7 +149,6 @@ class AlarmControlPanelEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_A
     """An abstract class for alarm control entities."""
 
     entity_description: AlarmControlPanelEntityDescription
-    _attr_alarm_state: AlarmControlPanelState | None = None
     _attr_changed_by: str | None = None
     _attr_code_arm_required: bool = True
     _attr_code_format: CodeFormat | None = None
@@ -162,84 +157,6 @@ class AlarmControlPanelEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_A
     )
     _alarm_control_panel_option_default_code: str | None = None
 
-    __alarm_legacy_state: bool = False
-    __alarm_legacy_state_reported: bool = False
-
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        """Post initialisation processing."""
-        super().__init_subclass__(**kwargs)
-        if any(method in cls.__dict__ for method in ("_attr_state", "state")):
-            # Integrations should use the 'alarm_state' property instead of
-            # setting the state directly.
-            cls.__alarm_legacy_state = True
-
-    def __setattr__(self, __name: str, __value: Any) -> None:
-        """Set attribute.
-
-        Deprecation warning if setting '_attr_state' directly
-        unless already reported.
-        """
-        if __name == "_attr_state":
-            if self.__alarm_legacy_state_reported is not True:
-                self._report_deprecated_alarm_state_handling()
-            self.__alarm_legacy_state_reported = True
-        return super().__setattr__(__name, __value)
-
-    @callback
-    def add_to_platform_start(
-        self,
-        hass: HomeAssistant,
-        platform: EntityPlatform,
-        parallel_updates: asyncio.Semaphore | None,
-    ) -> None:
-        """Start adding an entity to a platform."""
-        super().add_to_platform_start(hass, platform, parallel_updates)
-        if self.__alarm_legacy_state and not self.__alarm_legacy_state_reported:
-            self._report_deprecated_alarm_state_handling()
-
-    @callback
-    def _report_deprecated_alarm_state_handling(self) -> None:
-        """Report on deprecated handling of alarm state.
-
-        Integrations should implement alarm_state instead of using state directly.
-        """
-        self.__alarm_legacy_state_reported = True
-        if "custom_components" in type(self).__module__:
-            # Do not report on core integrations as they have been fixed.
-            report_issue = "report it to the custom integration author."
-            _LOGGER.warning(
-                "Entity %s (%s) is setting state directly"
-                " which will stop working in HA Core 2025.11."
-                " Entities should implement the 'alarm_state' property and"
-                " return its state using the AlarmControlPanelState enum, please %s",
-                self.entity_id,
-                type(self),
-                report_issue,
-            )
-
-    @final
-    @property
-    def state(self) -> str | None:
-        """Return the current state."""
-        if (alarm_state := self.alarm_state) is not None:
-            return alarm_state
-        if self._attr_state is not None:
-            # Backwards compatibility for integrations that set state directly
-            # Should be removed in 2025.11
-            if TYPE_CHECKING:
-                assert isinstance(self._attr_state, str)
-            return self._attr_state
-        return None
-
-    @cached_property
-    def alarm_state(self) -> AlarmControlPanelState | None:
-        """Return the current alarm control panel entity state.
-
-        Integrations should overwrite this or use the '_attr_alarm_state'
-        attribute to set the alarm status using the 'AlarmControlPanelState' enum.
-        """
-        return self._attr_alarm_state
-
     @final
     @callback
     def code_or_default_code(self, code: str | None) -> str | None:
diff --git a/homeassistant/components/alarm_control_panel/const.py b/homeassistant/components/alarm_control_panel/const.py
index f3218626ead..2e8fe98da3b 100644
--- a/homeassistant/components/alarm_control_panel/const.py
+++ b/homeassistant/components/alarm_control_panel/const.py
@@ -17,21 +17,6 @@ ATTR_CHANGED_BY: Final = "changed_by"
 ATTR_CODE_ARM_REQUIRED: Final = "code_arm_required"
 
 
-class AlarmControlPanelState(StrEnum):
-    """Alarm control panel entity states."""
-
-    DISARMED = "disarmed"
-    ARMED_HOME = "armed_home"
-    ARMED_AWAY = "armed_away"
-    ARMED_NIGHT = "armed_night"
-    ARMED_VACATION = "armed_vacation"
-    ARMED_CUSTOM_BYPASS = "armed_custom_bypass"
-    PENDING = "pending"
-    ARMING = "arming"
-    DISARMING = "disarming"
-    TRIGGERED = "triggered"
-
-
 class CodeFormat(StrEnum):
     """Code formats for the Alarm Control Panel."""
 
diff --git a/homeassistant/components/alarm_control_panel/device_condition.py b/homeassistant/components/alarm_control_panel/device_condition.py
index 6d343bbe605..227fc31413e 100644
--- a/homeassistant/components/alarm_control_panel/device_condition.py
+++ b/homeassistant/components/alarm_control_panel/device_condition.py
@@ -13,6 +13,13 @@ from homeassistant.const import (
     CONF_DOMAIN,
     CONF_ENTITY_ID,
     CONF_TYPE,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import (
@@ -24,7 +31,7 @@ from homeassistant.helpers.config_validation import DEVICE_CONDITION_BASE_SCHEMA
 from homeassistant.helpers.entity import get_supported_features
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
 
-from . import DOMAIN, AlarmControlPanelState
+from . import DOMAIN
 from .const import (
     CONDITION_ARMED_AWAY,
     CONDITION_ARMED_CUSTOM_BYPASS,
@@ -102,19 +109,19 @@ def async_condition_from_config(
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
     if config[CONF_TYPE] == CONDITION_TRIGGERED:
-        state = AlarmControlPanelState.TRIGGERED
+        state = STATE_ALARM_TRIGGERED
     elif config[CONF_TYPE] == CONDITION_DISARMED:
-        state = AlarmControlPanelState.DISARMED
+        state = STATE_ALARM_DISARMED
     elif config[CONF_TYPE] == CONDITION_ARMED_HOME:
-        state = AlarmControlPanelState.ARMED_HOME
+        state = STATE_ALARM_ARMED_HOME
     elif config[CONF_TYPE] == CONDITION_ARMED_AWAY:
-        state = AlarmControlPanelState.ARMED_AWAY
+        state = STATE_ALARM_ARMED_AWAY
     elif config[CONF_TYPE] == CONDITION_ARMED_NIGHT:
-        state = AlarmControlPanelState.ARMED_NIGHT
+        state = STATE_ALARM_ARMED_NIGHT
     elif config[CONF_TYPE] == CONDITION_ARMED_VACATION:
-        state = AlarmControlPanelState.ARMED_VACATION
+        state = STATE_ALARM_ARMED_VACATION
     elif config[CONF_TYPE] == CONDITION_ARMED_CUSTOM_BYPASS:
-        state = AlarmControlPanelState.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])
diff --git a/homeassistant/components/alarm_control_panel/device_trigger.py b/homeassistant/components/alarm_control_panel/device_trigger.py
index a488cf10870..557666720e8 100644
--- a/homeassistant/components/alarm_control_panel/device_trigger.py
+++ b/homeassistant/components/alarm_control_panel/device_trigger.py
@@ -15,6 +15,13 @@ from homeassistant.const import (
     CONF_FOR,
     CONF_PLATFORM,
     CONF_TYPE,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_registry as er
@@ -22,7 +29,7 @@ from homeassistant.helpers.entity import get_supported_features
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
-from . import DOMAIN, AlarmControlPanelState
+from . import DOMAIN
 from .const import AlarmControlPanelEntityFeature
 
 BASIC_TRIGGER_TYPES: Final[set[str]] = {"triggered", "disarmed", "arming"}
@@ -122,19 +129,19 @@ async def async_attach_trigger(
 ) -> CALLBACK_TYPE:
     """Attach a trigger."""
     if config[CONF_TYPE] == "triggered":
-        to_state = AlarmControlPanelState.TRIGGERED
+        to_state = STATE_ALARM_TRIGGERED
     elif config[CONF_TYPE] == "disarmed":
-        to_state = AlarmControlPanelState.DISARMED
+        to_state = STATE_ALARM_DISARMED
     elif config[CONF_TYPE] == "arming":
-        to_state = AlarmControlPanelState.ARMING
+        to_state = STATE_ALARM_ARMING
     elif config[CONF_TYPE] == "armed_home":
-        to_state = AlarmControlPanelState.ARMED_HOME
+        to_state = STATE_ALARM_ARMED_HOME
     elif config[CONF_TYPE] == "armed_away":
-        to_state = AlarmControlPanelState.ARMED_AWAY
+        to_state = STATE_ALARM_ARMED_AWAY
     elif config[CONF_TYPE] == "armed_night":
-        to_state = AlarmControlPanelState.ARMED_NIGHT
+        to_state = STATE_ALARM_ARMED_NIGHT
     elif config[CONF_TYPE] == "armed_vacation":
-        to_state = AlarmControlPanelState.ARMED_VACATION
+        to_state = STATE_ALARM_ARMED_VACATION
 
     state_config = {
         state_trigger.CONF_PLATFORM: "state",
diff --git a/homeassistant/components/alarm_control_panel/reproduce_state.py b/homeassistant/components/alarm_control_panel/reproduce_state.py
index 765514e98ec..5a3d79fe2ed 100644
--- a/homeassistant/components/alarm_control_panel/reproduce_state.py
+++ b/homeassistant/components/alarm_control_panel/reproduce_state.py
@@ -16,21 +16,28 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_VACATION,
     SERVICE_ALARM_DISARM,
     SERVICE_ALARM_TRIGGER,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import Context, HomeAssistant, State
 
-from . import DOMAIN, AlarmControlPanelState
+from . import DOMAIN
 
 _LOGGER: Final = logging.getLogger(__name__)
 
 VALID_STATES: Final[set[str]] = {
-    AlarmControlPanelState.ARMED_AWAY,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-    AlarmControlPanelState.ARMED_HOME,
-    AlarmControlPanelState.ARMED_NIGHT,
-    AlarmControlPanelState.ARMED_VACATION,
-    AlarmControlPanelState.DISARMED,
-    AlarmControlPanelState.TRIGGERED,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 }
 
 
@@ -58,19 +65,19 @@ async def _async_reproduce_state(
 
     service_data = {ATTR_ENTITY_ID: state.entity_id}
 
-    if state.state == AlarmControlPanelState.ARMED_AWAY:
+    if state.state == STATE_ALARM_ARMED_AWAY:
         service = SERVICE_ALARM_ARM_AWAY
-    elif state.state == AlarmControlPanelState.ARMED_CUSTOM_BYPASS:
+    elif state.state == STATE_ALARM_ARMED_CUSTOM_BYPASS:
         service = SERVICE_ALARM_ARM_CUSTOM_BYPASS
-    elif state.state == AlarmControlPanelState.ARMED_HOME:
+    elif state.state == STATE_ALARM_ARMED_HOME:
         service = SERVICE_ALARM_ARM_HOME
-    elif state.state == AlarmControlPanelState.ARMED_NIGHT:
+    elif state.state == STATE_ALARM_ARMED_NIGHT:
         service = SERVICE_ALARM_ARM_NIGHT
-    elif state.state == AlarmControlPanelState.ARMED_VACATION:
+    elif state.state == STATE_ALARM_ARMED_VACATION:
         service = SERVICE_ALARM_ARM_VACATION
-    elif state.state == AlarmControlPanelState.DISARMED:
+    elif state.state == STATE_ALARM_DISARMED:
         service = SERVICE_ALARM_DISARM
-    elif state.state == AlarmControlPanelState.TRIGGERED:
+    elif state.state == STATE_ALARM_TRIGGERED:
         service = SERVICE_ALARM_TRIGGER
 
     await hass.services.async_call(
diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py
index cf72133ea12..7375320f800 100644
--- a/homeassistant/components/alarmdecoder/alarm_control_panel.py
+++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py
@@ -7,10 +7,16 @@ import voluptuous as vol
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
-from homeassistant.const import ATTR_CODE
+from homeassistant.const import (
+    ATTR_CODE,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
@@ -100,15 +106,15 @@ class AlarmDecoderAlarmPanel(AlarmDecoderEntity, AlarmControlPanelEntity):
     def _message_callback(self, message):
         """Handle received messages."""
         if message.alarm_sounding or message.fire_alarm:
-            self._attr_alarm_state = AlarmControlPanelState.TRIGGERED
+            self._attr_state = STATE_ALARM_TRIGGERED
         elif message.armed_away:
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+            self._attr_state = STATE_ALARM_ARMED_AWAY
         elif message.armed_home and (message.entry_delay_off or message.perimeter_only):
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_NIGHT
+            self._attr_state = STATE_ALARM_ARMED_NIGHT
         elif message.armed_home:
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+            self._attr_state = STATE_ALARM_ARMED_HOME
         else:
-            self._attr_alarm_state = AlarmControlPanelState.DISARMED
+            self._attr_state = STATE_ALARM_DISARMED
 
         self._attr_extra_state_attributes = {
             "ac_power": message.ac_power,
diff --git a/homeassistant/components/alexa/capabilities.py b/homeassistant/components/alexa/capabilities.py
index 09b461428ac..6633cda8a97 100644
--- a/homeassistant/components/alexa/capabilities.py
+++ b/homeassistant/components/alexa/capabilities.py
@@ -26,7 +26,6 @@ from homeassistant.components import (
 )
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.components.climate import HVACMode
@@ -37,6 +36,10 @@ from homeassistant.const import (
     ATTR_TEMPERATURE,
     ATTR_UNIT_OF_MEASUREMENT,
     PERCENTAGE,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
     STATE_IDLE,
     STATE_OFF,
     STATE_ON,
@@ -1314,13 +1317,13 @@ class AlexaSecurityPanelController(AlexaCapability):
             raise UnsupportedProperty(name)
 
         arm_state = self.entity.state
-        if arm_state == AlarmControlPanelState.ARMED_HOME:
+        if arm_state == STATE_ALARM_ARMED_HOME:
             return "ARMED_STAY"
-        if arm_state == AlarmControlPanelState.ARMED_AWAY:
+        if arm_state == STATE_ALARM_ARMED_AWAY:
             return "ARMED_AWAY"
-        if arm_state == AlarmControlPanelState.ARMED_NIGHT:
+        if arm_state == STATE_ALARM_ARMED_NIGHT:
             return "ARMED_NIGHT"
-        if arm_state == AlarmControlPanelState.ARMED_CUSTOM_BYPASS:
+        if arm_state == STATE_ALARM_ARMED_CUSTOM_BYPASS:
             return "ARMED_STAY"
         return "DISARMED"
 
diff --git a/homeassistant/components/alexa/handlers.py b/homeassistant/components/alexa/handlers.py
index 8ea61ddbceb..3571f436ff6 100644
--- a/homeassistant/components/alexa/handlers.py
+++ b/homeassistant/components/alexa/handlers.py
@@ -9,7 +9,6 @@ from typing import Any
 
 from homeassistant import core as ha
 from homeassistant.components import (
-    alarm_control_panel,
     button,
     camera,
     climate,
@@ -52,6 +51,7 @@ from homeassistant.const import (
     SERVICE_VOLUME_MUTE,
     SERVICE_VOLUME_SET,
     SERVICE_VOLUME_UP,
+    STATE_ALARM_DISARMED,
     UnitOfTemperature,
 )
 from homeassistant.helpers import network
@@ -1083,13 +1083,7 @@ async def async_api_arm(
     arm_state = directive.payload["armState"]
     data: dict[str, Any] = {ATTR_ENTITY_ID: entity.entity_id}
 
-    # Per Alexa Documentation: users are not allowed to switch from armed_away
-    # directly to another armed state without first disarming the system.
-    # https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-securitypanelcontroller.html#arming
-    if (
-        entity.state == alarm_control_panel.AlarmControlPanelState.ARMED_AWAY
-        and arm_state != "ARMED_AWAY"
-    ):
+    if entity.state != STATE_ALARM_DISARMED:
         msg = "You must disarm the system before you can set the requested arm state."
         raise AlexaSecurityPanelAuthorizationRequired(msg)
 
@@ -1139,7 +1133,7 @@ async def async_api_disarm(
     # Per Alexa Documentation: If you receive a Disarm directive, and the
     # system is already disarmed, respond with a success response,
     # not an error response.
-    if entity.state == alarm_control_panel.AlarmControlPanelState.DISARMED:
+    if entity.state == STATE_ALARM_DISARMED:
         return response
 
     payload = directive.payload
diff --git a/homeassistant/components/analytics/analytics.py b/homeassistant/components/analytics/analytics.py
index b63475c80a4..c1141b40e4d 100644
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -29,7 +29,6 @@ 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.hassio import is_hassio
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.system_info import async_get_system_info
 from homeassistant.loader import (
@@ -137,7 +136,7 @@ class Analytics:
     @property
     def supervisor(self) -> bool:
         """Return bool if a supervisor is present."""
-        return is_hassio(self.hass)
+        return hassio.is_hassio(self.hass)
 
     async def load(self) -> None:
         """Load preferences."""
diff --git a/homeassistant/components/analytics/manifest.json b/homeassistant/components/analytics/manifest.json
index 5142a86ad97..955c4a813f4 100644
--- a/homeassistant/components/analytics/manifest.json
+++ b/homeassistant/components/analytics/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "analytics",
   "name": "Analytics",
-  "after_dependencies": ["energy", "hassio", "recorder"],
+  "after_dependencies": ["energy", "recorder"],
   "codeowners": ["@home-assistant/core", "@ludeeus"],
   "dependencies": ["api", "websocket_api"],
   "documentation": "https://www.home-assistant.io/integrations/analytics",
diff --git a/homeassistant/components/analytics_insights/config_flow.py b/homeassistant/components/analytics_insights/config_flow.py
index c36755f5403..909290b1035 100644
--- a/homeassistant/components/analytics_insights/config_flow.py
+++ b/homeassistant/components/analytics_insights/config_flow.py
@@ -16,6 +16,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -26,7 +27,6 @@ from homeassistant.helpers.selector import (
 )
 
 from .const import (
-    CONF_TRACKED_ADDONS,
     CONF_TRACKED_CUSTOM_INTEGRATIONS,
     CONF_TRACKED_INTEGRATIONS,
     DOMAIN,
@@ -45,11 +45,9 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> HomeassistantAnalyticsOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return HomeassistantAnalyticsOptionsFlowHandler()
+        return HomeassistantAnalyticsOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -57,12 +55,8 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle the initial step."""
         errors: dict[str, str] = {}
         if user_input is not None:
-            if all(
-                [
-                    not user_input.get(CONF_TRACKED_ADDONS),
-                    not user_input.get(CONF_TRACKED_INTEGRATIONS),
-                    not user_input.get(CONF_TRACKED_CUSTOM_INTEGRATIONS),
-                ]
+            if not user_input.get(CONF_TRACKED_INTEGRATIONS) and not user_input.get(
+                CONF_TRACKED_CUSTOM_INTEGRATIONS
             ):
                 errors["base"] = "no_integrations_selected"
             else:
@@ -70,7 +64,6 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
                     title="Home Assistant Analytics Insights",
                     data={},
                     options={
-                        CONF_TRACKED_ADDONS: user_input.get(CONF_TRACKED_ADDONS, []),
                         CONF_TRACKED_INTEGRATIONS: user_input.get(
                             CONF_TRACKED_INTEGRATIONS, []
                         ),
@@ -84,7 +77,6 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
             session=async_get_clientsession(self.hass)
         )
         try:
-            addons = await client.get_addons()
             integrations = await client.get_integrations()
             custom_integrations = await client.get_custom_integrations()
         except HomeassistantAnalyticsConnectionError:
@@ -107,13 +99,6 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
             data_schema=vol.Schema(
                 {
-                    vol.Optional(CONF_TRACKED_ADDONS): SelectSelector(
-                        SelectSelectorConfig(
-                            options=list(addons),
-                            multiple=True,
-                            sort=True,
-                        )
-                    ),
                     vol.Optional(CONF_TRACKED_INTEGRATIONS): SelectSelector(
                         SelectSelectorConfig(
                             options=options,
@@ -133,7 +118,7 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
+class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle Homeassistant Analytics options."""
 
     async def async_step_init(
@@ -142,19 +127,14 @@ class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
         """Manage the options."""
         errors: dict[str, str] = {}
         if user_input is not None:
-            if all(
-                [
-                    not user_input.get(CONF_TRACKED_ADDONS),
-                    not user_input.get(CONF_TRACKED_INTEGRATIONS),
-                    not user_input.get(CONF_TRACKED_CUSTOM_INTEGRATIONS),
-                ]
+            if not user_input.get(CONF_TRACKED_INTEGRATIONS) and not user_input.get(
+                CONF_TRACKED_CUSTOM_INTEGRATIONS
             ):
                 errors["base"] = "no_integrations_selected"
             else:
                 return self.async_create_entry(
                     title="",
                     data={
-                        CONF_TRACKED_ADDONS: user_input.get(CONF_TRACKED_ADDONS, []),
                         CONF_TRACKED_INTEGRATIONS: user_input.get(
                             CONF_TRACKED_INTEGRATIONS, []
                         ),
@@ -168,7 +148,6 @@ class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
             session=async_get_clientsession(self.hass)
         )
         try:
-            addons = await client.get_addons()
             integrations = await client.get_integrations()
             custom_integrations = await client.get_custom_integrations()
         except HomeassistantAnalyticsConnectionError:
@@ -189,13 +168,6 @@ class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
             data_schema=self.add_suggested_values_to_schema(
                 vol.Schema(
                     {
-                        vol.Optional(CONF_TRACKED_ADDONS): SelectSelector(
-                            SelectSelectorConfig(
-                                options=list(addons),
-                                multiple=True,
-                                sort=True,
-                            )
-                        ),
                         vol.Optional(CONF_TRACKED_INTEGRATIONS): SelectSelector(
                             SelectSelectorConfig(
                                 options=options,
@@ -212,6 +184,6 @@ class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
                         ),
                     },
                 ),
-                self.config_entry.options,
+                self.options,
             ),
         )
diff --git a/homeassistant/components/analytics_insights/const.py b/homeassistant/components/analytics_insights/const.py
index 1a01755f9ed..56ea3f59794 100644
--- a/homeassistant/components/analytics_insights/const.py
+++ b/homeassistant/components/analytics_insights/const.py
@@ -4,7 +4,6 @@ import logging
 
 DOMAIN = "analytics_insights"
 
-CONF_TRACKED_ADDONS = "tracked_addons"
 CONF_TRACKED_INTEGRATIONS = "tracked_integrations"
 CONF_TRACKED_CUSTOM_INTEGRATIONS = "tracked_custom_integrations"
 
diff --git a/homeassistant/components/analytics_insights/coordinator.py b/homeassistant/components/analytics_insights/coordinator.py
index 701f1a8dbd4..3a7c40dfa82 100644
--- a/homeassistant/components/analytics_insights/coordinator.py
+++ b/homeassistant/components/analytics_insights/coordinator.py
@@ -12,13 +12,11 @@ from python_homeassistant_analytics import (
     HomeassistantAnalyticsConnectionError,
     HomeassistantAnalyticsNotModifiedError,
 )
-from python_homeassistant_analytics.models import Addon
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import (
-    CONF_TRACKED_ADDONS,
     CONF_TRACKED_CUSTOM_INTEGRATIONS,
     CONF_TRACKED_INTEGRATIONS,
     DOMAIN,
@@ -35,7 +33,6 @@ class AnalyticsData:
 
     active_installations: int
     reports_integrations: int
-    addons: dict[str, int]
     core_integrations: dict[str, int]
     custom_integrations: dict[str, int]
 
@@ -56,7 +53,6 @@ class HomeassistantAnalyticsDataUpdateCoordinator(DataUpdateCoordinator[Analytic
             update_interval=timedelta(hours=12),
         )
         self._client = client
-        self._tracked_addons = self.config_entry.options.get(CONF_TRACKED_ADDONS, [])
         self._tracked_integrations = self.config_entry.options[
             CONF_TRACKED_INTEGRATIONS
         ]
@@ -66,7 +62,6 @@ class HomeassistantAnalyticsDataUpdateCoordinator(DataUpdateCoordinator[Analytic
 
     async def _async_update_data(self) -> AnalyticsData:
         try:
-            addons_data = await self._client.get_addons()
             data = await self._client.get_current_analytics()
             custom_data = await self._client.get_custom_integrations()
         except HomeassistantAnalyticsConnectionError as err:
@@ -75,9 +70,6 @@ class HomeassistantAnalyticsDataUpdateCoordinator(DataUpdateCoordinator[Analytic
             ) from err
         except HomeassistantAnalyticsNotModifiedError:
             return self.data
-        addons = {
-            addon: get_addon_value(addons_data, addon) for addon in self._tracked_addons
-        }
         core_integrations = {
             integration: data.integrations.get(integration, 0)
             for integration in self._tracked_integrations
@@ -89,19 +81,11 @@ class HomeassistantAnalyticsDataUpdateCoordinator(DataUpdateCoordinator[Analytic
         return AnalyticsData(
             data.active_installations,
             data.reports_integrations,
-            addons,
             core_integrations,
             custom_integrations,
         )
 
 
-def get_addon_value(data: dict[str, Addon], name_slug: str) -> int:
-    """Get addon value."""
-    if name_slug in data:
-        return data[name_slug].total
-    return 0
-
-
 def get_custom_integration_value(
     data: dict[str, CustomIntegration], domain: str
 ) -> int:
diff --git a/homeassistant/components/analytics_insights/sensor.py b/homeassistant/components/analytics_insights/sensor.py
index 324ca6991d2..264c34e75ef 100644
--- a/homeassistant/components/analytics_insights/sensor.py
+++ b/homeassistant/components/analytics_insights/sensor.py
@@ -29,20 +29,6 @@ class AnalyticsSensorEntityDescription(SensorEntityDescription):
     value_fn: Callable[[AnalyticsData], StateType]
 
 
-def get_addon_entity_description(
-    name_slug: str,
-) -> AnalyticsSensorEntityDescription:
-    """Get addon entity description."""
-    return AnalyticsSensorEntityDescription(
-        key=f"addon_{name_slug}_active_installations",
-        translation_key="addons",
-        name=name_slug,
-        state_class=SensorStateClass.TOTAL,
-        native_unit_of_measurement="active installations",
-        value_fn=lambda data: data.addons.get(name_slug),
-    )
-
-
 def get_core_integration_entity_description(
     domain: str, name: str
 ) -> AnalyticsSensorEntityDescription:
@@ -103,13 +89,6 @@ async def async_setup_entry(
         analytics_data.coordinator
     )
     entities: list[HomeassistantAnalyticsSensor] = []
-    entities.extend(
-        HomeassistantAnalyticsSensor(
-            coordinator,
-            get_addon_entity_description(addon_name_slug),
-        )
-        for addon_name_slug in coordinator.data.addons
-    )
     entities.extend(
         HomeassistantAnalyticsSensor(
             coordinator,
diff --git a/homeassistant/components/analytics_insights/strings.json b/homeassistant/components/analytics_insights/strings.json
index 10d3c19a2f6..b3445fdf47e 100644
--- a/homeassistant/components/analytics_insights/strings.json
+++ b/homeassistant/components/analytics_insights/strings.json
@@ -3,12 +3,10 @@
     "step": {
       "user": {
         "data": {
-          "tracked_addons": "Addons",
           "tracked_integrations": "Integrations",
           "tracked_custom_integrations": "Custom integrations"
         },
         "data_description": {
-          "tracked_addons": "Select the addons you want to track",
           "tracked_integrations": "Select the integrations you want to track",
           "tracked_custom_integrations": "Select the custom integrations you want to track"
         }
@@ -26,12 +24,10 @@
     "step": {
       "init": {
         "data": {
-          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data::tracked_addons%]",
           "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_integrations%]",
           "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_custom_integrations%]"
         },
         "data_description": {
-          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data_description::tracked_addons%]",
           "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_integrations%]",
           "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_custom_integrations%]"
         }
diff --git a/homeassistant/components/androidtv/__init__.py b/homeassistant/components/androidtv/__init__.py
index 34c4212c913..34b324db169 100644
--- a/homeassistant/components/androidtv/__init__.py
+++ b/homeassistant/components/androidtv/__init__.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from dataclasses import dataclass
-import logging
 import os
 from typing import Any
 
@@ -41,7 +40,6 @@ from .const import (
     CONF_ADB_SERVER_IP,
     CONF_ADB_SERVER_PORT,
     CONF_ADBKEY,
-    CONF_SCREENCAP_INTERVAL,
     CONF_STATE_DETECTION_RULES,
     DEFAULT_ADB_SERVER_PORT,
     DEVICE_ANDROIDTV,
@@ -68,8 +66,6 @@ RELOAD_OPTIONS = [CONF_STATE_DETECTION_RULES]
 
 _INVALID_MACS = {"ff:ff:ff:ff:ff:ff"}
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @dataclass
 class AndroidTVRuntimeData:
@@ -161,32 +157,6 @@ async def async_connect_androidtv(
     return aftv, None
 
 
-async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Migrate old entry."""
-    _LOGGER.debug(
-        "Migrating configuration from version %s.%s", entry.version, entry.minor_version
-    )
-
-    if entry.version == 1:
-        new_options = {**entry.options}
-
-        # Migrate MinorVersion 1 -> MinorVersion 2: New option
-        if entry.minor_version < 2:
-            new_options = {**new_options, CONF_SCREENCAP_INTERVAL: 0}
-
-            hass.config_entries.async_update_entry(
-                entry, options=new_options, minor_version=2, version=1
-            )
-
-    _LOGGER.debug(
-        "Migration to configuration version %s.%s successful",
-        entry.version,
-        entry.minor_version,
-    )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: AndroidTVConfigEntry) -> bool:
     """Set up Android Debug Bridge platform."""
 
diff --git a/homeassistant/components/androidtv/config_flow.py b/homeassistant/components/androidtv/config_flow.py
index afaba5175da..e8350acc9cb 100644
--- a/homeassistant/components/androidtv/config_flow.py
+++ b/homeassistant/components/androidtv/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_HOST, CONF_PORT
 from homeassistant.core import callback
@@ -34,7 +34,7 @@ from .const import (
     CONF_APPS,
     CONF_EXCLUDE_UNNAMED_APPS,
     CONF_GET_SOURCES,
-    CONF_SCREENCAP_INTERVAL,
+    CONF_SCREENCAP,
     CONF_STATE_DETECTION_RULES,
     CONF_TURN_OFF_COMMAND,
     CONF_TURN_ON_COMMAND,
@@ -43,7 +43,7 @@ from .const import (
     DEFAULT_EXCLUDE_UNNAMED_APPS,
     DEFAULT_GET_SOURCES,
     DEFAULT_PORT,
-    DEFAULT_SCREENCAP_INTERVAL,
+    DEFAULT_SCREENCAP,
     DEVICE_CLASSES,
     DOMAIN,
     PROP_ETHMAC,
@@ -76,7 +76,6 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     VERSION = 1
-    MINOR_VERSION = 2
 
     @callback
     def _show_setup_form(
@@ -186,14 +185,16 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
         return OptionsFlowHandler(config_entry)
 
 
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle an option flow for Android Debug Bridge."""
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
-        self._apps: dict[str, Any] = dict(config_entry.options.get(CONF_APPS, {}))
-        self._state_det_rules: dict[str, Any] = dict(
-            config_entry.options.get(CONF_STATE_DETECTION_RULES, {})
+        super().__init__(config_entry)
+
+        self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {})
+        self._state_det_rules: dict[str, Any] = self.options.setdefault(
+            CONF_STATE_DETECTION_RULES, {}
         )
         self._conf_app_id: str | None = None
         self._conf_rule_id: str | None = None
@@ -235,7 +236,7 @@ class OptionsFlowHandler(OptionsFlow):
             SelectOptionDict(value=k, label=v) for k, v in apps_list.items()
         ]
         rules = [RULES_NEW_ID, *self._state_det_rules]
-        options = self.config_entry.options
+        options = self.options
 
         data_schema = vol.Schema(
             {
@@ -252,12 +253,10 @@ class OptionsFlowHandler(OptionsFlow):
                         CONF_EXCLUDE_UNNAMED_APPS, DEFAULT_EXCLUDE_UNNAMED_APPS
                     ),
                 ): bool,
-                vol.Required(
-                    CONF_SCREENCAP_INTERVAL,
-                    default=options.get(
-                        CONF_SCREENCAP_INTERVAL, DEFAULT_SCREENCAP_INTERVAL
-                    ),
-                ): vol.All(vol.Coerce(int), vol.Clamp(min=0, max=15)),
+                vol.Optional(
+                    CONF_SCREENCAP,
+                    default=options.get(CONF_SCREENCAP, DEFAULT_SCREENCAP),
+                ): bool,
                 vol.Optional(
                     CONF_TURN_OFF_COMMAND,
                     description={
diff --git a/homeassistant/components/androidtv/const.py b/homeassistant/components/androidtv/const.py
index 0d9bdc8f6c0..ee279c0fb3a 100644
--- a/homeassistant/components/androidtv/const.py
+++ b/homeassistant/components/androidtv/const.py
@@ -9,7 +9,6 @@ CONF_APPS = "apps"
 CONF_EXCLUDE_UNNAMED_APPS = "exclude_unnamed_apps"
 CONF_GET_SOURCES = "get_sources"
 CONF_SCREENCAP = "screencap"
-CONF_SCREENCAP_INTERVAL = "screencap_interval"
 CONF_STATE_DETECTION_RULES = "state_detection_rules"
 CONF_TURN_OFF_COMMAND = "turn_off_command"
 CONF_TURN_ON_COMMAND = "turn_on_command"
@@ -19,7 +18,7 @@ DEFAULT_DEVICE_CLASS = "auto"
 DEFAULT_EXCLUDE_UNNAMED_APPS = False
 DEFAULT_GET_SOURCES = True
 DEFAULT_PORT = 5555
-DEFAULT_SCREENCAP_INTERVAL = 5
+DEFAULT_SCREENCAP = True
 
 DEVICE_ANDROIDTV = "androidtv"
 DEVICE_FIRETV = "firetv"
diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py
index 728411ddf42..6e338529ad4 100644
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timedelta
+from datetime import timedelta
 import hashlib
 import logging
+from typing import Any
 
 from androidtv.constants import APPS, KEYS
 from androidtv.setup_async import AndroidTVAsync, FireTVAsync
@@ -22,19 +23,19 @@ from homeassistant.core import HomeAssistant
 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
-from homeassistant.util.dt import utcnow
+from homeassistant.util import Throttle
 
 from . import AndroidTVConfigEntry
 from .const import (
     CONF_APPS,
     CONF_EXCLUDE_UNNAMED_APPS,
     CONF_GET_SOURCES,
-    CONF_SCREENCAP_INTERVAL,
+    CONF_SCREENCAP,
     CONF_TURN_OFF_COMMAND,
     CONF_TURN_ON_COMMAND,
     DEFAULT_EXCLUDE_UNNAMED_APPS,
     DEFAULT_GET_SOURCES,
-    DEFAULT_SCREENCAP_INTERVAL,
+    DEFAULT_SCREENCAP,
     DEVICE_ANDROIDTV,
     SIGNAL_CONFIG_ENTITY,
 )
@@ -47,6 +48,8 @@ ATTR_DEVICE_PATH = "device_path"
 ATTR_HDMI_INPUT = "hdmi_input"
 ATTR_LOCAL_PATH = "local_path"
 
+MIN_TIME_BETWEEN_SCREENCAPS = timedelta(seconds=60)
+
 SERVICE_ADB_COMMAND = "adb_command"
 SERVICE_DOWNLOAD = "download"
 SERVICE_LEARN_SENDEVENT = "learn_sendevent"
@@ -122,8 +125,7 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
         self._app_name_to_id: dict[str, str] = {}
         self._get_sources = DEFAULT_GET_SOURCES
         self._exclude_unnamed_apps = DEFAULT_EXCLUDE_UNNAMED_APPS
-        self._screencap_delta: timedelta | None = None
-        self._last_screencap: datetime | None = None
+        self._screencap = DEFAULT_SCREENCAP
         self.turn_on_command: str | None = None
         self.turn_off_command: str | None = None
 
@@ -157,13 +159,7 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
         self._exclude_unnamed_apps = options.get(
             CONF_EXCLUDE_UNNAMED_APPS, DEFAULT_EXCLUDE_UNNAMED_APPS
         )
-        screencap_interval: int = options.get(
-            CONF_SCREENCAP_INTERVAL, DEFAULT_SCREENCAP_INTERVAL
-        )
-        if screencap_interval > 0:
-            self._screencap_delta = timedelta(minutes=screencap_interval)
-        else:
-            self._screencap_delta = None
+        self._screencap = options.get(CONF_SCREENCAP, DEFAULT_SCREENCAP)
         self.turn_off_command = options.get(CONF_TURN_OFF_COMMAND)
         self.turn_on_command = options.get(CONF_TURN_ON_COMMAND)
 
@@ -187,7 +183,7 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
     async def _async_get_screencap(self, prev_app_id: str | None = None) -> None:
         """Take a screen capture from the device when enabled."""
         if (
-            not self._screencap_delta
+            not self._screencap
             or self.state in {MediaPlayerState.OFF, None}
             or not self.available
         ):
@@ -197,18 +193,11 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
             force: bool = prev_app_id is not None
             if force:
                 force = prev_app_id != self._attr_app_id
-            await self._adb_get_screencap(force)
+            await self._adb_get_screencap(no_throttle=force)
 
-    async def _adb_get_screencap(self, force: bool = False) -> None:
-        """Take a screen capture from the device every configured minutes."""
-        time_elapsed = self._screencap_delta is not None and (
-            self._last_screencap is None
-            or (utcnow() - self._last_screencap) >= self._screencap_delta
-        )
-        if not (force or time_elapsed):
-            return
-
-        self._last_screencap = utcnow()
+    @Throttle(MIN_TIME_BETWEEN_SCREENCAPS)
+    async def _adb_get_screencap(self, **kwargs: Any) -> None:
+        """Take a screen capture from the device every 60 seconds."""
         if media_data := await self._adb_screencap():
             self._media_image = media_data, "image/png"
             self._attr_media_image_hash = hashlib.sha256(media_data).hexdigest()[:16]
diff --git a/homeassistant/components/androidtv/strings.json b/homeassistant/components/androidtv/strings.json
index b6f5d494d0f..3032e9ac6ef 100644
--- a/homeassistant/components/androidtv/strings.json
+++ b/homeassistant/components/androidtv/strings.json
@@ -31,7 +31,7 @@
           "apps": "Configure applications list",
           "get_sources": "Retrieve the running apps as the list of sources",
           "exclude_unnamed_apps": "Exclude apps with unknown name from the sources list",
-          "screencap_interval": "Interval in minutes between screen capture for album art (set 0 to disable)",
+          "screencap": "Use screen capture for album art",
           "state_detection_rules": "Configure state detection rules",
           "turn_off_command": "ADB shell turn off command (leave empty for default)",
           "turn_on_command": "ADB shell turn on command (leave empty for default)"
diff --git a/homeassistant/components/androidtv_remote/config_flow.py b/homeassistant/components/androidtv_remote/config_flow.py
index 3500e4ff47b..3512dd5ea65 100644
--- a/homeassistant/components/androidtv_remote/config_flow.py
+++ b/homeassistant/components/androidtv_remote/config_flow.py
@@ -20,7 +20,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.core import callback
@@ -221,12 +221,13 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
         return AndroidTVRemoteOptionsFlowHandler(config_entry)
 
 
-class AndroidTVRemoteOptionsFlowHandler(OptionsFlow):
+class AndroidTVRemoteOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Android TV Remote options flow."""
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
-        self._apps: dict[str, Any] = dict(config_entry.options.get(CONF_APPS, {}))
+        super().__init__(config_entry)
+        self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {})
         self._conf_app_id: str | None = None
 
     @callback
diff --git a/homeassistant/components/anova/__init__.py b/homeassistant/components/anova/__init__.py
index 4ae4750b9a9..02c468c1319 100644
--- a/homeassistant/components/anova/__init__.py
+++ b/homeassistant/components/anova/__init__.py
@@ -13,7 +13,7 @@ from anova_wifi import (
     WebsocketFailure,
 )
 
-from homeassistant.const import CONF_DEVICES, CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client
@@ -71,25 +71,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: AnovaConfigEntry) -> bo
         # Disconnect from WS
         await entry.runtime_data.api.disconnect_websocket()
     return unload_ok
-
-
-async def async_migrate_entry(hass: HomeAssistant, entry: AnovaConfigEntry) -> bool:
-    """Migrate entry."""
-    _LOGGER.debug("Migrating from version %s:%s", entry.version, entry.minor_version)
-
-    if entry.version > 1:
-        # This means the user has downgraded from a future version
-        return False
-
-    if entry.version == 1 and entry.minor_version == 1:
-        new_data = {**entry.data}
-        if CONF_DEVICES in new_data:
-            new_data.pop(CONF_DEVICES)
-
-        hass.config_entries.async_update_entry(entry, data=new_data, minor_version=2)
-
-    _LOGGER.debug(
-        "Migration to version %s:%s successful", entry.version, entry.minor_version
-    )
-
-    return True
diff --git a/homeassistant/components/anova/config_flow.py b/homeassistant/components/anova/config_flow.py
index bc4723b1dba..6e331ccf4a2 100644
--- a/homeassistant/components/anova/config_flow.py
+++ b/homeassistant/components/anova/config_flow.py
@@ -6,7 +6,7 @@ from anova_wifi import AnovaApi, InvalidLogin
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_DEVICES, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
@@ -16,7 +16,6 @@ class AnovaConfligFlow(ConfigFlow, domain=DOMAIN):
     """Sets up a config flow for Anova."""
 
     VERSION = 1
-    MINOR_VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, str] | None = None
@@ -43,6 +42,8 @@ class AnovaConfligFlow(ConfigFlow, domain=DOMAIN):
                     data={
                         CONF_USERNAME: user_input[CONF_USERNAME],
                         CONF_PASSWORD: user_input[CONF_PASSWORD],
+                        # this can be removed in a migration to 1.2 in 2024.11
+                        CONF_DEVICES: [],
                     },
                 )
 
diff --git a/homeassistant/components/anthropic/config_flow.py b/homeassistant/components/anthropic/config_flow.py
index fa43a3c4bcc..5ea167090c6 100644
--- a/homeassistant/components/anthropic/config_flow.py
+++ b/homeassistant/components/anthropic/config_flow.py
@@ -121,6 +121,7 @@ class AnthropicOptionsFlow(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self.last_rendered_recommended = config_entry.options.get(
             CONF_RECOMMENDED, False
         )
diff --git a/homeassistant/components/aranet/__init__.py b/homeassistant/components/aranet/__init__.py
index 81b3dae04de..3a2bc266653 100644
--- a/homeassistant/components/aranet/__init__.py
+++ b/homeassistant/components/aranet/__init__.py
@@ -15,14 +15,12 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
+from .const import DOMAIN
+
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
-type AranetConfigEntry = ConfigEntry[
-    PassiveBluetoothProcessorCoordinator[Aranet4Advertisement]
-]
-
 
 def _service_info_to_adv(
     service_info: BluetoothServiceInfoBleak,
@@ -30,25 +28,30 @@ def _service_info_to_adv(
     return Aranet4Advertisement(service_info.device, service_info.advertisement)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: AranetConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Aranet from a config entry."""
 
     address = entry.unique_id
     assert address is not None
-    coordinator = PassiveBluetoothProcessorCoordinator(
-        hass,
-        _LOGGER,
-        address=address,
-        mode=BluetoothScanningMode.PASSIVE,
-        update_method=_service_info_to_adv,
+    coordinator = hass.data.setdefault(DOMAIN, {})[entry.entry_id] = (
+        PassiveBluetoothProcessorCoordinator(
+            hass,
+            _LOGGER,
+            address=address,
+            mode=BluetoothScanningMode.PASSIVE,
+            update_method=_service_info_to_adv,
+        )
     )
-    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    # only start after all platforms have had a chance to subscribe
-    entry.async_on_unload(coordinator.async_start())
+    entry.async_on_unload(
+        coordinator.async_start()
+    )  # only start after all platforms have had a chance to subscribe
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: AranetConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    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/aranet/sensor.py b/homeassistant/components/aranet/sensor.py
index d7fbd0e4b3b..1dc4b9f956e 100644
--- a/homeassistant/components/aranet/sensor.py
+++ b/homeassistant/components/aranet/sensor.py
@@ -8,10 +8,12 @@ from typing import Any
 from aranet4.client import Aranet4Advertisement
 from bleak.backends.device import BLEDevice
 
+from homeassistant import config_entries
 from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothDataProcessor,
     PassiveBluetoothDataUpdate,
     PassiveBluetoothEntityKey,
+    PassiveBluetoothProcessorCoordinator,
     PassiveBluetoothProcessorEntity,
 )
 from homeassistant.components.sensor import (
@@ -36,8 +38,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AranetConfigEntry
-from .const import ARANET_MANUFACTURER_NAME
+from .const import ARANET_MANUFACTURER_NAME, DOMAIN
 
 
 @dataclass(frozen=True)
@@ -173,17 +174,20 @@ def sensor_update_to_bluetooth_data_update(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: AranetConfigEntry,
+    entry: config_entries.ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Aranet sensors."""
+    coordinator: PassiveBluetoothProcessorCoordinator[Aranet4Advertisement] = hass.data[
+        DOMAIN
+    ][entry.entry_id]
     processor = PassiveBluetoothDataProcessor(sensor_update_to_bluetooth_data_update)
     entry.async_on_unload(
         processor.async_add_entities_listener(
             Aranet4BluetoothSensorEntity, async_add_entities
         )
     )
-    entry.async_on_unload(entry.runtime_data.async_register_processor(processor))
+    entry.async_on_unload(coordinator.async_register_processor(processor))
 
 
 class Aranet4BluetoothSensorEntity(
diff --git a/homeassistant/components/assist_pipeline/audio_enhancer.py b/homeassistant/components/assist_pipeline/audio_enhancer.py
index 1fabc7790e7..ff2b122187a 100644
--- a/homeassistant/components/assist_pipeline/audio_enhancer.py
+++ b/homeassistant/components/assist_pipeline/audio_enhancer.py
@@ -22,8 +22,8 @@ class EnhancedAudioChunk:
     timestamp_ms: int
     """Timestamp relative to start of audio stream (milliseconds)"""
 
-    speech_probability: float | None
-    """Probability that audio chunk contains speech (0-1), None if unknown"""
+    is_speech: bool | None
+    """True if audio chunk likely contains speech, False if not, None if unknown"""
 
 
 class AudioEnhancer(ABC):
@@ -70,27 +70,27 @@ class MicroVadSpeexEnhancer(AudioEnhancer):
             )
 
         self.vad: MicroVad | None = None
+        self.threshold = 0.5
 
         if self.is_vad_enabled:
             self.vad = MicroVad()
-            _LOGGER.debug("Initialized microVAD")
+            _LOGGER.debug("Initialized microVAD with threshold=%s", self.threshold)
 
     def enhance_chunk(self, audio: bytes, timestamp_ms: int) -> EnhancedAudioChunk:
         """Enhance 10ms chunk of PCM audio @ 16Khz with 16-bit mono samples."""
-        speech_probability: float | None = None
+        is_speech: bool | None = None
 
         assert len(audio) == BYTES_PER_CHUNK
 
         if self.vad is not None:
             # Run VAD
-            speech_probability = self.vad.Process10ms(audio)
+            speech_prob = self.vad.Process10ms(audio)
+            is_speech = speech_prob > self.threshold
 
         if self.audio_processor is not None:
             # Run noise suppression and auto gain
             audio = self.audio_processor.Process10ms(audio).audio
 
         return EnhancedAudioChunk(
-            audio=audio,
-            timestamp_ms=timestamp_ms,
-            speech_probability=speech_probability,
+            audio=audio, timestamp_ms=timestamp_ms, is_speech=is_speech
         )
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
index a55e23ae051..a4255e37756 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -780,9 +780,7 @@ class PipelineRun:
                 # speaking the voice command.
                 audio_chunks_for_stt.extend(
                     EnhancedAudioChunk(
-                        audio=chunk_ts[0],
-                        timestamp_ms=chunk_ts[1],
-                        speech_probability=None,
+                        audio=chunk_ts[0], timestamp_ms=chunk_ts[1], is_speech=False
                     )
                     for chunk_ts in result.queued_audio
                 )
@@ -829,7 +827,7 @@ class PipelineRun:
 
             if wake_word_vad is not None:
                 chunk_seconds = (len(chunk.audio) // sample_width) / sample_rate
-                if not wake_word_vad.process(chunk_seconds, chunk.speech_probability):
+                if not wake_word_vad.process(chunk_seconds, chunk.is_speech):
                     raise WakeWordTimeoutError(
                         code="wake-word-timeout", message="Wake word was not detected"
                     )
@@ -957,7 +955,7 @@ class PipelineRun:
 
             if stt_vad is not None:
                 chunk_seconds = (len(chunk.audio) // sample_width) / sample_rate
-                if not stt_vad.process(chunk_seconds, chunk.speech_probability):
+                if not stt_vad.process(chunk_seconds, chunk.is_speech):
                     # Silence detected at the end of voice command
                     self.process_event(
                         PipelineEvent(
@@ -1223,7 +1221,7 @@ class PipelineRun:
                 yield EnhancedAudioChunk(
                     audio=sub_chunk,
                     timestamp_ms=timestamp_ms,
-                    speech_probability=None,  # no VAD
+                    is_speech=None,  # no VAD
                 )
                 timestamp_ms += MS_PER_CHUNK
 
diff --git a/homeassistant/components/assist_pipeline/vad.py b/homeassistant/components/assist_pipeline/vad.py
index deae5b9b7b3..4782d14dee4 100644
--- a/homeassistant/components/assist_pipeline/vad.py
+++ b/homeassistant/components/assist_pipeline/vad.py
@@ -75,7 +75,7 @@ class AudioBuffer:
 class VoiceCommandSegmenter:
     """Segments an audio stream into voice commands."""
 
-    speech_seconds: float = 0.1
+    speech_seconds: float = 0.3
     """Seconds of speech before voice command has started."""
 
     command_seconds: float = 1.0
@@ -96,12 +96,6 @@ class VoiceCommandSegmenter:
     timed_out: bool = False
     """True a timeout occurred during voice command."""
 
-    before_command_speech_threshold: float = 0.2
-    """Probability threshold for speech before voice command."""
-
-    in_command_speech_threshold: float = 0.5
-    """Probability threshold for speech during voice command."""
-
     _speech_seconds_left: float = 0.0
     """Seconds left before considering voice command as started."""
 
@@ -130,7 +124,7 @@ class VoiceCommandSegmenter:
         self._reset_seconds_left = self.reset_seconds
         self.in_command = False
 
-    def process(self, chunk_seconds: float, speech_probability: float | None) -> bool:
+    def process(self, chunk_seconds: float, is_speech: bool | None) -> bool:
         """Process samples using external VAD.
 
         Returns False when command is done.
@@ -148,12 +142,7 @@ class VoiceCommandSegmenter:
             self.timed_out = True
             return False
 
-        if speech_probability is None:
-            speech_probability = 0.0
-
         if not self.in_command:
-            # Before command
-            is_speech = speech_probability > self.before_command_speech_threshold
             if is_speech:
                 self._reset_seconds_left = self.reset_seconds
                 self._speech_seconds_left -= chunk_seconds
@@ -171,29 +160,24 @@ class VoiceCommandSegmenter:
                 if self._reset_seconds_left <= 0:
                     self._speech_seconds_left = self.speech_seconds
                     self._reset_seconds_left = self.reset_seconds
+        elif not is_speech:
+            # Silence in command
+            self._reset_seconds_left = self.reset_seconds
+            self._silence_seconds_left -= chunk_seconds
+            self._command_seconds_left -= chunk_seconds
+            if (self._silence_seconds_left <= 0) and (self._command_seconds_left <= 0):
+                # Command finished successfully
+                self.reset()
+                _LOGGER.debug("Voice command finished")
+                return False
         else:
-            # In command
-            is_speech = speech_probability > self.in_command_speech_threshold
-            if not is_speech:
-                # Silence in command
+            # Speech in command.
+            # Reset silence counter if enough speech.
+            self._reset_seconds_left -= chunk_seconds
+            self._command_seconds_left -= chunk_seconds
+            if self._reset_seconds_left <= 0:
+                self._silence_seconds_left = self.silence_seconds
                 self._reset_seconds_left = self.reset_seconds
-                self._silence_seconds_left -= chunk_seconds
-                self._command_seconds_left -= chunk_seconds
-                if (self._silence_seconds_left <= 0) and (
-                    self._command_seconds_left <= 0
-                ):
-                    # Command finished successfully
-                    self.reset()
-                    _LOGGER.debug("Voice command finished")
-                    return False
-            else:
-                # Speech in command.
-                # Reset silence counter if enough speech.
-                self._reset_seconds_left -= chunk_seconds
-                self._command_seconds_left -= chunk_seconds
-                if self._reset_seconds_left <= 0:
-                    self._silence_seconds_left = self.silence_seconds
-                    self._reset_seconds_left = self.reset_seconds
 
         return True
 
@@ -242,9 +226,6 @@ class VoiceActivityTimeout:
     reset_seconds: float = 0.5
     """Seconds of speech before resetting timeout."""
 
-    speech_threshold: float = 0.5
-    """Threshold for speech."""
-
     _silence_seconds_left: float = 0.0
     """Seconds left before considering voice command as stopped."""
 
@@ -260,15 +241,12 @@ class VoiceActivityTimeout:
         self._silence_seconds_left = self.silence_seconds
         self._reset_seconds_left = self.reset_seconds
 
-    def process(self, chunk_seconds: float, speech_probability: float | None) -> bool:
+    def process(self, chunk_seconds: float, is_speech: bool | None) -> bool:
         """Process samples using external VAD.
 
         Returns False when timeout is reached.
         """
-        if speech_probability is None:
-            speech_probability = 0.0
-
-        if speech_probability > self.speech_threshold:
+        if is_speech:
             # Speech
             self._reset_seconds_left -= chunk_seconds
             if self._reset_seconds_left <= 0:
diff --git a/homeassistant/components/autarco/manifest.json b/homeassistant/components/autarco/manifest.json
index 0567aeba722..0058ab9af77 100644
--- a/homeassistant/components/autarco/manifest.json
+++ b/homeassistant/components/autarco/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/autarco",
   "iot_class": "cloud_polling",
-  "requirements": ["autarco==3.1.0"]
+  "requirements": ["autarco==3.0.0"]
 }
diff --git a/homeassistant/components/awair/manifest.json b/homeassistant/components/awair/manifest.json
index a0fbd350dab..25257bc3e1c 100644
--- a/homeassistant/components/awair/manifest.json
+++ b/homeassistant/components/awair/manifest.json
@@ -3,6 +3,11 @@
   "name": "Awair",
   "codeowners": ["@ahayworth", "@danielsjf"],
   "config_flow": true,
+  "dhcp": [
+    {
+      "macaddress": "70886B1*"
+    }
+  ],
   "documentation": "https://www.home-assistant.io/integrations/awair",
   "iot_class": "local_polling",
   "loggers": ["python_awair"],
diff --git a/homeassistant/components/axis/config_flow.py b/homeassistant/components/axis/config_flow.py
index 592b1e2d41f..84d9880b7f8 100644
--- a/homeassistant/components/axis/config_flow.py
+++ b/homeassistant/components/axis/config_flow.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_HOST,
@@ -59,11 +59,9 @@ class AxisFlowHandler(ConfigFlow, domain=AXIS_DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> AxisOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> AxisOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return AxisOptionsFlowHandler()
+        return AxisOptionsFlowHandler(config_entry)
 
     def __init__(self) -> None:
         """Initialize the Axis config flow."""
@@ -266,7 +264,7 @@ class AxisFlowHandler(ConfigFlow, domain=AXIS_DOMAIN):
         return await self.async_step_user()
 
 
-class AxisOptionsFlowHandler(OptionsFlow):
+class AxisOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle Axis device options."""
 
     config_entry: AxisConfigEntry
@@ -284,7 +282,8 @@ class AxisOptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the Axis device stream options."""
         if user_input is not None:
-            return self.async_create_entry(data=self.config_entry.options | user_input)
+            self.options.update(user_input)
+            return self.async_create_entry(title="", data=self.options)
 
         schema = {}
 
diff --git a/homeassistant/components/axis/manifest.json b/homeassistant/components/axis/manifest.json
index d2265307d47..e028736f4ca 100644
--- a/homeassistant/components/axis/manifest.json
+++ b/homeassistant/components/axis/manifest.json
@@ -30,7 +30,7 @@
   "iot_class": "local_push",
   "loggers": ["axis"],
   "quality_scale": "platinum",
-  "requirements": ["axis==63"],
+  "requirements": ["axis==62"],
   "ssdp": [
     {
       "manufacturer": "AXIS"
diff --git a/homeassistant/components/azure_event_hub/config_flow.py b/homeassistant/components/azure_event_hub/config_flow.py
index 60ac9bff8cd..046851e6926 100644
--- a/homeassistant/components/azure_event_hub/config_flow.py
+++ b/homeassistant/components/azure_event_hub/config_flow.py
@@ -124,9 +124,7 @@ class AEHConfigFlow(ConfigFlow, domain=DOMAIN):
                 step_id=STEP_CONN_STRING,
                 data_schema=CONN_STRING_SCHEMA,
                 errors=errors,
-                description_placeholders={
-                    "event_hub_instance_name": self._data[CONF_EVENT_HUB_INSTANCE_NAME]
-                },
+                description_placeholders=self._data[CONF_EVENT_HUB_INSTANCE_NAME],
                 last_step=True,
             )
 
@@ -146,9 +144,7 @@ class AEHConfigFlow(ConfigFlow, domain=DOMAIN):
                 step_id=STEP_SAS,
                 data_schema=SAS_SCHEMA,
                 errors=errors,
-                description_placeholders={
-                    "event_hub_instance_name": self._data[CONF_EVENT_HUB_INSTANCE_NAME]
-                },
+                description_placeholders=self._data[CONF_EVENT_HUB_INSTANCE_NAME],
                 last_step=True,
             )
 
diff --git a/homeassistant/components/backup/__init__.py b/homeassistant/components/backup/__init__.py
index 907fda4c7f8..59f1e0c7fb5 100644
--- a/homeassistant/components/backup/__init__.py
+++ b/homeassistant/components/backup/__init__.py
@@ -1,8 +1,8 @@
 """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.hassio import is_hassio
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_MANAGER, DOMAIN, LOGGER
@@ -32,9 +32,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     async def async_handle_create_service(call: ServiceCall) -> None:
         """Service handler for creating backups."""
-        await backup_manager.async_create_backup(on_progress=None)
-        if backup_task := backup_manager.backup_task:
-            await backup_task
+        await backup_manager.async_create_backup()
 
     hass.services.async_register(DOMAIN, "create", async_handle_create_service)
 
diff --git a/homeassistant/components/backup/const.py b/homeassistant/components/backup/const.py
index f613f7cc352..90faa33fc7f 100644
--- a/homeassistant/components/backup/const.py
+++ b/homeassistant/components/backup/const.py
@@ -17,7 +17,6 @@ LOGGER = getLogger(__package__)
 EXCLUDE_FROM_BACKUP = [
     "__pycache__/*",
     ".DS_Store",
-    ".HA_RESTORE",
     "*.db-shm",
     "*.log.*",
     "*.log",
diff --git a/homeassistant/components/backup/http.py b/homeassistant/components/backup/http.py
index 42693035bd3..4cc4e61c9e4 100644
--- a/homeassistant/components/backup/http.py
+++ b/homeassistant/components/backup/http.py
@@ -2,26 +2,23 @@
 
 from __future__ import annotations
 
-import asyncio
 from http import HTTPStatus
-from typing import cast
 
-from aiohttp import BodyPartReader
 from aiohttp.hdrs import CONTENT_DISPOSITION
 from aiohttp.web import FileResponse, Request, Response
 
-from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
+from homeassistant.components.http import KEY_HASS, HomeAssistantView
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import slugify
 
-from .const import DATA_MANAGER
+from .const import DOMAIN
+from .manager import BaseBackupManager
 
 
 @callback
 def async_register_http_views(hass: HomeAssistant) -> None:
     """Register the http views."""
     hass.http.register_view(DownloadBackupView)
-    hass.http.register_view(UploadBackupView)
 
 
 class DownloadBackupView(HomeAssistantView):
@@ -39,7 +36,7 @@ class DownloadBackupView(HomeAssistantView):
         if not request["hass_user"].is_admin:
             return Response(status=HTTPStatus.UNAUTHORIZED)
 
-        manager = request.app[KEY_HASS].data[DATA_MANAGER]
+        manager: BaseBackupManager = request.app[KEY_HASS].data[DOMAIN]
         backup = await manager.async_get_backup(slug=slug)
 
         if backup is None or not backup.path.exists():
@@ -51,29 +48,3 @@ class DownloadBackupView(HomeAssistantView):
                 CONTENT_DISPOSITION: f"attachment; filename={slugify(backup.name)}.tar"
             },
         )
-
-
-class UploadBackupView(HomeAssistantView):
-    """Generate backup view."""
-
-    url = "/api/backup/upload"
-    name = "api:backup:upload"
-
-    @require_admin
-    async def post(self, request: Request) -> Response:
-        """Upload a backup file."""
-        manager = request.app[KEY_HASS].data[DATA_MANAGER]
-        reader = await request.multipart()
-        contents = cast(BodyPartReader, await reader.next())
-
-        try:
-            await manager.async_receive_backup(contents=contents)
-        except OSError as err:
-            return Response(
-                body=f"Can't write backup file {err}",
-                status=HTTPStatus.INTERNAL_SERVER_ERROR,
-            )
-        except asyncio.CancelledError:
-            return Response(status=HTTPStatus.INTERNAL_SERVER_ERROR)
-
-        return Response(status=HTTPStatus.CREATED)
diff --git a/homeassistant/components/backup/manager.py b/homeassistant/components/backup/manager.py
index ddc0a1eac3f..701174e1b8d 100644
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -4,24 +4,18 @@ from __future__ import annotations
 
 import abc
 import asyncio
-from collections.abc import Callable
 from dataclasses import asdict, dataclass
 import hashlib
 import io
 import json
 from pathlib import Path
-from queue import SimpleQueue
-import shutil
 import tarfile
 from tarfile import TarError
-from tempfile import TemporaryDirectory
 import time
 from typing import Any, Protocol, cast
 
-import aiohttp
 from securetar import SecureTarFile, atomic_contents_add
 
-from homeassistant.backup_restore import RESTORE_BACKUP_FILE
 from homeassistant.const import __version__ as HAVERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -35,13 +29,6 @@ from .const import DOMAIN, EXCLUDE_FROM_BACKUP, LOGGER
 BUF_SIZE = 2**20 * 4  # 4MB
 
 
-@dataclass(slots=True)
-class NewBackup:
-    """New backup class."""
-
-    slug: str
-
-
 @dataclass(slots=True)
 class Backup:
     """Backup class."""
@@ -57,15 +44,6 @@ class Backup:
         return {**asdict(self), "path": self.path.as_posix()}
 
 
-@dataclass(slots=True)
-class BackupProgress:
-    """Backup progress class."""
-
-    done: bool
-    stage: str | None
-    success: bool | None
-
-
 class BackupPlatformProtocol(Protocol):
     """Define the format that backup platforms can have."""
 
@@ -82,7 +60,7 @@ class BaseBackupManager(abc.ABC):
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the backup manager."""
         self.hass = hass
-        self.backup_task: asyncio.Task | None = None
+        self.backing_up = False
         self.backups: dict[str, Backup] = {}
         self.loaded_platforms = False
         self.platforms: dict[str, BackupPlatformProtocol] = {}
@@ -146,16 +124,7 @@ class BaseBackupManager(abc.ABC):
         self.loaded_platforms = True
 
     @abc.abstractmethod
-    async def async_restore_backup(self, slug: str, **kwargs: Any) -> None:
-        """Restore a backup."""
-
-    @abc.abstractmethod
-    async def async_create_backup(
-        self,
-        *,
-        on_progress: Callable[[BackupProgress], None] | None,
-        **kwargs: Any,
-    ) -> NewBackup:
+    async def async_create_backup(self, **kwargs: Any) -> Backup:
         """Generate a backup."""
 
     @abc.abstractmethod
@@ -173,15 +142,6 @@ class BaseBackupManager(abc.ABC):
     async def async_remove_backup(self, *, slug: str, **kwargs: Any) -> None:
         """Remove a backup."""
 
-    @abc.abstractmethod
-    async def async_receive_backup(
-        self,
-        *,
-        contents: aiohttp.BodyPartReader,
-        **kwargs: Any,
-    ) -> None:
-        """Receive and store a backup file from upload."""
-
 
 class BackupManager(BaseBackupManager):
     """Backup manager for the Backup integration."""
@@ -257,93 +217,17 @@ class BackupManager(BaseBackupManager):
         LOGGER.debug("Removed backup located at %s", backup.path)
         self.backups.pop(slug)
 
-    async def async_receive_backup(
-        self,
-        *,
-        contents: aiohttp.BodyPartReader,
-        **kwargs: Any,
-    ) -> None:
-        """Receive and store a backup file from upload."""
-        queue: SimpleQueue[tuple[bytes, asyncio.Future[None] | None] | None] = (
-            SimpleQueue()
-        )
-        temp_dir_handler = await self.hass.async_add_executor_job(TemporaryDirectory)
-        target_temp_file = Path(
-            temp_dir_handler.name, contents.filename or "backup.tar"
-        )
-
-        def _sync_queue_consumer() -> None:
-            with target_temp_file.open("wb") as file_handle:
-                while True:
-                    if (_chunk_future := queue.get()) is None:
-                        break
-                    _chunk, _future = _chunk_future
-                    if _future is not None:
-                        self.hass.loop.call_soon_threadsafe(_future.set_result, None)
-                    file_handle.write(_chunk)
-
-        fut: asyncio.Future[None] | None = None
-        try:
-            fut = self.hass.async_add_executor_job(_sync_queue_consumer)
-            megabytes_sending = 0
-            while chunk := await contents.read_chunk(BUF_SIZE):
-                megabytes_sending += 1
-                if megabytes_sending % 5 != 0:
-                    queue.put_nowait((chunk, None))
-                    continue
-
-                chunk_future = self.hass.loop.create_future()
-                queue.put_nowait((chunk, chunk_future))
-                await asyncio.wait(
-                    (fut, chunk_future),
-                    return_when=asyncio.FIRST_COMPLETED,
-                )
-                if fut.done():
-                    # The executor job failed
-                    break
-
-            queue.put_nowait(None)  # terminate queue consumer
-        finally:
-            if fut is not None:
-                await fut
-
-        def _move_and_cleanup() -> None:
-            shutil.move(target_temp_file, self.backup_dir / target_temp_file.name)
-            temp_dir_handler.cleanup()
-
-        await self.hass.async_add_executor_job(_move_and_cleanup)
-        await self.load_backups()
-
-    async def async_create_backup(
-        self,
-        *,
-        on_progress: Callable[[BackupProgress], None] | None,
-        **kwargs: Any,
-    ) -> NewBackup:
+    async def async_create_backup(self, **kwargs: Any) -> Backup:
         """Generate a backup."""
-        if self.backup_task:
+        if self.backing_up:
             raise HomeAssistantError("Backup already in progress")
-        backup_name = f"Core {HAVERSION}"
-        date_str = dt_util.now().isoformat()
-        slug = _generate_slug(date_str, backup_name)
-        self.backup_task = self.hass.async_create_task(
-            self._async_create_backup(backup_name, date_str, slug, on_progress),
-            name="backup_manager_create_backup",
-            eager_start=False,  # To ensure the task is not started before we return
-        )
-        return NewBackup(slug=slug)
 
-    async def _async_create_backup(
-        self,
-        backup_name: str,
-        date_str: str,
-        slug: str,
-        on_progress: Callable[[BackupProgress], None] | None,
-    ) -> Backup:
-        """Generate a backup."""
-        success = False
         try:
+            self.backing_up = True
             await self.async_pre_backup_actions()
+            backup_name = f"Core {HAVERSION}"
+            date_str = dt_util.now().isoformat()
+            slug = _generate_slug(date_str, backup_name)
 
             backup_data = {
                 "slug": slug,
@@ -370,12 +254,9 @@ class BackupManager(BaseBackupManager):
             if self.loaded_backups:
                 self.backups[slug] = backup
             LOGGER.debug("Generated new backup with slug %s", slug)
-            success = True
             return backup
         finally:
-            if on_progress:
-                on_progress(BackupProgress(done=True, stage=None, success=success))
-            self.backup_task = None
+            self.backing_up = False
             await self.async_post_backup_actions()
 
     def _mkdir_and_generate_backup_contents(
@@ -410,25 +291,6 @@ class BackupManager(BaseBackupManager):
 
         return tar_file_path.stat().st_size
 
-    async def async_restore_backup(self, slug: str, **kwargs: Any) -> None:
-        """Restore a backup.
-
-        This will write the restore information to .HA_RESTORE which
-        will be handled during startup by the restore_backup module.
-        """
-        if (backup := await self.async_get_backup(slug=slug)) is None:
-            raise HomeAssistantError(f"Backup {slug} not found")
-
-        def _write_restore_file() -> None:
-            """Write the restore file."""
-            Path(self.hass.config.path(RESTORE_BACKUP_FILE)).write_text(
-                json.dumps({"path": backup.path.as_posix()}),
-                encoding="utf-8",
-            )
-
-        await self.hass.async_add_executor_job(_write_restore_file)
-        await self.hass.services.async_call("homeassistant", "restart", {})
-
 
 def _generate_slug(date: str, name: str) -> str:
     """Generate a backup slug."""
diff --git a/homeassistant/components/backup/websocket.py b/homeassistant/components/backup/websocket.py
index a7c61b7c66c..7daaaad1ec7 100644
--- a/homeassistant/components/backup/websocket.py
+++ b/homeassistant/components/backup/websocket.py
@@ -8,7 +8,6 @@ from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
 
 from .const import DATA_MANAGER, LOGGER
-from .manager import BackupProgress
 
 
 @callback
@@ -23,7 +22,6 @@ def async_register_websocket_handlers(hass: HomeAssistant, with_hassio: bool) ->
     websocket_api.async_register_command(hass, handle_info)
     websocket_api.async_register_command(hass, handle_create)
     websocket_api.async_register_command(hass, handle_remove)
-    websocket_api.async_register_command(hass, handle_restore)
 
 
 @websocket_api.require_admin
@@ -41,7 +39,7 @@ async def handle_info(
         msg["id"],
         {
             "backups": list(backups.values()),
-            "backing_up": manager.backup_task is not None,
+            "backing_up": manager.backing_up,
         },
     )
 
@@ -87,24 +85,6 @@ async def handle_remove(
     connection.send_result(msg["id"])
 
 
-@websocket_api.require_admin
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "backup/restore",
-        vol.Required("slug"): str,
-    }
-)
-@websocket_api.async_response
-async def handle_restore(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Restore a backup."""
-    await hass.data[DATA_MANAGER].async_restore_backup(msg["slug"])
-    connection.send_result(msg["id"])
-
-
 @websocket_api.require_admin
 @websocket_api.websocket_command({vol.Required("type"): "backup/generate"})
 @websocket_api.async_response
@@ -114,11 +94,7 @@ async def handle_create(
     msg: dict[str, Any],
 ) -> None:
     """Generate a backup."""
-
-    def on_progress(progress: BackupProgress) -> None:
-        connection.send_message(websocket_api.event_message(msg["id"], progress))
-
-    backup = await hass.data[DATA_MANAGER].async_create_backup(on_progress=on_progress)
+    backup = await hass.data[DATA_MANAGER].async_create_backup()
     connection.send_result(msg["id"], backup)
 
 
@@ -132,6 +108,7 @@ async def handle_backup_start(
 ) -> None:
     """Backup start notification."""
     manager = hass.data[DATA_MANAGER]
+    manager.backing_up = True
     LOGGER.debug("Backup start notification")
 
     try:
@@ -153,6 +130,7 @@ async def handle_backup_end(
 ) -> None:
     """Backup end notification."""
     manager = hass.data[DATA_MANAGER]
+    manager.backing_up = False
     LOGGER.debug("Backup end notification")
 
     try:
diff --git a/homeassistant/components/balboa/__init__.py b/homeassistant/components/balboa/__init__.py
index 7838db16820..7e220bd46f8 100644
--- a/homeassistant/components/balboa/__init__.py
+++ b/homeassistant/components/balboa/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.event import async_track_time_interval
 import homeassistant.util.dt as dt_util
 
-from .const import CONF_SYNC_TIME, DEFAULT_SYNC_TIME
+from .const import CONF_SYNC_TIME, DEFAULT_SYNC_TIME, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,10 +30,8 @@ PLATFORMS = [
 KEEP_ALIVE_INTERVAL = timedelta(minutes=1)
 SYNC_TIME_INTERVAL = timedelta(hours=1)
 
-type BalboaConfigEntry = ConfigEntry[SpaClient]
 
-
-async def async_setup_entry(hass: HomeAssistant, entry: BalboaConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Balboa Spa from a config entry."""
     host = entry.data[CONF_HOST]
 
@@ -46,34 +44,41 @@ async def async_setup_entry(hass: HomeAssistant, entry: BalboaConfigEntry) -> bo
         _LOGGER.error("Failed to get spa info at %s", host)
         raise ConfigEntryNotReady("Unable to configure")
 
-    entry.runtime_data = spa
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = spa
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     await async_setup_time_sync(hass, entry)
     entry.async_on_unload(entry.add_update_listener(update_listener))
-    entry.async_on_unload(spa.disconnect)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BalboaConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    _LOGGER.debug("Disconnecting from spa")
+    spa: SpaClient = 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 spa.disconnect()
+
+    return unload_ok
 
 
-async def update_listener(hass: HomeAssistant, entry: BalboaConfigEntry) -> None:
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-async def async_setup_time_sync(hass: HomeAssistant, entry: BalboaConfigEntry) -> None:
+async def async_setup_time_sync(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Set up the time sync."""
     if not entry.options.get(CONF_SYNC_TIME, DEFAULT_SYNC_TIME):
         return
 
     _LOGGER.debug("Setting up daily time sync")
-    spa = entry.runtime_data
+    spa: SpaClient = hass.data[DOMAIN][entry.entry_id]
 
     async def sync_time(now: datetime) -> None:
         now = dt_util.as_local(now)
diff --git a/homeassistant/components/balboa/binary_sensor.py b/homeassistant/components/balboa/binary_sensor.py
index b8c62ce8abf..d3352208cd9 100644
--- a/homeassistant/components/balboa/binary_sensor.py
+++ b/homeassistant/components/balboa/binary_sensor.py
@@ -12,20 +12,19 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BalboaConfigEntry
+from .const import DOMAIN
 from .entity import BalboaEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the spa's binary sensors."""
-    spa = entry.runtime_data
+    spa: SpaClient = hass.data[DOMAIN][entry.entry_id]
     entities = [
         BalboaBinarySensorEntity(spa, description)
         for description in BINARY_SENSOR_DESCRIPTIONS
diff --git a/homeassistant/components/balboa/climate.py b/homeassistant/components/balboa/climate.py
index d27fd459676..8cd9e93e539 100644
--- a/homeassistant/components/balboa/climate.py
+++ b/homeassistant/components/balboa/climate.py
@@ -14,6 +14,7 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_TEMPERATURE,
     PRECISION_HALVES,
@@ -23,7 +24,6 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BalboaConfigEntry
 from .const import DOMAIN
 from .entity import BalboaEntity
 
@@ -45,12 +45,10 @@ TEMPERATURE_UNIT_MAP = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the spa climate entity."""
-    async_add_entities([BalboaClimateEntity(entry.runtime_data)])
+    async_add_entities([BalboaClimateEntity(hass.data[DOMAIN][entry.entry_id])])
 
 
 class BalboaClimateEntity(BalboaEntity, ClimateEntity):
diff --git a/homeassistant/components/balboa/fan.py b/homeassistant/components/balboa/fan.py
index 67c1d9a9a62..bf7425f0e64 100644
--- a/homeassistant/components/balboa/fan.py
+++ b/homeassistant/components/balboa/fan.py
@@ -5,10 +5,11 @@ from __future__ import annotations
 import math
 from typing import Any, cast
 
-from pybalboa import SpaControl
+from pybalboa import SpaClient, SpaControl
 from pybalboa.enums import OffOnState, UnknownState
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.percentage import (
@@ -16,17 +17,15 @@ from homeassistant.util.percentage import (
     ranged_value_to_percentage,
 )
 
-from . import BalboaConfigEntry
+from .const import DOMAIN
 from .entity import BalboaEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the spa's pumps."""
-    spa = entry.runtime_data
+    spa: SpaClient = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(BalboaPumpFanEntity(control) for control in spa.pumps)
 
 
diff --git a/homeassistant/components/balboa/light.py b/homeassistant/components/balboa/light.py
index 21e4dfc5e08..5dc8d48ef9d 100644
--- a/homeassistant/components/balboa/light.py
+++ b/homeassistant/components/balboa/light.py
@@ -4,24 +4,23 @@ from __future__ import annotations
 
 from typing import Any, cast
 
-from pybalboa import SpaControl
+from pybalboa import SpaClient, SpaControl
 from pybalboa.enums import OffOnState, UnknownState
 
 from homeassistant.components.light import ColorMode, LightEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BalboaConfigEntry
+from .const import DOMAIN
 from .entity import BalboaEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the spa's lights."""
-    spa = entry.runtime_data
+    spa: SpaClient = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(BalboaLightEntity(control) for control in spa.lights)
 
 
diff --git a/homeassistant/components/balboa/select.py b/homeassistant/components/balboa/select.py
index e88e40ab063..9c3074350c5 100644
--- a/homeassistant/components/balboa/select.py
+++ b/homeassistant/components/balboa/select.py
@@ -1,23 +1,22 @@
 """Support for Spa Client selects."""
 
-from pybalboa import SpaControl
+from pybalboa import SpaClient, SpaControl
 from pybalboa.enums import LowHighRange
 
 from homeassistant.components.select import SelectEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BalboaConfigEntry
+from .const import DOMAIN
 from .entity import BalboaEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BalboaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the spa select entity."""
-    spa = entry.runtime_data
+    spa: SpaClient = hass.data[DOMAIN][entry.entry_id]
     async_add_entities([BalboaTempRangeSelectEntity(spa.temperature_range)])
 
 
diff --git a/homeassistant/components/bang_olufsen/__init__.py b/homeassistant/components/bang_olufsen/__init__.py
index c8ba1f1c3dc..e11df6ad5ed 100644
--- a/homeassistant/components/bang_olufsen/__init__.py
+++ b/homeassistant/components/bang_olufsen/__init__.py
@@ -31,12 +31,10 @@ class BangOlufsenData:
     client: MozartClient
 
 
-type BangOlufsenConfigEntry = ConfigEntry[BangOlufsenData]
-
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: BangOlufsenConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up from a config entry."""
 
     # Remove casts to str
@@ -69,7 +67,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: BangOlufsenConfigEntry)
     websocket = BangOlufsenWebsocket(hass, entry, client)
 
     # Add the websocket and API client
-    entry.runtime_data = BangOlufsenData(websocket, client)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = BangOlufsenData(
+        websocket,
+        client,
+    )
 
     # Start WebSocket connection
     await client.connect_notifications(remote_control=True, reconnect=True)
@@ -79,12 +80,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: BangOlufsenConfigEntry)
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, entry: BangOlufsenConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     # Close the API client and WebSocket notification listener
-    entry.runtime_data.client.disconnect_notifications()
-    await entry.runtime_data.client.close_api_client()
+    hass.data[DOMAIN][entry.entry_id].client.disconnect_notifications()
+    await hass.data[DOMAIN][entry.entry_id].client.close_api_client()
 
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/bang_olufsen/const.py b/homeassistant/components/bang_olufsen/const.py
index 209311d3e8a..64ee4cf275d 100644
--- a/homeassistant/components/bang_olufsen/const.py
+++ b/homeassistant/components/bang_olufsen/const.py
@@ -7,19 +7,20 @@ from typing import Final
 
 from mozart_api.models import Source, SourceArray, SourceTypeEnum
 
-from homeassistant.components.media_player import (
-    MediaPlayerState,
-    MediaType,
-    RepeatMode,
-)
+from homeassistant.components.media_player import MediaPlayerState, MediaType
 
 
 class BangOlufsenSource:
     """Class used for associating device source ids with friendly names. May not include all sources."""
 
+    URI_STREAMER: Final[Source] = Source(name="Audio Streamer", id="uriStreamer")
+    BLUETOOTH: Final[Source] = Source(name="Bluetooth", id="bluetooth")
+    CHROMECAST: Final[Source] = Source(name="Chromecast built-in", id="chromeCast")
     LINE_IN: Final[Source] = Source(name="Line-In", id="lineIn")
     SPDIF: Final[Source] = Source(name="Optical", id="spdif")
-    URI_STREAMER: Final[Source] = Source(name="Audio Streamer", id="uriStreamer")
+    NET_RADIO: Final[Source] = Source(name="B&O Radio", id="netRadio")
+    DEEZER: Final[Source] = Source(name="Deezer", id="deezer")
+    TIDAL: Final[Source] = Source(name="Tidal", id="tidal")
 
 
 BANG_OLUFSEN_STATES: dict[str, MediaPlayerState] = {
@@ -35,17 +36,6 @@ BANG_OLUFSEN_STATES: dict[str, MediaPlayerState] = {
     "unknown": MediaPlayerState.IDLE,
 }
 
-# Dict used for translating Home Assistant settings to device repeat settings.
-BANG_OLUFSEN_REPEAT_FROM_HA: dict[RepeatMode, str] = {
-    RepeatMode.ALL: "all",
-    RepeatMode.ONE: "track",
-    RepeatMode.OFF: "none",
-}
-# Dict used for translating device repeat settings to Home Assistant settings.
-BANG_OLUFSEN_REPEAT_TO_HA: dict[str, RepeatMode] = {
-    value: key for key, value in BANG_OLUFSEN_REPEAT_FROM_HA.items()
-}
-
 
 # Media types for play_media
 class BangOlufsenMediaType(StrEnum):
@@ -133,6 +123,20 @@ VALID_MEDIA_TYPES: Final[tuple] = (
     MediaType.CHANNEL,
 )
 
+# Sources on the device that should not be selectable by the user
+HIDDEN_SOURCE_IDS: Final[tuple] = (
+    "airPlay",
+    "bluetooth",
+    "chromeCast",
+    "generator",
+    "local",
+    "dlna",
+    "qplay",
+    "wpl",
+    "pl",
+    "beolink",
+    "usbIn",
+)
 
 # Fallback sources to use in case of API failure.
 FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
@@ -140,26 +144,23 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
         Source(
             id="uriStreamer",
             is_enabled=True,
-            is_playable=True,
+            is_playable=False,
             name="Audio Streamer",
             type=SourceTypeEnum(value="uriStreamer"),
-            is_seekable=False,
         ),
         Source(
             id="bluetooth",
             is_enabled=True,
-            is_playable=True,
+            is_playable=False,
             name="Bluetooth",
             type=SourceTypeEnum(value="bluetooth"),
-            is_seekable=False,
         ),
         Source(
             id="spotify",
             is_enabled=True,
-            is_playable=True,
+            is_playable=False,
             name="Spotify Connect",
             type=SourceTypeEnum(value="spotify"),
-            is_seekable=True,
         ),
         Source(
             id="lineIn",
@@ -167,7 +168,6 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
             is_playable=True,
             name="Line-In",
             type=SourceTypeEnum(value="lineIn"),
-            is_seekable=False,
         ),
         Source(
             id="spdif",
@@ -175,7 +175,6 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
             is_playable=True,
             name="Optical",
             type=SourceTypeEnum(value="spdif"),
-            is_seekable=False,
         ),
         Source(
             id="netRadio",
@@ -183,7 +182,6 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
             is_playable=True,
             name="B&O Radio",
             type=SourceTypeEnum(value="netRadio"),
-            is_seekable=False,
         ),
         Source(
             id="deezer",
@@ -191,7 +189,6 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
             is_playable=True,
             name="Deezer",
             type=SourceTypeEnum(value="deezer"),
-            is_seekable=True,
         ),
         Source(
             id="tidalConnect",
@@ -199,7 +196,6 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
             is_playable=True,
             name="Tidal Connect",
             type=SourceTypeEnum(value="tidalConnect"),
-            is_seekable=True,
         ),
     ]
 )
diff --git a/homeassistant/components/bang_olufsen/icons.json b/homeassistant/components/bang_olufsen/icons.json
deleted file mode 100644
index fec0bf20937..00000000000
--- a/homeassistant/components/bang_olufsen/icons.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "services": {
-    "beolink_join": { "service": "mdi:location-enter" },
-    "beolink_expand": { "service": "mdi:location-enter" },
-    "beolink_unexpand": { "service": "mdi:location-exit" },
-    "beolink_leave": { "service": "mdi:close-circle-outline" },
-    "beolink_allstandby": { "service": "mdi:close-circle-multiple-outline" }
-  }
-}
diff --git a/homeassistant/components/bang_olufsen/media_player.py b/homeassistant/components/bang_olufsen/media_player.py
index 56aa66d32e8..ecf571d5456 100644
--- a/homeassistant/components/bang_olufsen/media_player.py
+++ b/homeassistant/components/bang_olufsen/media_player.py
@@ -3,15 +3,12 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-import contextlib
-from datetime import timedelta
 import json
 import logging
 from typing import TYPE_CHECKING, Any, cast
 
-from aiohttp import ClientConnectorError
 from mozart_api import __version__ as MOZART_API_VERSION
-from mozart_api.exceptions import ApiException, NotFoundException
+from mozart_api.exceptions import ApiException
 from mozart_api.models import (
     Action,
     Art,
@@ -25,7 +22,6 @@ from mozart_api.models import (
     PlaybackProgress,
     PlayQueueItem,
     PlayQueueItemType,
-    PlayQueueSettings,
     RenderingState,
     SceneProperties,
     SoftwareUpdateState,
@@ -38,7 +34,6 @@ from mozart_api.models import (
     VolumeState,
 )
 from mozart_api.mozart_client import MozartClient, get_highest_resolution_artwork
-import voluptuous as vol
 
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
@@ -49,35 +44,26 @@ from homeassistant.components.media_player import (
     MediaPlayerEntityFeature,
     MediaPlayerState,
     MediaType,
-    RepeatMode,
     async_process_play_media_url,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_MODEL, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import (
-    config_validation as cv,
-    device_registry as dr,
-    entity_registry as er,
-)
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import (
-    AddEntitiesCallback,
-    async_get_current_platform,
-)
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.dt import utcnow
 
-from . import BangOlufsenConfigEntry
+from . import BangOlufsenData
 from .const import (
-    BANG_OLUFSEN_REPEAT_FROM_HA,
-    BANG_OLUFSEN_REPEAT_TO_HA,
     BANG_OLUFSEN_STATES,
     CONF_BEOLINK_JID,
     CONNECTION_STATUS,
     DOMAIN,
     FALLBACK_SOURCES,
+    HIDDEN_SOURCE_IDS,
     VALID_MEDIA_TYPES,
     BangOlufsenMediaType,
     BangOlufsenSource,
@@ -86,8 +72,6 @@ from .const import (
 from .entity import BangOlufsenEntity
 from .util import get_serial_number_from_jid
 
-SCAN_INTERVAL = timedelta(seconds=30)
-
 _LOGGER = logging.getLogger(__name__)
 
 BANG_OLUFSEN_FEATURES = (
@@ -100,9 +84,8 @@ BANG_OLUFSEN_FEATURES = (
     | MediaPlayerEntityFeature.PLAY
     | MediaPlayerEntityFeature.PLAY_MEDIA
     | MediaPlayerEntityFeature.PREVIOUS_TRACK
-    | MediaPlayerEntityFeature.REPEAT_SET
+    | MediaPlayerEntityFeature.SEEK
     | MediaPlayerEntityFeature.SELECT_SOURCE
-    | MediaPlayerEntityFeature.SHUFFLE_SET
     | MediaPlayerEntityFeature.STOP
     | MediaPlayerEntityFeature.TURN_OFF
     | MediaPlayerEntityFeature.VOLUME_MUTE
@@ -113,68 +96,14 @@ BANG_OLUFSEN_FEATURES = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BangOlufsenConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a Media Player entity from config entry."""
+    data: BangOlufsenData = hass.data[DOMAIN][config_entry.entry_id]
+
     # Add MediaPlayer entity
-    async_add_entities(
-        new_entities=[
-            BangOlufsenMediaPlayer(config_entry, config_entry.runtime_data.client)
-        ]
-    )
-
-    # Register actions.
-    platform = async_get_current_platform()
-
-    jid_regex = vol.Match(
-        r"(^\d{4})[.](\d{7})[.](\d{8})(@products\.bang-olufsen\.com)$"
-    )
-
-    platform.async_register_entity_service(
-        name="beolink_join",
-        schema={vol.Optional("beolink_jid"): jid_regex},
-        func="async_beolink_join",
-    )
-
-    platform.async_register_entity_service(
-        name="beolink_expand",
-        schema={
-            vol.Exclusive("all_discovered", "devices", ""): cv.boolean,
-            vol.Exclusive(
-                "beolink_jids",
-                "devices",
-                "Define either specific Beolink JIDs or all discovered",
-            ): vol.All(
-                cv.ensure_list,
-                [jid_regex],
-            ),
-        },
-        func="async_beolink_expand",
-    )
-
-    platform.async_register_entity_service(
-        name="beolink_unexpand",
-        schema={
-            vol.Required("beolink_jids"): vol.All(
-                cv.ensure_list,
-                [jid_regex],
-            ),
-        },
-        func="async_beolink_unexpand",
-    )
-
-    platform.async_register_entity_service(
-        name="beolink_leave",
-        schema=None,
-        func="async_beolink_leave",
-    )
-
-    platform.async_register_entity_service(
-        name="beolink_allstandby",
-        schema=None,
-        func="async_beolink_allstandby",
-    )
+    async_add_entities(new_entities=[BangOlufsenMediaPlayer(config_entry, data.client)])
 
 
 class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
@@ -183,6 +112,7 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
     _attr_icon = "mdi:speaker-wireless"
     _attr_name = None
     _attr_device_class = MediaPlayerDeviceClass.SPEAKER
+    _attr_supported_features = BANG_OLUFSEN_FEATURES
 
     def __init__(self, entry: ConfigEntry, client: MozartClient) -> None:
         """Initialize the media player."""
@@ -199,7 +129,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
             serial_number=self._unique_id,
         )
         self._attr_unique_id = self._unique_id
-        self._attr_should_poll = True
 
         # Misc. variables.
         self._audio_sources: dict[str, str] = {}
@@ -216,8 +145,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         # Beolink compatible sources
         self._beolink_sources: dict[str, bool] = {}
         self._remote_leader: BeolinkLeader | None = None
-        # Extra state attributes for showing Beolink: peer(s), listener(s), leader and self
-        self._beolink_attributes: dict[str, dict[str, dict[str, str]]] = {}
 
     async def async_added_to_hass(self) -> None:
         """Turn on the dispatchers."""
@@ -227,11 +154,9 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
             CONNECTION_STATUS: self._async_update_connection_state,
             WebsocketNotification.ACTIVE_LISTENING_MODE: self._async_update_sound_modes,
             WebsocketNotification.BEOLINK: self._async_update_beolink,
-            WebsocketNotification.CONFIGURATION: self._async_update_name_and_beolink,
             WebsocketNotification.PLAYBACK_ERROR: self._async_update_playback_error,
             WebsocketNotification.PLAYBACK_METADATA: self._async_update_playback_metadata_and_beolink,
             WebsocketNotification.PLAYBACK_PROGRESS: self._async_update_playback_progress,
-            WebsocketNotification.PLAYBACK_SOURCE: self._async_update_sources,
             WebsocketNotification.PLAYBACK_STATE: self._async_update_playback_state,
             WebsocketNotification.REMOTE_MENU_CHANGED: self._async_update_sources,
             WebsocketNotification.SOURCE_CHANGE: self._async_update_source_change,
@@ -293,23 +218,7 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
 
         await self._async_update_sound_modes()
 
-        # Update beolink attributes and device name.
-        await self._async_update_name_and_beolink()
-
-    async def async_update(self) -> None:
-        """Update queue settings."""
-        # The WebSocket event listener is the main handler for connection state.
-        # The polling updates do therefore not set the device as available or unavailable
-        with contextlib.suppress(ApiException, ClientConnectorError, TimeoutError):
-            queue_settings = await self._client.get_settings_queue(_request_timeout=5)
-
-            if queue_settings.repeat is not None:
-                self._attr_repeat = BANG_OLUFSEN_REPEAT_TO_HA[queue_settings.repeat]
-
-            if queue_settings.shuffle is not None:
-                self._attr_shuffle = queue_settings.shuffle
-
-    async def _async_update_sources(self, _: Source | None = None) -> None:
+    async def _async_update_sources(self) -> None:
         """Get sources for the specific product."""
 
         # Audio sources
@@ -336,7 +245,10 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         self._audio_sources = {
             source.id: source.name
             for source in cast(list[Source], sources.items)
-            if source.is_enabled and source.id and source.name and source.is_playable
+            if source.is_enabled
+            and source.id
+            and source.name
+            and source.id not in HIDDEN_SOURCE_IDS
         }
 
         # Some sources are not Beolink expandable, meaning that they can't be joined by
@@ -438,44 +350,9 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
 
         self.async_write_ha_state()
 
-    async def _async_update_name_and_beolink(self) -> None:
-        """Update the device friendly name."""
-        beolink_self = await self._client.get_beolink_self()
-
-        # Update device name
-        device_registry = dr.async_get(self.hass)
-        assert self.device_entry is not None
-
-        device_registry.async_update_device(
-            device_id=self.device_entry.id,
-            name=beolink_self.friendly_name,
-        )
-
-        await self._async_update_beolink()
-
     async def _async_update_beolink(self) -> None:
         """Update the current Beolink leader, listeners, peers and self."""
 
-        self._beolink_attributes = {}
-
-        assert self.device_entry is not None
-        assert self.device_entry.name is not None
-
-        # Add Beolink self
-        self._beolink_attributes = {
-            "beolink": {"self": {self.device_entry.name: self._beolink_jid}}
-        }
-
-        # Add Beolink peers
-        peers = await self._client.get_beolink_peers()
-
-        if len(peers) > 0:
-            self._beolink_attributes["beolink"]["peers"] = {}
-            for peer in peers:
-                self._beolink_attributes["beolink"]["peers"][peer.friendly_name] = (
-                    peer.jid
-                )
-
         # Add Beolink listeners / leader
         self._remote_leader = self._playback_metadata.remote_leader
 
@@ -495,14 +372,9 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
             # Add self
             group_members.append(self.entity_id)
 
-            self._beolink_attributes["beolink"]["leader"] = {
-                self._remote_leader.friendly_name: self._remote_leader.jid,
-            }
-
         # If not listener, check if leader.
         else:
             beolink_listeners = await self._client.get_beolink_listeners()
-            beolink_listeners_attribute = {}
 
             # Check if the device is a leader.
             if len(beolink_listeners) > 0:
@@ -523,18 +395,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
                         for beolink_listener in beolink_listeners
                     ]
                 )
-                # Update Beolink attributes
-                for beolink_listener in beolink_listeners:
-                    for peer in peers:
-                        if peer.jid == beolink_listener.jid:
-                            # Get the friendly names for the listeners from the peers
-                            beolink_listeners_attribute[peer.friendly_name] = (
-                                beolink_listener.jid
-                            )
-                            break
-                self._beolink_attributes["beolink"]["listeners"] = (
-                    beolink_listeners_attribute
-                )
 
         self._attr_group_members = group_members
 
@@ -602,17 +462,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
 
         self.async_write_ha_state()
 
-    @property
-    def supported_features(self) -> MediaPlayerEntityFeature:
-        """Flag media player features that are supported."""
-        features = BANG_OLUFSEN_FEATURES
-
-        # Add seeking if supported by the current source
-        if self._source_change.is_seekable is True:
-            features |= MediaPlayerEntityFeature.SEEK
-
-        return features
-
     @property
     def state(self) -> MediaPlayerState:
         """Return the current state of the media player."""
@@ -688,19 +537,38 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
     @property
     def source(self) -> str | None:
         """Return the current audio source."""
+
+        # Try to fix some of the source_change chromecast weirdness.
+        if hasattr(self._playback_metadata, "title"):
+            # source_change is chromecast but line in is selected.
+            if self._playback_metadata.title == BangOlufsenSource.LINE_IN.name:
+                return BangOlufsenSource.LINE_IN.name
+
+            # source_change is chromecast but bluetooth is selected.
+            if self._playback_metadata.title == BangOlufsenSource.BLUETOOTH.name:
+                return BangOlufsenSource.BLUETOOTH.name
+
+            # source_change is line in, bluetooth or optical but stale metadata is sent through the WebSocket,
+            # And the source has not changed.
+            if self._source_change.id in (
+                BangOlufsenSource.BLUETOOTH.id,
+                BangOlufsenSource.LINE_IN.id,
+                BangOlufsenSource.SPDIF.id,
+            ):
+                return BangOlufsenSource.CHROMECAST.name
+
+        # source_change is chromecast and there is metadata but no artwork. Bluetooth does support metadata but not artwork
+        # So i assume that it is bluetooth and not chromecast
+        if (
+            hasattr(self._playback_metadata, "art")
+            and self._playback_metadata.art is not None
+            and len(self._playback_metadata.art) == 0
+            and self._source_change.id == BangOlufsenSource.CHROMECAST.id
+        ):
+            return BangOlufsenSource.BLUETOOTH.name
+
         return self._source_change.name
 
-    @property
-    def extra_state_attributes(self) -> dict[str, Any] | None:
-        """Return information that is not returned anywhere else."""
-        attributes: dict[str, Any] = {}
-
-        # Add Beolink attributes
-        if self._beolink_attributes:
-            attributes.update(self._beolink_attributes)
-
-        return attributes
-
     async def async_turn_off(self) -> None:
         """Set the device to "networkStandby"."""
         await self._client.post_standby()
@@ -740,12 +608,17 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
 
     async def async_media_seek(self, position: float) -> None:
         """Seek to position in ms."""
-        await self._client.seek_to_position(position_ms=int(position * 1000))
-        # Try to prevent the playback progress from bouncing in the UI.
-        self._attr_media_position_updated_at = utcnow()
-        self._playback_progress = PlaybackProgress(progress=int(position))
+        if self._source_change.id == BangOlufsenSource.DEEZER.id:
+            await self._client.seek_to_position(position_ms=int(position * 1000))
+            # Try to prevent the playback progress from bouncing in the UI.
+            self._attr_media_position_updated_at = utcnow()
+            self._playback_progress = PlaybackProgress(progress=int(position))
 
-        self.async_write_ha_state()
+            self.async_write_ha_state()
+        else:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="non_deezer_seeking"
+            )
 
     async def async_media_previous_track(self) -> None:
         """Send the previous track command."""
@@ -755,20 +628,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         """Clear the current playback queue."""
         await self._client.post_clear_queue()
 
-    async def async_set_repeat(self, repeat: RepeatMode) -> None:
-        """Set playback queues to repeat."""
-        await self._client.set_settings_queue(
-            play_queue_settings=PlayQueueSettings(
-                repeat=BANG_OLUFSEN_REPEAT_FROM_HA[repeat]
-            )
-        )
-
-    async def async_set_shuffle(self, shuffle: bool) -> None:
-        """Set playback queues to shuffle."""
-        await self._client.set_settings_queue(
-            play_queue_settings=PlayQueueSettings(shuffle=shuffle),
-        )
-
     async def async_select_source(self, source: str) -> None:
         """Select an input source."""
         if source not in self._sources.values():
@@ -972,30 +831,23 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         # Beolink compatible B&O device.
         # Repeated presses / calls will cycle between compatible playing devices.
         if len(group_members) == 0:
-            await self.async_beolink_join()
+            await self._async_beolink_join()
             return
 
         # Get JID for each group member
         jids = [self._get_beolink_jid(group_member) for group_member in group_members]
-        await self.async_beolink_expand(jids)
+        await self._async_beolink_expand(jids)
 
     async def async_unjoin_player(self) -> None:
         """Unjoin Beolink session. End session if leader."""
-        await self.async_beolink_leave()
+        await self._async_beolink_leave()
 
-    # Custom actions:
-    async def async_beolink_join(self, beolink_jid: str | None = None) -> None:
+    async def _async_beolink_join(self) -> None:
         """Join a Beolink multi-room experience."""
-        if beolink_jid is None:
-            await self._client.join_latest_beolink_experience()
-        else:
-            await self._client.join_beolink_peer(jid=beolink_jid)
+        await self._client.join_latest_beolink_experience()
 
-    async def async_beolink_expand(
-        self, beolink_jids: list[str] | None = None, all_discovered: bool = False
-    ) -> None:
+    async def _async_beolink_expand(self, beolink_jids: list[str]) -> None:
         """Expand a Beolink multi-room experience with a device or devices."""
-
         # Ensure that the current source is expandable
         if not self._beolink_sources[cast(str, self._source_change.id)]:
             raise ServiceValidationError(
@@ -1007,37 +859,10 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
                 },
             )
 
-        # Expand to all discovered devices
-        if all_discovered:
-            peers = await self._client.get_beolink_peers()
-
-            for peer in peers:
-                try:
-                    await self._client.post_beolink_expand(jid=peer.jid)
-                except NotFoundException:
-                    _LOGGER.warning("Unable to expand to %s", peer.jid)
-
         # Try to expand to all defined devices
-        elif beolink_jids:
-            for beolink_jid in beolink_jids:
-                try:
-                    await self._client.post_beolink_expand(jid=beolink_jid)
-                except NotFoundException:
-                    _LOGGER.warning(
-                        "Unable to expand to %s. Is the device available on the network?",
-                        beolink_jid,
-                    )
-
-    async def async_beolink_unexpand(self, beolink_jids: list[str]) -> None:
-        """Unexpand a Beolink multi-room experience with a device or devices."""
-        # Unexpand all defined devices
         for beolink_jid in beolink_jids:
-            await self._client.post_beolink_unexpand(jid=beolink_jid)
+            await self._client.post_beolink_expand(jid=beolink_jid)
 
-    async def async_beolink_leave(self) -> None:
+    async def _async_beolink_leave(self) -> None:
         """Leave the current Beolink experience."""
         await self._client.post_beolink_leave()
-
-    async def async_beolink_allstandby(self) -> None:
-        """Set all connected Beolink devices to standby."""
-        await self._client.post_beolink_allstandby()
diff --git a/homeassistant/components/bang_olufsen/services.yaml b/homeassistant/components/bang_olufsen/services.yaml
deleted file mode 100644
index e5d61420dff..00000000000
--- a/homeassistant/components/bang_olufsen/services.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-beolink_allstandby:
-  target:
-    entity:
-      integration: bang_olufsen
-      domain: media_player
-    device:
-      integration: bang_olufsen
-
-beolink_expand:
-  target:
-    entity:
-      integration: bang_olufsen
-      domain: media_player
-    device:
-      integration: bang_olufsen
-  fields:
-    all_discovered:
-      required: false
-      example: false
-      selector:
-        boolean:
-    jid_options:
-      collapsed: false
-      fields:
-        beolink_jids:
-          required: false
-          example: >-
-            [
-              1111.2222222.33333333@products.bang-olufsen.com,
-              4444.5555555.66666666@products.bang-olufsen.com
-            ]
-          selector:
-            object:
-
-beolink_join:
-  target:
-    entity:
-      integration: bang_olufsen
-      domain: media_player
-    device:
-      integration: bang_olufsen
-  fields:
-    jid_options:
-      collapsed: false
-      fields:
-        beolink_jid:
-          required: false
-          example: 1111.2222222.33333333@products.bang-olufsen.com
-          selector:
-            text:
-
-beolink_leave:
-  target:
-    entity:
-      integration: bang_olufsen
-      domain: media_player
-    device:
-      integration: bang_olufsen
-
-beolink_unexpand:
-  target:
-    entity:
-      integration: bang_olufsen
-      domain: media_player
-    device:
-      integration: bang_olufsen
-  fields:
-    jid_options:
-      collapsed: false
-      fields:
-        beolink_jids:
-          required: true
-          example: >-
-            [
-              1111.2222222.33333333@products.bang-olufsen.com,
-              4444.5555555.66666666@products.bang-olufsen.com
-            ]
-          selector:
-            object:
diff --git a/homeassistant/components/bang_olufsen/strings.json b/homeassistant/components/bang_olufsen/strings.json
index aef6f953524..b0cb88985d2 100644
--- a/homeassistant/components/bang_olufsen/strings.json
+++ b/homeassistant/components/bang_olufsen/strings.json
@@ -1,8 +1,4 @@
 {
-  "common": {
-    "jid_options_name": "JID options",
-    "jid_options_description": "Advanced grouping options, where devices' unique Beolink IDs (Called JIDs) are used directly. JIDs can be found in the state attributes of the media player entity."
-  },
   "config": {
     "error": {
       "api_exception": "[%key:common::config_flow::error::cannot_connect%]",
@@ -29,72 +25,13 @@
       }
     }
   },
-  "services": {
-    "beolink_allstandby": {
-      "name": "Beolink all standby",
-      "description": "Set all Connected Beolink devices to standby."
-    },
-    "beolink_expand": {
-      "name": "Beolink expand",
-      "description": "Expand current Beolink experience.",
-      "fields": {
-        "all_discovered": {
-          "name": "All discovered",
-          "description": "Expand Beolink experience to all discovered devices."
-        },
-        "beolink_jids": {
-          "name": "Beolink JIDs",
-          "description": "Specify which Beolink JIDs will join current Beolink experience."
-        }
-      },
-      "sections": {
-        "jid_options": {
-          "name": "[%key:component::bang_olufsen::common::jid_options_name%]",
-          "description": "[%key:component::bang_olufsen::common::jid_options_description%]"
-        }
-      }
-    },
-    "beolink_join": {
-      "name": "Beolink join",
-      "description": "Join a Beolink experience.",
-      "fields": {
-        "beolink_jid": {
-          "name": "Beolink JID",
-          "description": "Manually specify Beolink JID to join."
-        }
-      },
-      "sections": {
-        "jid_options": {
-          "name": "[%key:component::bang_olufsen::common::jid_options_name%]",
-          "description": "[%key:component::bang_olufsen::common::jid_options_description%]"
-        }
-      }
-    },
-    "beolink_leave": {
-      "name": "Beolink leave",
-      "description": "Leave a Beolink experience."
-    },
-    "beolink_unexpand": {
-      "name": "Beolink unexpand",
-      "description": "Unexpand from current Beolink experience.",
-      "fields": {
-        "beolink_jids": {
-          "name": "Beolink JIDs",
-          "description": "Specify which Beolink JIDs will leave from current Beolink experience."
-        }
-      },
-      "sections": {
-        "jid_options": {
-          "name": "[%key:component::bang_olufsen::common::jid_options_name%]",
-          "description": "[%key:component::bang_olufsen::common::jid_options_description%]"
-        }
-      }
-    }
-  },
   "exceptions": {
     "m3u_invalid_format": {
       "message": "Media sources with the .m3u extension are not supported."
     },
+    "non_deezer_seeking": {
+      "message": "Seeking is currently only supported when using Deezer"
+    },
     "invalid_source": {
       "message": "Invalid source: {invalid_source}. Valid sources are: {valid_sources}"
     },
diff --git a/homeassistant/components/bang_olufsen/websocket.py b/homeassistant/components/bang_olufsen/websocket.py
index 913f7cb3241..3519fcd9a48 100644
--- a/homeassistant/components/bang_olufsen/websocket.py
+++ b/homeassistant/components/bang_olufsen/websocket.py
@@ -63,9 +63,6 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         self._client.get_playback_progress_notifications(
             self.on_playback_progress_notification
         )
-        self._client.get_playback_source_notifications(
-            self.on_playback_source_notification
-        )
         self._client.get_playback_state_notifications(
             self.on_playback_state_notification
         )
@@ -120,11 +117,6 @@ class BangOlufsenWebsocket(BangOlufsenBase):
                 self.hass,
                 f"{self._unique_id}_{WebsocketNotification.BEOLINK}",
             )
-        elif notification_type is WebsocketNotification.CONFIGURATION:
-            async_dispatcher_send(
-                self.hass,
-                f"{self._unique_id}_{WebsocketNotification.CONFIGURATION}",
-            )
         elif notification_type is WebsocketNotification.REMOTE_MENU_CHANGED:
             async_dispatcher_send(
                 self.hass,
@@ -165,14 +157,6 @@ class BangOlufsenWebsocket(BangOlufsenBase):
             notification,
         )
 
-    def on_playback_source_notification(self, notification: Source) -> None:
-        """Send playback_source dispatch."""
-        async_dispatcher_send(
-            self.hass,
-            f"{self._unique_id}_{WebsocketNotification.PLAYBACK_SOURCE}",
-            notification,
-        )
-
     def on_source_change_notification(self, notification: Source) -> None:
         """Send source_change dispatch."""
         async_dispatcher_send(
diff --git a/homeassistant/components/blebox/__init__.py b/homeassistant/components/blebox/__init__.py
index 983f5750036..89d0d5fb146 100644
--- a/homeassistant/components/blebox/__init__.py
+++ b/homeassistant/components/blebox/__init__.py
@@ -17,11 +17,9 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import DEFAULT_SETUP_TIMEOUT
+from .const import DEFAULT_SETUP_TIMEOUT, DOMAIN, PRODUCT
 from .helpers import get_maybe_authenticated_session
 
-type BleBoxConfigEntry = ConfigEntry[Box]
-
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [
@@ -37,7 +35,7 @@ PLATFORMS = [
 PARALLEL_UPDATES = 0
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: BleBoxConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up BleBox devices from a config entry."""
     host = entry.data[CONF_HOST]
     port = entry.data[CONF_PORT]
@@ -57,13 +55,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: BleBoxConfigEntry) -> bo
         _LOGGER.error("Identify failed at %s:%d (%s)", api_host.host, api_host.port, ex)
         raise ConfigEntryNotReady from ex
 
-    entry.runtime_data = product
+    domain = hass.data.setdefault(DOMAIN, {})
+    domain_entry = domain.setdefault(entry.entry_id, {})
+    product = domain_entry.setdefault(PRODUCT, product)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BleBoxConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/blebox/binary_sensor.py b/homeassistant/components/blebox/binary_sensor.py
index 2aa86059ee2..7f909fd9a7b 100644
--- a/homeassistant/components/blebox/binary_sensor.py
+++ b/homeassistant/components/blebox/binary_sensor.py
@@ -1,16 +1,18 @@
 """BleBox binary sensor entities."""
 
 from blebox_uniapi.binary_sensor import BinarySensor as BinarySensorFeature
+from blebox_uniapi.box import Box
 
 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 . import BleBoxConfigEntry
+from .const import DOMAIN, PRODUCT
 from .entity import BleBoxEntity
 
 BINARY_SENSOR_TYPES = (
@@ -23,13 +25,15 @@ BINARY_SENSOR_TYPES = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BleBoxConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
+
+    product: Box = hass.data[DOMAIN][config_entry.entry_id][PRODUCT]
     entities = [
         BleBoxBinarySensorEntity(feature, description)
-        for feature in config_entry.runtime_data.features.get("binary_sensors", [])
+        for feature in product.features.get("binary_sensors", [])
         for description in BINARY_SENSOR_TYPES
         if description.key == feature.device_class
     ]
diff --git a/homeassistant/components/blebox/button.py b/homeassistant/components/blebox/button.py
index 90356c8ae14..24b09306de7 100644
--- a/homeassistant/components/blebox/button.py
+++ b/homeassistant/components/blebox/button.py
@@ -2,25 +2,28 @@
 
 from __future__ import annotations
 
+from blebox_uniapi.box import Box
 import blebox_uniapi.button
 
 from homeassistant.components.button import ButtonEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BleBoxConfigEntry
+from .const import DOMAIN, PRODUCT
 from .entity import BleBoxEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BleBoxConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a BleBox button entry."""
+    product: Box = hass.data[DOMAIN][config_entry.entry_id][PRODUCT]
+
     entities = [
-        BleBoxButtonEntity(feature)
-        for feature in config_entry.runtime_data.features.get("buttons", [])
+        BleBoxButtonEntity(feature) for feature in product.features.get("buttons", [])
     ]
     async_add_entities(entities, True)
 
diff --git a/homeassistant/components/blebox/climate.py b/homeassistant/components/blebox/climate.py
index e04503974b7..d4834ebbc28 100644
--- a/homeassistant/components/blebox/climate.py
+++ b/homeassistant/components/blebox/climate.py
@@ -3,6 +3,7 @@
 from datetime import timedelta
 from typing import Any
 
+from blebox_uniapi.box import Box
 import blebox_uniapi.climate
 
 from homeassistant.components.climate import (
@@ -11,11 +12,12 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BleBoxConfigEntry
+from .const import DOMAIN, PRODUCT
 from .entity import BleBoxEntity
 
 SCAN_INTERVAL = timedelta(seconds=5)
@@ -37,13 +39,14 @@ BLEBOX_TO_HVACACTION = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BleBoxConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a BleBox climate entity."""
+    product: Box = hass.data[DOMAIN][config_entry.entry_id][PRODUCT]
+
     entities = [
-        BleBoxClimateEntity(feature)
-        for feature in config_entry.runtime_data.features.get("climates", [])
+        BleBoxClimateEntity(feature) for feature in product.features.get("climates", [])
     ]
     async_add_entities(entities, True)
 
diff --git a/homeassistant/components/blebox/const.py b/homeassistant/components/blebox/const.py
index e9ea1922302..ff6a6b33af6 100644
--- a/homeassistant/components/blebox/const.py
+++ b/homeassistant/components/blebox/const.py
@@ -1,6 +1,7 @@
 """Constants for the BleBox devices integration."""
 
 DOMAIN = "blebox"
+PRODUCT = "product"
 
 DEFAULT_SETUP_TIMEOUT = 10
 
diff --git a/homeassistant/components/blebox/cover.py b/homeassistant/components/blebox/cover.py
index 4f2a7eeef11..19a216ea2b2 100644
--- a/homeassistant/components/blebox/cover.py
+++ b/homeassistant/components/blebox/cover.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from blebox_uniapi.box import Box
 import blebox_uniapi.cover
 from blebox_uniapi.cover import BleboxCoverState
 
@@ -15,10 +16,11 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
     CoverState,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BleBoxConfigEntry
+from .const import DOMAIN, PRODUCT
 from .entity import BleBoxEntity
 
 BLEBOX_TO_COVER_DEVICE_CLASSES = {
@@ -44,13 +46,13 @@ BLEBOX_TO_HASS_COVER_STATES = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BleBoxConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
+    product: Box = hass.data[DOMAIN][config_entry.entry_id][PRODUCT]
     entities = [
-        BleBoxCoverEntity(feature)
-        for feature in config_entry.runtime_data.features.get("covers", [])
+        BleBoxCoverEntity(feature) for feature in product.features.get("covers", [])
     ]
     async_add_entities(entities, True)
 
diff --git a/homeassistant/components/blebox/light.py b/homeassistant/components/blebox/light.py
index 33fff1d71da..650b8c057de 100644
--- a/homeassistant/components/blebox/light.py
+++ b/homeassistant/components/blebox/light.py
@@ -6,6 +6,7 @@ from datetime import timedelta
 import logging
 from typing import Any
 
+from blebox_uniapi.box import Box
 import blebox_uniapi.light
 from blebox_uniapi.light import BleboxColorMode
 
@@ -20,10 +21,11 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BleBoxConfigEntry
+from .const import DOMAIN, PRODUCT
 from .entity import BleBoxEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -33,13 +35,13 @@ SCAN_INTERVAL = timedelta(seconds=5)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BleBoxConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
+    product: Box = hass.data[DOMAIN][config_entry.entry_id][PRODUCT]
     entities = [
-        BleBoxLightEntity(feature)
-        for feature in config_entry.runtime_data.features.get("lights", [])
+        BleBoxLightEntity(feature) for feature in product.features.get("lights", [])
     ]
     async_add_entities(entities, True)
 
diff --git a/homeassistant/components/blebox/sensor.py b/homeassistant/components/blebox/sensor.py
index c0abff31257..c60387c97b1 100644
--- a/homeassistant/components/blebox/sensor.py
+++ b/homeassistant/components/blebox/sensor.py
@@ -1,5 +1,6 @@
 """BleBox sensor entities."""
 
+from blebox_uniapi.box import Box
 import blebox_uniapi.sensor
 
 from homeassistant.components.sensor import (
@@ -8,6 +9,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     LIGHT_LUX,
@@ -25,7 +27,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BleBoxConfigEntry
+from .const import DOMAIN, PRODUCT
 from .entity import BleBoxEntity
 
 SENSOR_TYPES = (
@@ -115,13 +117,14 @@ SENSOR_TYPES = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BleBoxConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a BleBox entry."""
+    product: Box = hass.data[DOMAIN][config_entry.entry_id][PRODUCT]
     entities = [
         BleBoxSensorEntity(feature, description)
-        for feature in config_entry.runtime_data.features.get("sensors", [])
+        for feature in product.features.get("sensors", [])
         for description in SENSOR_TYPES
         if description.key == feature.device_class
     ]
diff --git a/homeassistant/components/blebox/switch.py b/homeassistant/components/blebox/switch.py
index c6f439e27c5..93c8df0030c 100644
--- a/homeassistant/components/blebox/switch.py
+++ b/homeassistant/components/blebox/switch.py
@@ -3,13 +3,15 @@
 from datetime import timedelta
 from typing import Any
 
+from blebox_uniapi.box import Box
 import blebox_uniapi.switch
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BleBoxConfigEntry
+from .const import DOMAIN, PRODUCT
 from .entity import BleBoxEntity
 
 SCAN_INTERVAL = timedelta(seconds=5)
@@ -17,13 +19,13 @@ SCAN_INTERVAL = timedelta(seconds=5)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BleBoxConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up a BleBox switch entity."""
+    product: Box = hass.data[DOMAIN][config_entry.entry_id][PRODUCT]
     entities = [
-        BleBoxSwitchEntity(feature)
-        for feature in config_entry.runtime_data.features.get("switches", [])
+        BleBoxSwitchEntity(feature) for feature in product.features.get("switches", [])
     ]
     async_add_entities(entities, True)
 
diff --git a/homeassistant/components/blink/__init__.py b/homeassistant/components/blink/__init__.py
index f6516434cd2..d21994ecc8f 100644
--- a/homeassistant/components/blink/__init__.py
+++ b/homeassistant/components/blink/__init__.py
@@ -2,7 +2,6 @@
 
 from copy import deepcopy
 import logging
-from typing import Any
 
 from aiohttp import ClientError
 from blinkpy.auth import Auth
@@ -10,6 +9,7 @@ from blinkpy.blinkpy import Blink
 import voluptuous as vol
 
 from homeassistant.components import persistent_notification
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
 from homeassistant.const import (
     CONF_FILE_PATH,
     CONF_FILENAME,
@@ -24,7 +24,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, PLATFORMS
-from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
+from .coordinator import BlinkUpdateCoordinator
 from .services import setup_services
 
 _LOGGER = logging.getLogger(__name__)
@@ -40,11 +40,13 @@ SERVICE_SAVE_RECENT_CLIPS_SCHEMA = vol.Schema(
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 
-async def _reauth_flow_wrapper(
-    hass: HomeAssistant, entry: BlinkConfigEntry, data: dict[str, Any]
-) -> None:
+async def _reauth_flow_wrapper(hass, data):
     """Reauth flow wrapper."""
-    entry.async_start_reauth(hass, data=data)
+    hass.add_job(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_REAUTH}, data=data
+        )
+    )
     persistent_notification.async_create(
         hass,
         (
@@ -55,16 +57,16 @@ async def _reauth_flow_wrapper(
     )
 
 
-async def async_migrate_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> bool:
+async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Handle migration of a previous version config entry."""
     _LOGGER.debug("Migrating from version %s", entry.version)
     data = {**entry.data}
     if entry.version == 1:
         data.pop("login_response", None)
-        await _reauth_flow_wrapper(hass, entry, data)
+        await _reauth_flow_wrapper(hass, data)
         return False
     if entry.version == 2:
-        await _reauth_flow_wrapper(hass, entry, data)
+        await _reauth_flow_wrapper(hass, data)
         return False
     return True
 
@@ -77,8 +79,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Blink via config entry."""
+    hass.data.setdefault(DOMAIN, {})
+
     _async_import_options_from_data_if_missing(hass, entry)
     session = async_get_clientsession(hass)
     blink = Blink(session=session)
@@ -100,8 +104,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> boo
         raise ConfigEntryNotReady
 
     await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
+    hass.data[DOMAIN][entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -110,7 +113,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> boo
 
 @callback
 def _async_import_options_from_data_if_missing(
-    hass: HomeAssistant, entry: BlinkConfigEntry
+    hass: HomeAssistant, entry: ConfigEntry
 ) -> None:
     options = dict(entry.options)
     if CONF_SCAN_INTERVAL not in entry.options:
@@ -120,6 +123,8 @@ def _async_import_options_from_data_if_missing(
         hass.config_entries.async_update_entry(entry, options=options)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BlinkConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Blink entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    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/blink/alarm_control_panel.py b/homeassistant/components/blink/alarm_control_panel.py
index bfb8aa9a3a0..0ad15cf0d31 100644
--- a/homeassistant/components/blink/alarm_control_panel.py
+++ b/homeassistant/components/blink/alarm_control_panel.py
@@ -9,9 +9,13 @@ from blinkpy.blinkpy import Blink, BlinkSyncModule
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
-from homeassistant.const import ATTR_ATTRIBUTION
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    ATTR_ATTRIBUTION,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -19,18 +23,16 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DEFAULT_ATTRIBUTION, DEFAULT_BRAND, DOMAIN
-from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
+from .coordinator import BlinkUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the Blink Alarm Control Panels."""
-    coordinator = config_entry.runtime_data
+    coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id]
 
     sync_modules = []
     for sync_name, sync_module in coordinator.api.sync.items():
@@ -78,10 +80,8 @@ class BlinkSyncModuleHA(
         self.sync.attributes["associated_cameras"] = list(self.sync.cameras)
         self.sync.attributes[ATTR_ATTRIBUTION] = DEFAULT_ATTRIBUTION
         self._attr_extra_state_attributes = self.sync.attributes
-        self._attr_alarm_state = (
-            AlarmControlPanelState.ARMED_AWAY
-            if self.sync.arm
-            else AlarmControlPanelState.DISARMED
+        self._attr_state = (
+            STATE_ALARM_ARMED_AWAY if self.sync.arm else STATE_ALARM_DISARMED
         )
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
diff --git a/homeassistant/components/blink/binary_sensor.py b/homeassistant/components/blink/binary_sensor.py
index c11d4cfea23..2f0a56a901c 100644
--- a/homeassistant/components/blink/binary_sensor.py
+++ b/homeassistant/components/blink/binary_sensor.py
@@ -9,6 +9,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -22,7 +23,7 @@ from .const import (
     TYPE_CAMERA_ARMED,
     TYPE_MOTION_DETECTED,
 )
-from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
+from .coordinator import BlinkUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,13 +47,11 @@ BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the blink binary sensors."""
 
-    coordinator = config_entry.runtime_data
+    coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id]
 
     entities = [
         BlinkBinarySensor(coordinator, camera, description)
diff --git a/homeassistant/components/blink/camera.py b/homeassistant/components/blink/camera.py
index 56a84135a9b..cce9100a0bd 100644
--- a/homeassistant/components/blink/camera.py
+++ b/homeassistant/components/blink/camera.py
@@ -10,6 +10,7 @@ from requests.exceptions import ChunkedEncodingError
 import voluptuous as vol
 
 from homeassistant.components.camera import Camera
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_FILE_PATH, CONF_FILENAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
@@ -27,7 +28,7 @@ from .const import (
     SERVICE_SAVE_VIDEO,
     SERVICE_TRIGGER,
 )
-from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
+from .coordinator import BlinkUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -37,13 +38,11 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up a Blink Camera."""
 
-    coordinator = config_entry.runtime_data
+    coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id]
     entities = [
         BlinkCamera(coordinator, name, camera)
         for name, camera in coordinator.api.cameras.items()
diff --git a/homeassistant/components/blink/coordinator.py b/homeassistant/components/blink/coordinator.py
index 7278dabe083..e71ff4e449e 100644
--- a/homeassistant/components/blink/coordinator.py
+++ b/homeassistant/components/blink/coordinator.py
@@ -8,7 +8,6 @@ from typing import Any
 
 from blinkpy.blinkpy import Blink
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -17,8 +16,6 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = 300
 
-type BlinkConfigEntry = ConfigEntry[BlinkUpdateCoordinator]
-
 
 class BlinkUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """BlinkUpdateCoordinator - In charge of downloading the data for a site."""
diff --git a/homeassistant/components/blink/diagnostics.py b/homeassistant/components/blink/diagnostics.py
index 255f58fc369..88ff2aff928 100644
--- a/homeassistant/components/blink/diagnostics.py
+++ b/homeassistant/components/blink/diagnostics.py
@@ -4,21 +4,24 @@ from __future__ import annotations
 
 from typing import Any
 
+from blinkpy.blinkpy import Blink
+
 from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .coordinator import BlinkConfigEntry
+from .const import DOMAIN
 
 TO_REDACT = {"serial", "macaddress", "username", "password", "token", "unique_id"}
 
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant,
-    config_entry: BlinkConfigEntry,
+    config_entry: ConfigEntry,
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
 
-    api = config_entry.runtime_data.api
+    api: Blink = hass.data[DOMAIN][config_entry.entry_id].api
 
     data = {
         camera.name: dict(camera.attributes.items())
diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py
index e0b5989cc80..8a807b9303e 100644
--- a/homeassistant/components/blink/sensor.py
+++ b/homeassistant/components/blink/sensor.py
@@ -10,18 +10,15 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
-    EntityCategory,
-    UnitOfTemperature,
-)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DEFAULT_BRAND, DOMAIN, TYPE_TEMPERATURE, TYPE_WIFI_STRENGTH
-from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
+from .coordinator import BlinkUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -36,8 +33,6 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=TYPE_WIFI_STRENGTH,
         translation_key="wifi_strength",
-        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -45,13 +40,11 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: BlinkConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Initialize a Blink sensor."""
 
-    coordinator = config_entry.runtime_data
+    coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id]
     entities = [
         BlinkSensor(coordinator, camera, description)
         for camera in coordinator.api.cameras
diff --git a/homeassistant/components/blink/services.py b/homeassistant/components/blink/services.py
index 5f51598e721..bb2cbf575dd 100644
--- a/homeassistant/components/blink/services.py
+++ b/homeassistant/components/blink/services.py
@@ -11,7 +11,6 @@ from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 
 from .const import ATTR_CONFIG_ENTRY_ID, DOMAIN, SERVICE_SEND_PIN
-from .coordinator import BlinkConfigEntry
 
 SERVICE_UPDATE_SCHEMA = vol.Schema(
     {
@@ -31,7 +30,6 @@ def setup_services(hass: HomeAssistant) -> None:
 
     async def send_pin(call: ServiceCall):
         """Call blink to send new pin."""
-        config_entry: BlinkConfigEntry | None
         for entry_id in call.data[ATTR_CONFIG_ENTRY_ID]:
             if not (config_entry := hass.config_entries.async_get_entry(entry_id)):
                 raise ServiceValidationError(
@@ -45,7 +43,7 @@ def setup_services(hass: HomeAssistant) -> None:
                     translation_key="not_loaded",
                     translation_placeholders={"target": config_entry.title},
                 )
-            coordinator = config_entry.runtime_data
+            coordinator = hass.data[DOMAIN][entry_id]
             await coordinator.api.auth.send_auth_key(
                 coordinator.api,
                 call.data[CONF_PIN],
diff --git a/homeassistant/components/blink/switch.py b/homeassistant/components/blink/switch.py
index 8eabd5c0e59..ab9b825ded1 100644
--- a/homeassistant/components/blink/switch.py
+++ b/homeassistant/components/blink/switch.py
@@ -9,6 +9,7 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -16,7 +17,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DEFAULT_BRAND, DOMAIN, TYPE_CAMERA_ARMED
-from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
+from .coordinator import BlinkUpdateCoordinator
 
 SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
     SwitchEntityDescription(
@@ -29,11 +30,11 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BlinkConfigEntry,
+    config: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Blink switches."""
-    coordinator = config_entry.runtime_data
+    coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id]
 
     async_add_entities(
         BlinkSwitch(coordinator, camera, description)
diff --git a/homeassistant/components/bloomsky/__init__.py b/homeassistant/components/bloomsky/__init__.py
new file mode 100644
index 00000000000..c2a46baaeb3
--- /dev/null
+++ b/homeassistant/components/bloomsky/__init__.py
@@ -0,0 +1,83 @@
+"""Support for BloomSky weather station."""
+
+from datetime import timedelta
+from http import HTTPStatus
+import logging
+
+import requests
+import voluptuous as vol
+
+from homeassistant.const import CONF_API_KEY, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import discovery
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.typing import ConfigType
+from homeassistant.util import Throttle
+from homeassistant.util.unit_system import METRIC_SYSTEM
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.CAMERA, Platform.SENSOR]
+
+DOMAIN = "bloomsky"
+
+# The BloomSky only updates every 5-8 minutes as per the API spec so there's
+# no point in polling the API more frequently
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=300)
+
+CONFIG_SCHEMA = vol.Schema(
+    {DOMAIN: vol.Schema({vol.Required(CONF_API_KEY): cv.string})}, extra=vol.ALLOW_EXTRA
+)
+
+
+def setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the BloomSky integration."""
+    api_key = config[DOMAIN][CONF_API_KEY]
+
+    try:
+        bloomsky = BloomSky(api_key, hass.config.units is METRIC_SYSTEM)
+    except RuntimeError:
+        return False
+
+    hass.data[DOMAIN] = bloomsky
+
+    for platform in PLATFORMS:
+        discovery.load_platform(hass, platform, DOMAIN, {}, config)
+
+    return True
+
+
+class BloomSky:
+    """Handle all communication with the BloomSky API."""
+
+    # API documentation at http://weatherlution.com/bloomsky-api/
+    API_URL = "http://api.bloomsky.com/api/skydata"
+
+    def __init__(self, api_key, is_metric):
+        """Initialize the BookSky."""
+        self._api_key = api_key
+        self._endpoint_argument = "unit=intl" if is_metric else ""
+        self.devices = {}
+        self.is_metric = is_metric
+        _LOGGER.debug("Initial BloomSky device load")
+        self.refresh_devices()
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def refresh_devices(self):
+        """Use the API to retrieve a list of devices."""
+        _LOGGER.debug("Fetching BloomSky update")
+        response = requests.get(
+            f"{self.API_URL}?{self._endpoint_argument}",
+            headers={"Authorization": self._api_key},
+            timeout=10,
+        )
+        if response.status_code == HTTPStatus.UNAUTHORIZED:
+            raise RuntimeError("Invalid API_KEY")
+        if response.status_code == HTTPStatus.METHOD_NOT_ALLOWED:
+            _LOGGER.error("You have no bloomsky devices configured")
+            return
+        if response.status_code != HTTPStatus.OK:
+            _LOGGER.error("Invalid HTTP response: %s", response.status_code)
+            return
+        # Create dictionary keyed off of the device unique id
+        self.devices.update({device["DeviceID"]: device for device in response.json()})
diff --git a/homeassistant/components/bloomsky/binary_sensor.py b/homeassistant/components/bloomsky/binary_sensor.py
new file mode 100644
index 00000000000..12d55f971e1
--- /dev/null
+++ b/homeassistant/components/bloomsky/binary_sensor.py
@@ -0,0 +1,68 @@
+"""Support the binary sensors of a BloomSky weather station."""
+
+from __future__ import annotations
+
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import (
+    PLATFORM_SCHEMA as BINARY_SENSOR_PLATFORM_SCHEMA,
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+)
+from homeassistant.const import CONF_MONITORED_CONDITIONS
+from homeassistant.core import HomeAssistant
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+
+from . import DOMAIN
+
+SENSOR_TYPES = {"Rain": BinarySensorDeviceClass.MOISTURE, "Night": None}
+
+PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
+    {
+        vol.Optional(CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)): vol.All(
+            cv.ensure_list, [vol.In(SENSOR_TYPES)]
+        )
+    }
+)
+
+
+def setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the available BloomSky weather binary sensors."""
+    # Default needed in case of discovery
+    if discovery_info is not None:
+        return
+
+    sensors = config[CONF_MONITORED_CONDITIONS]
+    bloomsky = hass.data[DOMAIN]
+
+    for device in bloomsky.devices.values():
+        for variable in sensors:
+            add_entities([BloomSkySensor(bloomsky, device, variable)], True)
+
+
+class BloomSkySensor(BinarySensorEntity):
+    """Representation of a single binary sensor in a BloomSky device."""
+
+    def __init__(self, bs, device, sensor_name):
+        """Initialize a BloomSky binary sensor."""
+        self._bloomsky = bs
+        self._device_id = device["DeviceID"]
+        self._sensor_name = sensor_name
+        self._attr_name = f"{device['DeviceName']} {sensor_name}"
+        self._attr_unique_id = f"{self._device_id}-{sensor_name}"
+        self._attr_device_class = SENSOR_TYPES.get(sensor_name)
+
+    def update(self) -> None:
+        """Request an update from the BloomSky API."""
+        self._bloomsky.refresh_devices()
+
+        self._attr_is_on = self._bloomsky.devices[self._device_id]["Data"][
+            self._sensor_name
+        ]
diff --git a/homeassistant/components/bloomsky/camera.py b/homeassistant/components/bloomsky/camera.py
new file mode 100644
index 00000000000..f07dd1e9d14
--- /dev/null
+++ b/homeassistant/components/bloomsky/camera.py
@@ -0,0 +1,67 @@
+"""Support for a camera of a BloomSky weather station."""
+
+from __future__ import annotations
+
+import logging
+
+import requests
+
+from homeassistant.components.camera import Camera
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+
+from . import DOMAIN
+
+
+def setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up access to BloomSky cameras."""
+    if discovery_info is not None:
+        return
+
+    bloomsky = hass.data[DOMAIN]
+
+    for device in bloomsky.devices.values():
+        add_entities([BloomSkyCamera(bloomsky, device)])
+
+
+class BloomSkyCamera(Camera):
+    """Representation of the images published from the BloomSky's camera."""
+
+    def __init__(self, bs, device):
+        """Initialize access to the BloomSky camera images."""
+        super().__init__()
+        self._attr_name = device["DeviceName"]
+        self._id = device["DeviceID"]
+        self._bloomsky = bs
+        self._url = ""
+        self._last_url = ""
+        # last_image will store images as they are downloaded so that the
+        # frequent updates in home-assistant don't keep poking the server
+        # to download the same image over and over.
+        self._last_image = ""
+        self._logger = logging.getLogger(__name__)
+        self._attr_unique_id = self._id
+
+    def camera_image(
+        self, width: int | None = None, height: int | None = None
+    ) -> bytes | None:
+        """Update the camera's image if it has changed."""
+        try:
+            self._url = self._bloomsky.devices[self._id]["Data"]["ImageURL"]
+            self._bloomsky.refresh_devices()
+            # If the URL hasn't changed then the image hasn't changed.
+            if self._url != self._last_url:
+                response = requests.get(self._url, timeout=10)
+                self._last_url = self._url
+                self._last_image = response.content
+        except requests.exceptions.RequestException as error:
+            self._logger.error("Error getting bloomsky image: %s", error)
+            return None
+
+        return self._last_image
diff --git a/homeassistant/components/bloomsky/manifest.json b/homeassistant/components/bloomsky/manifest.json
new file mode 100644
index 00000000000..65d302df239
--- /dev/null
+++ b/homeassistant/components/bloomsky/manifest.json
@@ -0,0 +1,7 @@
+{
+  "domain": "bloomsky",
+  "name": "BloomSky",
+  "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/bloomsky",
+  "iot_class": "cloud_polling"
+}
diff --git a/homeassistant/components/bloomsky/sensor.py b/homeassistant/components/bloomsky/sensor.py
new file mode 100644
index 00000000000..6d99506bd44
--- /dev/null
+++ b/homeassistant/components/bloomsky/sensor.py
@@ -0,0 +1,115 @@
+"""Support the sensor of a BloomSky weather station."""
+
+from __future__ import annotations
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import (
+    PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
+    SensorDeviceClass,
+    SensorEntity,
+)
+from homeassistant.const import (
+    AREA_SQUARE_METERS,
+    CONF_MONITORED_CONDITIONS,
+    PERCENTAGE,
+    UnitOfElectricPotential,
+    UnitOfPressure,
+    UnitOfTemperature,
+)
+from homeassistant.core import HomeAssistant
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+
+from . import DOMAIN
+
+# These are the available sensors
+SENSOR_TYPES = [
+    "Temperature",
+    "Humidity",
+    "Pressure",
+    "Luminance",
+    "UVIndex",
+    "Voltage",
+]
+
+# Sensor units - these do not currently align with the API documentation
+SENSOR_UNITS_IMPERIAL = {
+    "Temperature": UnitOfTemperature.FAHRENHEIT,
+    "Humidity": PERCENTAGE,
+    "Pressure": UnitOfPressure.INHG,
+    "Luminance": f"cd/{AREA_SQUARE_METERS}",
+    "Voltage": UnitOfElectricPotential.MILLIVOLT,
+}
+
+# Metric units
+SENSOR_UNITS_METRIC = {
+    "Temperature": UnitOfTemperature.CELSIUS,
+    "Humidity": PERCENTAGE,
+    "Pressure": UnitOfPressure.MBAR,
+    "Luminance": f"cd/{AREA_SQUARE_METERS}",
+    "Voltage": UnitOfElectricPotential.MILLIVOLT,
+}
+
+# Device class
+SENSOR_DEVICE_CLASS = {
+    "Temperature": SensorDeviceClass.TEMPERATURE,
+    "Humidity": SensorDeviceClass.HUMIDITY,
+    "Pressure": SensorDeviceClass.PRESSURE,
+    "Voltage": SensorDeviceClass.VOLTAGE,
+}
+
+# Which sensors to format numerically
+FORMAT_NUMBERS = ["Temperature", "Pressure", "Voltage"]
+
+PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
+    {
+        vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_TYPES): vol.All(
+            cv.ensure_list, [vol.In(SENSOR_TYPES)]
+        )
+    }
+)
+
+
+def setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the available BloomSky weather sensors."""
+    # Default needed in case of discovery
+    if discovery_info is not None:
+        return
+
+    sensors = config[CONF_MONITORED_CONDITIONS]
+    bloomsky = hass.data[DOMAIN]
+
+    for device in bloomsky.devices.values():
+        for variable in sensors:
+            add_entities([BloomSkySensor(bloomsky, device, variable)], True)
+
+
+class BloomSkySensor(SensorEntity):
+    """Representation of a single sensor in a BloomSky device."""
+
+    def __init__(self, bs, device, sensor_name):
+        """Initialize a BloomSky sensor."""
+        self._bloomsky = bs
+        self._device_id = device["DeviceID"]
+        self._sensor_name = sensor_name
+        self._attr_name = f"{device['DeviceName']} {sensor_name}"
+        self._attr_unique_id = f"{self._device_id}-{sensor_name}"
+        self._attr_device_class = SENSOR_DEVICE_CLASS.get(sensor_name)
+        self._attr_native_unit_of_measurement = SENSOR_UNITS_IMPERIAL.get(sensor_name)
+        if self._bloomsky.is_metric:
+            self._attr_native_unit_of_measurement = SENSOR_UNITS_METRIC.get(sensor_name)
+
+    def update(self) -> None:
+        """Request an update from the BloomSky API."""
+        self._bloomsky.refresh_devices()
+        state = self._bloomsky.devices[self._device_id]["Data"][self._sensor_name]
+        self._attr_native_value = (
+            f"{state:.2f}" if self._sensor_name in FORMAT_NUMBERS else state
+        )
diff --git a/homeassistant/components/blue_current/__init__.py b/homeassistant/components/blue_current/__init__.py
index 6d0ccd7b6db..e852dfc8c6e 100644
--- a/homeassistant/components/blue_current/__init__.py
+++ b/homeassistant/components/blue_current/__init__.py
@@ -22,8 +22,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from .const import DOMAIN, EVSE_ID, LOGGER, MODEL_TYPE
 
-type BlueCurrentConfigEntry = ConfigEntry[Connector]
-
 PLATFORMS = [Platform.SENSOR]
 CHARGE_POINTS = "CHARGE_POINTS"
 DATA = "data"
@@ -34,10 +32,9 @@ OBJECT = "object"
 VALUE_TYPES = ["CH_STATUS"]
 
 
-async def async_setup_entry(
-    hass: HomeAssistant, config_entry: BlueCurrentConfigEntry
-) -> bool:
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up Blue Current as a config entry."""
+    hass.data.setdefault(DOMAIN, {})
     client = Client()
     api_token = config_entry.data[CONF_API_TOKEN]
     connector = Connector(hass, config_entry, client)
@@ -53,25 +50,29 @@ async def async_setup_entry(
     )
 
     await client.wait_for_charge_points()
-    config_entry.runtime_data = connector
+    hass.data[DOMAIN][config_entry.entry_id] = connector
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, config_entry: BlueCurrentConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Unload the Blue Current config entry."""
 
-    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
+    )
+    if unload_ok:
+        hass.data[DOMAIN].pop(config_entry.entry_id)
+
+    return unload_ok
 
 
 class Connector:
     """Define a class that connects to the Blue Current websocket API."""
 
     def __init__(
-        self, hass: HomeAssistant, config: BlueCurrentConfigEntry, client: Client
+        self, hass: HomeAssistant, config: ConfigEntry, client: Client
     ) -> None:
         """Initialize."""
         self.config = config
diff --git a/homeassistant/components/blue_current/sensor.py b/homeassistant/components/blue_current/sensor.py
index be39e9571ec..4c590544984 100644
--- a/homeassistant/components/blue_current/sensor.py
+++ b/homeassistant/components/blue_current/sensor.py
@@ -8,6 +8,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CURRENCY_EURO,
     UnitOfElectricCurrent,
@@ -18,7 +19,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BlueCurrentConfigEntry, Connector
+from . import Connector
 from .const import DOMAIN
 from .entity import BlueCurrentEntity, ChargepointEntity
 
@@ -210,12 +211,10 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BlueCurrentConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up Blue Current sensors."""
-    connector = entry.runtime_data
+    connector: Connector = hass.data[DOMAIN][entry.entry_id]
     sensor_list: list[SensorEntity] = [
         ChargePointSensor(connector, sensor, evse_id)
         for evse_id in connector.charge_points
diff --git a/homeassistant/components/bluemaestro/__init__.py b/homeassistant/components/bluemaestro/__init__.py
index 3d358148fab..c25ceb44759 100644
--- a/homeassistant/components/bluemaestro/__init__.py
+++ b/homeassistant/components/bluemaestro/__init__.py
@@ -14,26 +14,27 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
+from .const import DOMAIN
+
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
-type BlueMaestroConfigEntry = ConfigEntry[PassiveBluetoothProcessorCoordinator]
 
-
-async def async_setup_entry(hass: HomeAssistant, entry: BlueMaestroConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up BlueMaestro BLE device from a config entry."""
     address = entry.unique_id
     assert address is not None
     data = BlueMaestroBluetoothDeviceData()
-    coordinator = PassiveBluetoothProcessorCoordinator(
-        hass,
-        _LOGGER,
-        address=address,
-        mode=BluetoothScanningMode.PASSIVE,
-        update_method=data.update,
+    coordinator = hass.data.setdefault(DOMAIN, {})[entry.entry_id] = (
+        PassiveBluetoothProcessorCoordinator(
+            hass,
+            _LOGGER,
+            address=address,
+            mode=BluetoothScanningMode.PASSIVE,
+            update_method=data.update,
+        )
     )
-    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     entry.async_on_unload(
         coordinator.async_start()
@@ -41,8 +42,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: BlueMaestroConfigEntry)
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, entry: BlueMaestroConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    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/bluemaestro/sensor.py b/homeassistant/components/bluemaestro/sensor.py
index 57702d4ff31..75d448c9b9d 100644
--- a/homeassistant/components/bluemaestro/sensor.py
+++ b/homeassistant/components/bluemaestro/sensor.py
@@ -8,9 +8,11 @@ from bluemaestro_ble import (
     Units,
 )
 
+from homeassistant import config_entries
 from homeassistant.components.bluetooth.passive_update_processor import (
     PassiveBluetoothDataProcessor,
     PassiveBluetoothDataUpdate,
+    PassiveBluetoothProcessorCoordinator,
     PassiveBluetoothProcessorEntity,
 )
 from homeassistant.components.sensor import (
@@ -30,7 +32,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
 
-from . import BlueMaestroConfigEntry
+from .const import DOMAIN
 from .device import device_key_to_bluetooth_entity_key
 
 SENSOR_DESCRIPTIONS = {
@@ -115,11 +117,13 @@ def sensor_update_to_bluetooth_data_update(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: BlueMaestroConfigEntry,
+    entry: config_entries.ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the BlueMaestro BLE sensors."""
-    coordinator = entry.runtime_data
+    coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][
+        entry.entry_id
+    ]
     processor = PassiveBluetoothDataProcessor(sensor_update_to_bluetooth_data_update)
     entry.async_on_unload(
         processor.async_add_entities_listener(
diff --git a/homeassistant/components/bluesound/__init__.py b/homeassistant/components/bluesound/__init__.py
index 82fe9b00d57..da74ed042be 100644
--- a/homeassistant/components/bluesound/__init__.py
+++ b/homeassistant/components/bluesound/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
-from .services import setup_services
+from .media_player import setup_services
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
diff --git a/homeassistant/components/bluesound/const.py b/homeassistant/components/bluesound/const.py
index b1be33f6770..b7da4e31702 100644
--- a/homeassistant/components/bluesound/const.py
+++ b/homeassistant/components/bluesound/const.py
@@ -2,5 +2,9 @@
 
 DOMAIN = "bluesound"
 INTEGRATION_TITLE = "Bluesound"
+SERVICE_CLEAR_TIMER = "clear_sleep_timer"
+SERVICE_JOIN = "join"
+SERVICE_SET_TIMER = "set_sleep_timer"
+SERVICE_UNJOIN = "unjoin"
 ATTR_BLUESOUND_GROUP = "bluesound_group"
 ATTR_MASTER = "master"
diff --git a/homeassistant/components/bluesound/media_player.py b/homeassistant/components/bluesound/media_player.py
index 97985a74300..1a633468a3a 100644
--- a/homeassistant/components/bluesound/media_player.py
+++ b/homeassistant/components/bluesound/media_player.py
@@ -7,7 +7,7 @@ from asyncio import CancelledError, Task
 from contextlib import suppress
 from datetime import datetime, timedelta
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, NamedTuple, cast
 
 from pyblu import Input, Player, Preset, Status, SyncStatus
 from pyblu.errors import PlayerUnreachableError
@@ -24,8 +24,18 @@ from homeassistant.components.media_player import (
     async_process_play_media_url,
 )
 from homeassistant.config_entries import SOURCE_IMPORT
-from homeassistant.const import CONF_HOST, CONF_HOSTS, CONF_NAME, CONF_PORT
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    CONF_HOST,
+    CONF_HOSTS,
+    CONF_NAME,
+    CONF_PORT,
+)
+from homeassistant.core import (
+    DOMAIN as HOMEASSISTANT_DOMAIN,
+    HomeAssistant,
+    ServiceCall,
+)
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv, issue_registry as ir
@@ -38,7 +48,16 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 import homeassistant.util.dt as dt_util
 
-from .const import ATTR_BLUESOUND_GROUP, ATTR_MASTER, DOMAIN, INTEGRATION_TITLE
+from .const import (
+    ATTR_BLUESOUND_GROUP,
+    ATTR_MASTER,
+    DOMAIN,
+    INTEGRATION_TITLE,
+    SERVICE_CLEAR_TIMER,
+    SERVICE_JOIN,
+    SERVICE_SET_TIMER,
+    SERVICE_UNJOIN,
+)
 from .utils import format_unique_id
 
 if TYPE_CHECKING:
@@ -73,6 +92,29 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     }
 )
 
+BS_SCHEMA = vol.Schema({vol.Optional(ATTR_ENTITY_ID): cv.entity_ids})
+
+BS_JOIN_SCHEMA = BS_SCHEMA.extend({vol.Required(ATTR_MASTER): cv.entity_id})
+
+
+class ServiceMethodDetails(NamedTuple):
+    """Details for SERVICE_TO_METHOD mapping."""
+
+    method: str
+    schema: vol.Schema
+
+
+SERVICE_TO_METHOD = {
+    SERVICE_JOIN: ServiceMethodDetails(method="async_join", schema=BS_JOIN_SCHEMA),
+    SERVICE_UNJOIN: ServiceMethodDetails(method="async_unjoin", schema=BS_SCHEMA),
+    SERVICE_SET_TIMER: ServiceMethodDetails(
+        method="async_increase_timer", schema=BS_SCHEMA
+    ),
+    SERVICE_CLEAR_TIMER: ServiceMethodDetails(
+        method="async_clear_timer", schema=BS_SCHEMA
+    ),
+}
+
 
 async def _async_import(hass: HomeAssistant, config: ConfigType) -> None:
     """Import config entry from configuration.yaml."""
@@ -117,6 +159,33 @@ async def _async_import(hass: HomeAssistant, config: ConfigType) -> None:
     )
 
 
+def setup_services(hass: HomeAssistant) -> None:
+    """Set up services for Bluesound component."""
+
+    async def async_service_handler(service: ServiceCall) -> None:
+        """Map services to method of Bluesound devices."""
+        if not (method := SERVICE_TO_METHOD.get(service.service)):
+            return
+
+        params = {
+            key: value for key, value in service.data.items() if key != ATTR_ENTITY_ID
+        }
+        if entity_ids := service.data.get(ATTR_ENTITY_ID):
+            target_players = [
+                player for player in hass.data[DOMAIN] if player.entity_id in entity_ids
+            ]
+        else:
+            target_players = hass.data[DOMAIN]
+
+        for player in target_players:
+            await getattr(player, method.method)(**params)
+
+    for service, method in SERVICE_TO_METHOD.items():
+        hass.services.async_register(
+            DOMAIN, service, async_service_handler, schema=method.schema
+        )
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: BluesoundConfigEntry,
@@ -364,13 +433,12 @@ class BluesoundPlayer(MediaPlayerEntity):
         if self.is_grouped and not self.is_master:
             return MediaPlayerState.IDLE
 
-        match self._status.state:
-            case "pause":
-                return MediaPlayerState.PAUSED
-            case "stream" | "play":
-                return MediaPlayerState.PLAYING
-            case _:
-                return MediaPlayerState.IDLE
+        status = self._status.state
+        if status in ("pause", "stop"):
+            return MediaPlayerState.PAUSED
+        if status in ("stream", "play"):
+            return MediaPlayerState.PLAYING
+        return MediaPlayerState.IDLE
 
     @property
     def media_title(self) -> str | None:
@@ -487,11 +555,6 @@ class BluesoundPlayer(MediaPlayerEntity):
         """Return the device name as returned by the device."""
         return self._bluesound_device_name
 
-    @property
-    def sync_status(self) -> SyncStatus:
-        """Return the sync status."""
-        return self._sync_status
-
     @property
     def source_list(self) -> list[str] | None:
         """List of available input sources."""
@@ -630,7 +693,7 @@ class BluesoundPlayer(MediaPlayerEntity):
             reverse=True,
         )
         return [
-            entity.sync_status.name
+            cast(str, entity.name)
             for entity in sorted_entities
             if entity.bluesound_device_name in device_group
         ]
@@ -770,7 +833,7 @@ class BluesoundPlayer(MediaPlayerEntity):
 
     async def async_set_volume_level(self, volume: float) -> None:
         """Send volume_up command to media player."""
-        volume = int(round(volume * 100))
+        volume = int(volume * 100)
         volume = min(100, volume)
         volume = max(0, volume)
 
diff --git a/homeassistant/components/bluesound/services.py b/homeassistant/components/bluesound/services.py
deleted file mode 100644
index 06a507420f8..00000000000
--- a/homeassistant/components/bluesound/services.py
+++ /dev/null
@@ -1,68 +0,0 @@
-"""Support for Bluesound devices."""
-
-from __future__ import annotations
-
-from typing import NamedTuple
-
-import voluptuous as vol
-
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import config_validation as cv
-
-from .const import ATTR_MASTER, DOMAIN
-
-SERVICE_CLEAR_TIMER = "clear_sleep_timer"
-SERVICE_JOIN = "join"
-SERVICE_SET_TIMER = "set_sleep_timer"
-SERVICE_UNJOIN = "unjoin"
-
-BS_SCHEMA = vol.Schema({vol.Optional(ATTR_ENTITY_ID): cv.entity_ids})
-
-BS_JOIN_SCHEMA = BS_SCHEMA.extend({vol.Required(ATTR_MASTER): cv.entity_id})
-
-
-class ServiceMethodDetails(NamedTuple):
-    """Details for SERVICE_TO_METHOD mapping."""
-
-    method: str
-    schema: vol.Schema
-
-
-SERVICE_TO_METHOD = {
-    SERVICE_JOIN: ServiceMethodDetails(method="async_join", schema=BS_JOIN_SCHEMA),
-    SERVICE_UNJOIN: ServiceMethodDetails(method="async_unjoin", schema=BS_SCHEMA),
-    SERVICE_SET_TIMER: ServiceMethodDetails(
-        method="async_increase_timer", schema=BS_SCHEMA
-    ),
-    SERVICE_CLEAR_TIMER: ServiceMethodDetails(
-        method="async_clear_timer", schema=BS_SCHEMA
-    ),
-}
-
-
-def setup_services(hass: HomeAssistant) -> None:
-    """Set up services for Bluesound component."""
-
-    async def async_service_handler(service: ServiceCall) -> None:
-        """Map services to method of Bluesound devices."""
-        if not (method := SERVICE_TO_METHOD.get(service.service)):
-            return
-
-        params = {
-            key: value for key, value in service.data.items() if key != ATTR_ENTITY_ID
-        }
-        if entity_ids := service.data.get(ATTR_ENTITY_ID):
-            target_players = [
-                player for player in hass.data[DOMAIN] if player.entity_id in entity_ids
-            ]
-        else:
-            target_players = hass.data[DOMAIN]
-
-        for player in target_players:
-            await getattr(player, method.method)(**params)
-
-    for service, method in SERVICE_TO_METHOD.items():
-        hass.services.async_register(
-            DOMAIN, service, async_service_handler, schema=method.schema
-        )
diff --git a/homeassistant/components/bmw_connected_drive/config_flow.py b/homeassistant/components/bmw_connected_drive/config_flow.py
index 409bfdca6f1..37ff1eb374c 100644
--- a/homeassistant/components/bmw_connected_drive/config_flow.py
+++ b/homeassistant/components/bmw_connected_drive/config_flow.py
@@ -7,11 +7,7 @@ from typing import Any
 
 from bimmer_connected.api.authentication import MyBMWAuthentication
 from bimmer_connected.api.regions import get_region_from_name
-from bimmer_connected.models import (
-    MyBMWAPIError,
-    MyBMWAuthError,
-    MyBMWCaptchaMissingError,
-)
+from bimmer_connected.models import MyBMWAPIError, MyBMWAuthError
 from httpx import RequestError
 import voluptuous as vol
 
@@ -21,7 +17,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_PASSWORD, CONF_REGION, CONF_SOURCE, CONF_USERNAME
 from homeassistant.core import HomeAssistant, callback
@@ -58,8 +54,6 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
 
     try:
         await auth.login()
-    except MyBMWCaptchaMissingError as ex:
-        raise MissingCaptcha from ex
     except MyBMWAuthError as ex:
         raise InvalidAuth from ex
     except (MyBMWAPIError, RequestError) as ex:
@@ -104,8 +98,6 @@ class BMWConfigFlow(ConfigFlow, domain=DOMAIN):
                     CONF_REFRESH_TOKEN: info.get(CONF_REFRESH_TOKEN),
                     CONF_GCID: info.get(CONF_GCID),
                 }
-            except MissingCaptcha:
-                errors["base"] = "missing_captcha"
             except CannotConnect:
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
@@ -153,10 +145,10 @@ class BMWConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> BMWOptionsFlow:
         """Return a MyBMW option flow."""
-        return BMWOptionsFlow()
+        return BMWOptionsFlow(config_entry)
 
 
-class BMWOptionsFlow(OptionsFlow):
+class BMWOptionsFlow(OptionsFlowWithConfigEntry):
     """Handle a option flow for MyBMW."""
 
     async def async_step_init(
@@ -200,7 +192,3 @@ class CannotConnect(HomeAssistantError):
 
 class InvalidAuth(HomeAssistantError):
     """Error to indicate there is invalid auth."""
-
-
-class MissingCaptcha(HomeAssistantError):
-    """Error to indicate the captcha token is missing."""
diff --git a/homeassistant/components/bmw_connected_drive/coordinator.py b/homeassistant/components/bmw_connected_drive/coordinator.py
index d38b7ffacc2..992e7dea6b2 100644
--- a/homeassistant/components/bmw_connected_drive/coordinator.py
+++ b/homeassistant/components/bmw_connected_drive/coordinator.py
@@ -7,12 +7,7 @@ import logging
 
 from bimmer_connected.account import MyBMWAccount
 from bimmer_connected.api.regions import get_region_from_name
-from bimmer_connected.models import (
-    GPSPosition,
-    MyBMWAPIError,
-    MyBMWAuthError,
-    MyBMWCaptchaMissingError,
-)
+from bimmer_connected.models import GPSPosition, MyBMWAPIError, MyBMWAuthError
 from httpx import RequestError
 
 from homeassistant.config_entries import ConfigEntry
@@ -66,12 +61,6 @@ class BMWDataUpdateCoordinator(DataUpdateCoordinator[None]):
 
         try:
             await self.account.get_vehicles()
-        except MyBMWCaptchaMissingError as err:
-            # If a captcha is required (user/password login flow), always trigger the reauth flow
-            raise ConfigEntryAuthFailed(
-                translation_domain=DOMAIN,
-                translation_key="missing_captcha",
-            ) from err
         except MyBMWAuthError as err:
             # Allow one retry interval before raising AuthFailed to avoid flaky API issues
             if self.last_update_success:
diff --git a/homeassistant/components/bmw_connected_drive/manifest.json b/homeassistant/components/bmw_connected_drive/manifest.json
index 584eb1eebb5..6bc9027ac19 100644
--- a/homeassistant/components/bmw_connected_drive/manifest.json
+++ b/homeassistant/components/bmw_connected_drive/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["bimmer_connected"],
   "quality_scale": "platinum",
-  "requirements": ["bimmer-connected[china]==0.16.4"]
+  "requirements": ["bimmer-connected[china]==0.16.3"]
 }
diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py
index e24e2dd75f6..fe0e835622b 100644
--- a/homeassistant/components/bmw_connected_drive/sensor.py
+++ b/homeassistant/components/bmw_connected_drive/sensor.py
@@ -80,6 +80,7 @@ SENSOR_TYPES: list[BMWSensorEntityDescription] = [
     BMWSensorEntityDescription(
         key="fuel_and_battery.charging_target",
         translation_key="charging_target",
+        device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         suggested_display_precision=0,
         is_available=lambda v: v.is_lsc_enabled and v.has_electric_drivetrain,
diff --git a/homeassistant/components/bmw_connected_drive/strings.json b/homeassistant/components/bmw_connected_drive/strings.json
index 0e7a4a32ef4..fed71f85e35 100644
--- a/homeassistant/components/bmw_connected_drive/strings.json
+++ b/homeassistant/components/bmw_connected_drive/strings.json
@@ -11,8 +11,7 @@
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "missing_captcha": "Captcha validation missing"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
@@ -201,9 +200,6 @@
   "exceptions": {
     "invalid_poi": {
       "message": "Invalid data for point of interest: {poi_exception}"
-    },
-    "missing_captcha": {
-      "message": "Login requires captcha validation"
     }
   }
 }
diff --git a/homeassistant/components/bosch_shc/config_flow.py b/homeassistant/components/bosch_shc/config_flow.py
index 58601152da5..a8896414a4f 100644
--- a/homeassistant/components/bosch_shc/config_flow.py
+++ b/homeassistant/components/bosch_shc/config_flow.py
@@ -39,21 +39,16 @@ HOST_SCHEMA = vol.Schema(
 )
 
 
-def write_tls_asset(
-    hass: HomeAssistant, folder: str, filename: str, asset: bytes
-) -> None:
+def write_tls_asset(hass: HomeAssistant, filename: str, asset: bytes) -> None:
     """Write the tls assets to disk."""
-    makedirs(hass.config.path(DOMAIN, folder), exist_ok=True)
-    with open(
-        hass.config.path(DOMAIN, folder, filename), "w", encoding="utf8"
-    ) as file_handle:
+    makedirs(hass.config.path(DOMAIN), exist_ok=True)
+    with open(hass.config.path(DOMAIN, filename), "w", encoding="utf8") as file_handle:
         file_handle.write(asset.decode("utf-8"))
 
 
 def create_credentials_and_validate(
     hass: HomeAssistant,
     host: str,
-    unique_id: str,
     user_input: dict[str, Any],
     zeroconf_instance: zeroconf.HaZeroconf,
 ) -> dict[str, Any] | None:
@@ -62,15 +57,13 @@ def create_credentials_and_validate(
     result = helper.register(host, "HomeAssistant")
 
     if result is not None:
-        # Save key/certificate pair for each registered host separately
-        # otherwise only the last registered host is accessible.
-        write_tls_asset(hass, unique_id, CONF_SHC_CERT, result["cert"])
-        write_tls_asset(hass, unique_id, CONF_SHC_KEY, result["key"])
+        write_tls_asset(hass, CONF_SHC_CERT, result["cert"])
+        write_tls_asset(hass, CONF_SHC_KEY, result["key"])
 
         session = SHCSession(
             host,
-            hass.config.path(DOMAIN, unique_id, CONF_SHC_CERT),
-            hass.config.path(DOMAIN, unique_id, CONF_SHC_KEY),
+            hass.config.path(DOMAIN, CONF_SHC_CERT),
+            hass.config.path(DOMAIN, CONF_SHC_KEY),
             True,
             zeroconf_instance,
         )
@@ -150,16 +143,11 @@ class BoschSHCConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
         if user_input is not None:
             zeroconf_instance = await zeroconf.async_get_instance(self.hass)
-            # unique_id uniquely identifies the registered controller and is used
-            # to save the key/certificate pair for each controller separately
-            unique_id = self.info["unique_id"]
-            assert unique_id
             try:
                 result = await self.hass.async_add_executor_job(
                     create_credentials_and_validate,
                     self.hass,
                     self.host,
-                    unique_id,
                     user_input,
                     zeroconf_instance,
                 )
@@ -179,18 +167,13 @@ class BoschSHCConfigFlow(ConfigFlow, domain=DOMAIN):
             else:
                 assert result
                 entry_data = {
-                    # Each host has its own key/certificate pair
-                    CONF_SSL_CERTIFICATE: self.hass.config.path(
-                        DOMAIN, unique_id, CONF_SHC_CERT
-                    ),
-                    CONF_SSL_KEY: self.hass.config.path(
-                        DOMAIN, unique_id, CONF_SHC_KEY
-                    ),
+                    CONF_SSL_CERTIFICATE: self.hass.config.path(DOMAIN, CONF_SHC_CERT),
+                    CONF_SSL_KEY: self.hass.config.path(DOMAIN, CONF_SHC_KEY),
                     CONF_HOST: self.host,
                     CONF_TOKEN: result["token"],
                     CONF_HOSTNAME: result["token"].split(":", 1)[1],
                 }
-                existing_entry = await self.async_set_unique_id(unique_id)
+                existing_entry = await self.async_set_unique_id(self.info["unique_id"])
                 if existing_entry:
                     return self.async_update_reload_and_abort(
                         existing_entry,
diff --git a/homeassistant/components/bring/icons.json b/homeassistant/components/bring/icons.json
index c670ef87700..7a4775066cf 100644
--- a/homeassistant/components/bring/icons.json
+++ b/homeassistant/components/bring/icons.json
@@ -12,13 +12,6 @@
       },
       "list_language": {
         "default": "mdi:earth"
-      },
-      "list_access": {
-        "default": "mdi:account-lock",
-        "state": {
-          "shared": "mdi:account-group",
-          "invitation": "mdi:account-multiple-plus"
-        }
       }
     },
     "todo": {
diff --git a/homeassistant/components/bring/manifest.json b/homeassistant/components/bring/manifest.json
index ff24a991350..79336c086ed 100644
--- a/homeassistant/components/bring/manifest.json
+++ b/homeassistant/components/bring/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bring",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["bring-api==0.9.1"]
+  "requirements": ["bring-api==0.9.0"]
 }
diff --git a/homeassistant/components/bring/sensor.py b/homeassistant/components/bring/sensor.py
index 746ed397e1b..edc1da3d59b 100644
--- a/homeassistant/components/bring/sensor.py
+++ b/homeassistant/components/bring/sensor.py
@@ -40,7 +40,6 @@ class BringSensor(StrEnum):
     CONVENIENT = "convenient"
     DISCOUNTED = "discounted"
     LIST_LANGUAGE = "list_language"
-    LIST_ACCESS = "list_access"
 
 
 SENSOR_DESCRIPTIONS: tuple[BringSensorEntityDescription, ...] = (
@@ -74,14 +73,6 @@ SENSOR_DESCRIPTIONS: tuple[BringSensorEntityDescription, ...] = (
         options=[x.lower() for x in BRING_SUPPORTED_LOCALES],
         device_class=SensorDeviceClass.ENUM,
     ),
-    BringSensorEntityDescription(
-        key=BringSensor.LIST_ACCESS,
-        translation_key=BringSensor.LIST_ACCESS,
-        value_fn=lambda lst, _: lst["status"].lower(),
-        entity_category=EntityCategory.DIAGNOSTIC,
-        options=["registered", "shared", "invitation"],
-        device_class=SensorDeviceClass.ENUM,
-    ),
 )
 
 
diff --git a/homeassistant/components/bring/strings.json b/homeassistant/components/bring/strings.json
index 9a93881b5d2..bce18fc6a92 100644
--- a/homeassistant/components/bring/strings.json
+++ b/homeassistant/components/bring/strings.json
@@ -61,14 +61,6 @@
           "sv-se": "Sweden",
           "tr-tr": "Türkiye"
         }
-      },
-      "list_access": {
-        "name": "List access",
-        "state": {
-          "registered": "Private",
-          "shared": "Shared",
-          "invitation": "Invitation pending"
-        }
       }
     }
   },
diff --git a/homeassistant/components/broadlink/device.py b/homeassistant/components/broadlink/device.py
index 75b6236a473..2518cd65bd3 100644
--- a/homeassistant/components/broadlink/device.py
+++ b/homeassistant/components/broadlink/device.py
@@ -15,7 +15,7 @@ from broadlink.exceptions import (
 )
 from typing_extensions import TypeVar
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_MAC,
@@ -200,4 +200,10 @@ class BroadlinkDevice(Generic[_ApiT]):
             self.api.host[0],
         )
 
-        self.config.async_start_reauth(self.hass, data={CONF_NAME: self.name})
+        self.hass.async_create_task(
+            self.hass.config_entries.flow.async_init(
+                DOMAIN,
+                context={"source": SOURCE_REAUTH},
+                data={CONF_NAME: self.name, **self.config.data},
+            )
+        )
diff --git a/homeassistant/components/brunt/__init__.py b/homeassistant/components/brunt/__init__.py
index c488c813b3b..bec281d1902 100644
--- a/homeassistant/components/brunt/__init__.py
+++ b/homeassistant/components/brunt/__init__.py
@@ -2,22 +2,79 @@
 
 from __future__ import annotations
 
+from asyncio import timeout
+import logging
+
+from aiohttp.client_exceptions import ClientResponseError, ServerDisconnectedError
+from brunt import BruntClientAsync, Thing
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import PLATFORMS
-from .coordinator import BruntConfigEntry, BruntCoordinator
+from .const import DATA_BAPI, DATA_COOR, DOMAIN, PLATFORMS, REGULAR_INTERVAL
+
+_LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: BruntConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Brunt using config flow."""
-    coordinator = BruntCoordinator(hass, entry)
+    session = async_get_clientsession(hass)
+    bapi = BruntClientAsync(
+        username=entry.data[CONF_USERNAME],
+        password=entry.data[CONF_PASSWORD],
+        session=session,
+    )
+    try:
+        await bapi.async_login()
+    except ServerDisconnectedError as exc:
+        raise ConfigEntryNotReady("Brunt not ready to connect.") from exc
+    except ClientResponseError as exc:
+        raise ConfigEntryAuthFailed(
+            f"Brunt could not connect with username: {entry.data[CONF_USERNAME]}."
+        ) from exc
+
+    async def async_update_data() -> dict[str | None, Thing]:
+        """Fetch data from the Brunt endpoint for all Things.
+
+        Error 403 is the API response for any kind of authentication error (failed password or email)
+        Error 401 is the API response for things that are not part of the account, could happen when a device is deleted from the account.
+        """
+        try:
+            async with timeout(10):
+                things = await bapi.async_get_things(force=True)
+                return {thing.serial: thing for thing in things}
+        except ServerDisconnectedError as err:
+            raise UpdateFailed(f"Error communicating with API: {err}") from err
+        except ClientResponseError as err:
+            if err.status == 403:
+                raise ConfigEntryAuthFailed from err
+            if err.status == 401:
+                _LOGGER.warning("Device not found, will reload Brunt integration")
+                await hass.config_entries.async_reload(entry.entry_id)
+            raise UpdateFailed from err
+
+    coordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        name="brunt",
+        update_method=async_update_data,
+        update_interval=REGULAR_INTERVAL,
+    )
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})
+    hass.data[DOMAIN][entry.entry_id] = {DATA_BAPI: bapi, DATA_COOR: coordinator}
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BruntConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+    return unload_ok
diff --git a/homeassistant/components/brunt/config_flow.py b/homeassistant/components/brunt/config_flow.py
index 3baea9b98cc..dd119a402d8 100644
--- a/homeassistant/components/brunt/config_flow.py
+++ b/homeassistant/components/brunt/config_flow.py
@@ -12,7 +12,7 @@ from brunt import BruntClientAsync
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
 from .const import DOMAIN
 
@@ -92,10 +92,7 @@ class BruntConfigFlow(ConfigFlow, domain=DOMAIN):
             return self.async_show_form(
                 step_id="reauth_confirm",
                 data_schema=REAUTH_SCHEMA,
-                description_placeholders={
-                    CONF_USERNAME: username,
-                    CONF_NAME: reauth_entry.title,
-                },
+                description_placeholders={"username": username},
             )
         user_input[CONF_USERNAME] = username
         errors = await validate_input(user_input)
@@ -104,10 +101,7 @@ class BruntConfigFlow(ConfigFlow, domain=DOMAIN):
                 step_id="reauth_confirm",
                 data_schema=REAUTH_SCHEMA,
                 errors=errors,
-                description_placeholders={
-                    CONF_USERNAME: username,
-                    CONF_NAME: reauth_entry.title,
-                },
+                description_placeholders={"username": username},
             )
 
         return self.async_update_reload_and_abort(reauth_entry, data=user_input)
diff --git a/homeassistant/components/brunt/const.py b/homeassistant/components/brunt/const.py
index 0d9323cbf07..4c246d28d64 100644
--- a/homeassistant/components/brunt/const.py
+++ b/homeassistant/components/brunt/const.py
@@ -10,6 +10,8 @@ NOTIFICATION_ID = "brunt_notification"
 NOTIFICATION_TITLE = "Brunt Cover Setup"
 ATTRIBUTION = "Based on an unofficial Brunt SDK."
 PLATFORMS = [Platform.COVER]
+DATA_BAPI = "bapi"
+DATA_COOR = "coordinator"
 
 CLOSED_POSITION = 0
 OPEN_POSITION = 100
diff --git a/homeassistant/components/brunt/coordinator.py b/homeassistant/components/brunt/coordinator.py
deleted file mode 100644
index b07ec2c0c88..00000000000
--- a/homeassistant/components/brunt/coordinator.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""The brunt component."""
-
-from __future__ import annotations
-
-from asyncio import timeout
-import logging
-
-from aiohttp.client_exceptions import ClientResponseError, ServerDisconnectedError
-from brunt import BruntClientAsync, Thing
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import REGULAR_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-type BruntConfigEntry = ConfigEntry[BruntCoordinator]
-
-
-class BruntCoordinator(DataUpdateCoordinator[dict[str | None, Thing]]):
-    """Config entry data."""
-
-    bapi: BruntClientAsync
-    config_entry: BruntConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: BruntConfigEntry,
-    ) -> None:
-        """Initialize the Brunt coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name="brunt",
-            update_interval=REGULAR_INTERVAL,
-        )
-
-    async def _async_setup(self) -> None:
-        session = async_get_clientsession(self.hass)
-
-        self.bapi = BruntClientAsync(
-            username=self.config_entry.data[CONF_USERNAME],
-            password=self.config_entry.data[CONF_PASSWORD],
-            session=session,
-        )
-        try:
-            await self.bapi.async_login()
-        except ServerDisconnectedError as exc:
-            raise ConfigEntryNotReady("Brunt not ready to connect.") from exc
-        except ClientResponseError as exc:
-            raise ConfigEntryAuthFailed(
-                f"Brunt could not connect with username: {self.config_entry.data[CONF_USERNAME]}."
-            ) from exc
-
-    async def _async_update_data(self) -> dict[str | None, Thing]:
-        """Fetch data from the Brunt endpoint for all Things.
-
-        Error 403 is the API response for any kind of authentication error (failed password or email)
-        Error 401 is the API response for things that are not part of the account, could happen when a device is deleted from the account.
-        """
-        try:
-            async with timeout(10):
-                things = await self.bapi.async_get_things(force=True)
-                return {thing.serial: thing for thing in things}
-        except ServerDisconnectedError as err:
-            raise UpdateFailed(f"Error communicating with API: {err}") from err
-        except ClientResponseError as err:
-            if err.status == 403:
-                raise ConfigEntryAuthFailed from err
-            if err.status == 401:
-                _LOGGER.warning("Device not found, will reload Brunt integration")
-                await self.hass.config_entries.async_reload(self.config_entry.entry_id)
-            raise UpdateFailed from err
diff --git a/homeassistant/components/brunt/cover.py b/homeassistant/components/brunt/cover.py
index bb97f42bd36..519885fe542 100644
--- a/homeassistant/components/brunt/cover.py
+++ b/homeassistant/components/brunt/cover.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import Any
 
 from aiohttp.client_exceptions import ClientResponseError
-from brunt import Thing
+from brunt import BruntClientAsync, Thing
 
 from homeassistant.components.cover import (
     ATTR_POSITION,
@@ -13,39 +13,49 @@ from homeassistant.components.cover import (
     CoverEntity,
     CoverEntityFeature,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
 from .const import (
     ATTR_REQUEST_POSITION,
     ATTRIBUTION,
     CLOSED_POSITION,
+    DATA_BAPI,
+    DATA_COOR,
     DOMAIN,
     FAST_INTERVAL,
     OPEN_POSITION,
     REGULAR_INTERVAL,
 )
-from .coordinator import BruntConfigEntry, BruntCoordinator
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: BruntConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the brunt platform."""
-    coordinator = entry.runtime_data
+    bapi: BruntClientAsync = hass.data[DOMAIN][entry.entry_id][DATA_BAPI]
+    coordinator: DataUpdateCoordinator[dict[str | None, Thing]] = hass.data[DOMAIN][
+        entry.entry_id
+    ][DATA_COOR]
 
     async_add_entities(
-        BruntDevice(coordinator, serial, thing, entry.entry_id)
+        BruntDevice(coordinator, serial, thing, bapi, entry.entry_id)
         for serial, thing in coordinator.data.items()
     )
 
 
-class BruntDevice(CoordinatorEntity[BruntCoordinator], CoverEntity):
+class BruntDevice(
+    CoordinatorEntity[DataUpdateCoordinator[dict[str | None, Thing]]], CoverEntity
+):
     """Representation of a Brunt cover device.
 
     Contains the common logic for all Brunt devices.
@@ -63,14 +73,16 @@ class BruntDevice(CoordinatorEntity[BruntCoordinator], CoverEntity):
 
     def __init__(
         self,
-        coordinator: BruntCoordinator,
+        coordinator: DataUpdateCoordinator[dict[str | None, Thing]],
         serial: str | None,
         thing: Thing,
+        bapi: BruntClientAsync,
         entry_id: str,
     ) -> None:
         """Init the Brunt device."""
         super().__init__(coordinator)
         self._attr_unique_id = serial
+        self._bapi = bapi
         self._thing = thing
         self._entry_id = entry_id
 
@@ -155,7 +167,7 @@ class BruntDevice(CoordinatorEntity[BruntCoordinator], CoverEntity):
     async def _async_update_cover(self, position: int) -> None:
         """Set the cover to the new position and wait for the update to be reflected."""
         try:
-            await self.coordinator.bapi.async_change_request_position(
+            await self._bapi.async_change_request_position(
                 position, thing_uri=self._thing.thing_uri
             )
         except ClientResponseError as exc:
@@ -170,7 +182,7 @@ class BruntDevice(CoordinatorEntity[BruntCoordinator], CoverEntity):
         """Update the update interval after each refresh."""
         if (
             self.request_cover_position
-            == self.coordinator.bapi.last_requested_positions[self._thing.thing_uri]
+            == self._bapi.last_requested_positions[self._thing.thing_uri]
             and self.move_state == 0
         ):
             self.coordinator.update_interval = REGULAR_INTERVAL
diff --git a/homeassistant/components/bsblan/__init__.py b/homeassistant/components/bsblan/__init__.py
index 4d3c6ee2073..79447c6cff5 100644
--- a/homeassistant/components/bsblan/__init__.py
+++ b/homeassistant/components/bsblan/__init__.py
@@ -15,13 +15,11 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONF_PASSKEY
+from .const import CONF_PASSKEY, DOMAIN
 from .coordinator import BSBLanUpdateCoordinator
 
 PLATFORMS = [Platform.CLIMATE, Platform.SENSOR]
 
-type BSBLanConfigEntry = ConfigEntry[BSBLanData]
-
 
 @dataclasses.dataclass
 class BSBLanData:
@@ -34,7 +32,7 @@ class BSBLanData:
     static: StaticState
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up BSB-Lan from a config entry."""
 
     # create config using BSBLANConfig
@@ -59,7 +57,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
     info = await bsblan.info()
     static = await bsblan.static_values()
 
-    entry.runtime_data = BSBLanData(
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = BSBLanData(
         client=bsblan,
         coordinator=coordinator,
         device=device,
@@ -72,6 +70,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload BSBLAN config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        # Cleanup
+        del hass.data[DOMAIN][entry.entry_id]
+        if not hass.data[DOMAIN]:
+            del hass.data[DOMAIN]
+    return unload_ok
diff --git a/homeassistant/components/bsblan/climate.py b/homeassistant/components/bsblan/climate.py
index fcbe88f2fac..3a204a9e0c2 100644
--- a/homeassistant/components/bsblan/climate.py
+++ b/homeassistant/components/bsblan/climate.py
@@ -15,6 +15,7 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
@@ -22,7 +23,7 @@ from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import BSBLanConfigEntry, BSBLanData
+from . import BSBLanData
 from .const import ATTR_TARGET_TEMPERATURE, DOMAIN
 from .entity import BSBLanEntity
 
@@ -42,12 +43,18 @@ PRESET_MODES = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: BSBLanConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up BSBLAN device based on a config entry."""
-    data = entry.runtime_data
-    async_add_entities([BSBLANClimate(data)])
+    data: BSBLanData = hass.data[DOMAIN][entry.entry_id]
+    async_add_entities(
+        [
+            BSBLANClimate(
+                data,
+            )
+        ]
+    )
 
 
 class BSBLANClimate(BSBLanEntity, ClimateEntity):
diff --git a/homeassistant/components/bsblan/coordinator.py b/homeassistant/components/bsblan/coordinator.py
index 1a4299fe72f..508f2c898c3 100644
--- a/homeassistant/components/bsblan/coordinator.py
+++ b/homeassistant/components/bsblan/coordinator.py
@@ -54,9 +54,6 @@ class BSBLanUpdateCoordinator(DataUpdateCoordinator[BSBLanCoordinatorData]):
     async def _async_update_data(self) -> BSBLanCoordinatorData:
         """Get state and sensor data from BSB-Lan device."""
         try:
-            # initialize the client, this is cached and will only be called once
-            await self.client.initialize()
-
             state = await self.client.state()
             sensor = await self.client.sensor()
         except BSBLANConnectionError as err:
diff --git a/homeassistant/components/bsblan/diagnostics.py b/homeassistant/components/bsblan/diagnostics.py
index 5a8e5c1c4c5..88418f306c8 100644
--- a/homeassistant/components/bsblan/diagnostics.py
+++ b/homeassistant/components/bsblan/diagnostics.py
@@ -4,16 +4,18 @@ from __future__ import annotations
 
 from typing import Any
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from . import BSBLanConfigEntry
+from . import BSBLanData
+from .const import DOMAIN
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: BSBLanConfigEntry
+    hass: HomeAssistant, entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    data = entry.runtime_data
+    data: BSBLanData = hass.data[DOMAIN][entry.entry_id]
 
     return {
         "info": data.info.to_dict(),
diff --git a/homeassistant/components/bsblan/manifest.json b/homeassistant/components/bsblan/manifest.json
index aa9c03abf4a..6cd8608c42d 100644
--- a/homeassistant/components/bsblan/manifest.json
+++ b/homeassistant/components/bsblan/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
-  "requirements": ["python-bsblan==1.2.1"]
+  "requirements": ["python-bsblan==0.6.2"]
 }
diff --git a/homeassistant/components/bsblan/sensor.py b/homeassistant/components/bsblan/sensor.py
index eab03d7a50c..346f972ea9a 100644
--- a/homeassistant/components/bsblan/sensor.py
+++ b/homeassistant/components/bsblan/sensor.py
@@ -11,12 +11,14 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import BSBLanConfigEntry, BSBLanData
+from . import BSBLanData
+from .const import DOMAIN
 from .coordinator import BSBLanCoordinatorData
 from .entity import BSBLanEntity
 
@@ -50,11 +52,11 @@ SENSOR_TYPES: tuple[BSBLanSensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: BSBLanConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up BSB-Lan sensor based on a config entry."""
-    data = entry.runtime_data
+    data: BSBLanData = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(BSBLanSensor(data, description) for description in SENSOR_TYPES)
 
 
diff --git a/homeassistant/components/bthome/sensor.py b/homeassistant/components/bthome/sensor.py
index 417df9f5068..64e6d61cefb 100644
--- a/homeassistant/components/bthome/sensor.py
+++ b/homeassistant/components/bthome/sensor.py
@@ -364,7 +364,7 @@ SENSOR_DESCRIPTIONS = {
     ): SensorEntityDescription(
         key=f"{BTHomeSensorDeviceClass.CONDUCTIVITY}_{Units.CONDUCTIVITY}",
         device_class=SensorDeviceClass.CONDUCTIVITY,
-        native_unit_of_measurement=UnitOfConductivity.MICROSIEMENS_PER_CM,
+        native_unit_of_measurement=UnitOfConductivity.MICROSIEMENS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
 }
diff --git a/homeassistant/components/buienradar/__init__.py b/homeassistant/components/buienradar/__init__.py
index bea0102be40..3bf593b2dab 100644
--- a/homeassistant/components/buienradar/__init__.py
+++ b/homeassistant/components/buienradar/__init__.py
@@ -6,26 +6,25 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .util import BrData
+from .const import DOMAIN
 
 PLATFORMS = [Platform.CAMERA, Platform.SENSOR, Platform.WEATHER]
 
-type BuienRadarConfigEntry = ConfigEntry[dict[Platform, BrData]]
 
-
-async def async_setup_entry(hass: HomeAssistant, entry: BuienRadarConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up buienradar from a config entry."""
-    entry.runtime_data = {}
+    hass.data.setdefault(DOMAIN, {}).setdefault(entry.entry_id, {})
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     entry.async_on_unload(entry.add_update_listener(async_update_options))
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BuienRadarConfigEntry) -> 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):
+        entry_data = hass.data[DOMAIN].pop(entry.entry_id)
         for platform in PLATFORMS:
-            if (data := entry.runtime_data.get(platform)) and (
+            if (data := entry_data.get(platform)) and (
                 unsub := data.unsub_schedule_update
             ):
                 unsub()
@@ -33,8 +32,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: BuienRadarConfigEntry)
     return unload_ok
 
 
-async def async_update_options(
-    hass: HomeAssistant, config_entry: BuienRadarConfigEntry
-) -> None:
+async def async_update_options(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
     """Update options."""
     await hass.config_entries.async_reload(config_entry.entry_id)
diff --git a/homeassistant/components/buienradar/camera.py b/homeassistant/components/buienradar/camera.py
index 45ff2d6de52..e9a7d2517cb 100644
--- a/homeassistant/components/buienradar/camera.py
+++ b/homeassistant/components/buienradar/camera.py
@@ -10,13 +10,13 @@ import aiohttp
 import voluptuous as vol
 
 from homeassistant.components.camera import Camera
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_COUNTRY_CODE, CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import BuienRadarConfigEntry
 from .const import CONF_DELTA, DEFAULT_COUNTRY, DEFAULT_DELTA, DEFAULT_DIMENSION
 
 _LOGGER = logging.getLogger(__name__)
@@ -29,9 +29,7 @@ SUPPORTED_COUNTRY_CODES = ["NL", "BE"]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BuienRadarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up buienradar radar-loop camera component."""
     config = entry.data
diff --git a/homeassistant/components/buienradar/sensor.py b/homeassistant/components/buienradar/sensor.py
index afce293402e..c61d8e10b85 100644
--- a/homeassistant/components/buienradar/sensor.py
+++ b/homeassistant/components/buienradar/sensor.py
@@ -28,6 +28,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
     CONF_LATITUDE,
@@ -48,10 +49,10 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import BuienRadarConfigEntry
 from .const import (
     CONF_TIMEFRAME,
     DEFAULT_TIMEFRAME,
+    DOMAIN,
     STATE_CONDITION_CODES,
     STATE_CONDITIONS,
     STATE_DETAILED_CONDITIONS,
@@ -689,9 +690,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BuienRadarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Create the buienradar sensor."""
     config = entry.data
@@ -724,7 +723,7 @@ async def async_setup_entry(
 
     # create weather data:
     data = BrData(hass, coordinates, timeframe, entities)
-    entry.runtime_data[Platform.SENSOR] = data
+    hass.data[DOMAIN][entry.entry_id][Platform.SENSOR] = data
     await data.async_update()
 
     async_add_entities(entities)
diff --git a/homeassistant/components/buienradar/weather.py b/homeassistant/components/buienradar/weather.py
index 8b71032bace..2af66982fab 100644
--- a/homeassistant/components/buienradar/weather.py
+++ b/homeassistant/components/buienradar/weather.py
@@ -39,6 +39,7 @@ from homeassistant.components.weather import (
     WeatherEntity,
     WeatherEntityFeature,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_LATITUDE,
     CONF_LONGITUDE,
@@ -53,8 +54,8 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import BuienRadarConfigEntry
-from .const import DEFAULT_TIMEFRAME
+# Reuse data and API logic from the sensor implementation
+from .const import DEFAULT_TIMEFRAME, DOMAIN
 from .util import BrData
 
 _LOGGER = logging.getLogger(__name__)
@@ -92,9 +93,7 @@ CONDITION_MAP = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BuienRadarConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the buienradar platform."""
     config = entry.data
@@ -114,7 +113,7 @@ async def async_setup_entry(
 
     # create weather data:
     data = BrData(hass, coordinates, DEFAULT_TIMEFRAME, entities)
-    entry.runtime_data[Platform.WEATHER] = data
+    hass.data[DOMAIN][entry.entry_id][Platform.WEATHER] = data
     await data.async_update()
 
     async_add_entities(entities)
diff --git a/homeassistant/components/caldav/calendar.py b/homeassistant/components/caldav/calendar.py
index fb53947a723..d9ebe8e73fd 100644
--- a/homeassistant/components/caldav/calendar.py
+++ b/homeassistant/components/caldav/calendar.py
@@ -109,7 +109,6 @@ async def async_setup_platform(
             entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, device_id, hass=hass)
             coordinator = CalDavUpdateCoordinator(
                 hass,
-                None,
                 calendar=calendar,
                 days=days,
                 include_all_day=True,
@@ -127,7 +126,6 @@ async def async_setup_platform(
             entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, device_id, hass=hass)
             coordinator = CalDavUpdateCoordinator(
                 hass,
-                None,
                 calendar=calendar,
                 days=days,
                 include_all_day=False,
@@ -154,7 +152,6 @@ async def async_setup_entry(
                 async_generate_entity_id(ENTITY_ID_FORMAT, calendar.name, hass=hass),
                 CalDavUpdateCoordinator(
                     hass,
-                    entry,
                     calendar=calendar,
                     days=CONFIG_ENTRY_DEFAULT_DAYS,
                     include_all_day=True,
@@ -207,8 +204,7 @@ class WebDavCalendarEntity(CoordinatorEntity[CalDavUpdateCoordinator], CalendarE
         if self._supports_offset:
             self._attr_extra_state_attributes = {
                 "offset_reached": is_offset_reached(
-                    self._event.start_datetime_local,
-                    self.coordinator.offset,  # type: ignore[arg-type]
+                    self._event.start_datetime_local, self.coordinator.offset
                 )
                 if self._event
                 else False
diff --git a/homeassistant/components/caldav/coordinator.py b/homeassistant/components/caldav/coordinator.py
index eb09e3f5452..3a10b567167 100644
--- a/homeassistant/components/caldav/coordinator.py
+++ b/homeassistant/components/caldav/coordinator.py
@@ -6,9 +6,6 @@ from datetime import date, datetime, time, timedelta
 from functools import partial
 import logging
 import re
-from typing import TYPE_CHECKING
-
-import caldav
 
 from homeassistant.components.calendar import CalendarEvent, extract_offset
 from homeassistant.core import HomeAssistant
@@ -17,9 +14,6 @@ from homeassistant.util import dt as dt_util
 
 from .api import get_attr_value
 
-if TYPE_CHECKING:
-    from . import CalDavConfigEntry
-
 _LOGGER = logging.getLogger(__name__)
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
@@ -29,20 +23,11 @@ OFFSET = "!!"
 class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
     """Class to utilize the calendar dav client object to get next event."""
 
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: CalDavConfigEntry | None,
-        calendar: caldav.Calendar,
-        days: int,
-        include_all_day: bool,
-        search: str | None,
-    ) -> None:
+    def __init__(self, hass, calendar, days, include_all_day, search):
         """Set up how we are going to search the WebDav calendar."""
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=f"CalDAV {calendar.name}",
             update_interval=MIN_TIME_BETWEEN_UPDATES,
         )
@@ -50,7 +35,7 @@ class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
         self.days = days
         self.include_all_day = include_all_day
         self.search = search
-        self.offset: timedelta | None = None
+        self.offset = None
 
     async def async_get_events(
         self, hass: HomeAssistant, start_date: datetime, end_date: datetime
@@ -124,7 +109,7 @@ class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
                     _start_of_tomorrow = start_of_tomorrow
                 if _start_of_today <= start_dt < _start_of_tomorrow:
                     new_event = event.copy()
-                    new_vevent = new_event.instance.vevent  # type: ignore[attr-defined]
+                    new_vevent = new_event.instance.vevent
                     if hasattr(new_vevent, "dtend"):
                         dur = new_vevent.dtend.value - new_vevent.dtstart.value
                         new_vevent.dtend.value = start_dt + dur
diff --git a/homeassistant/components/calendar/icons.json b/homeassistant/components/calendar/icons.json
index a28adcf317e..9b8df3ec6d3 100644
--- a/homeassistant/components/calendar/icons.json
+++ b/homeassistant/components/calendar/icons.json
@@ -14,6 +14,9 @@
     },
     "get_events": {
       "service": "mdi:calendar-month"
+    },
+    "list_events": {
+      "service": "mdi:calendar-month"
     }
   }
 }
diff --git a/homeassistant/components/calendar/services.yaml b/homeassistant/components/calendar/services.yaml
index 9701293c0be..2e926fbdeed 100644
--- a/homeassistant/components/calendar/services.yaml
+++ b/homeassistant/components/calendar/services.yaml
@@ -36,6 +36,22 @@ create_event:
       example: "Conference Room - F123, Bldg. 002"
       selector:
         text:
+list_events:
+  target:
+    entity:
+      domain: calendar
+  fields:
+    start_date_time:
+      example: "2022-03-22 20:00:00"
+      selector:
+        datetime:
+    end_date_time:
+      example: "2022-03-22 22:00:00"
+      selector:
+        datetime:
+    duration:
+      selector:
+        duration:
 get_events:
   target:
     entity:
diff --git a/homeassistant/components/calendar/strings.json b/homeassistant/components/calendar/strings.json
index 76e6c42b666..5b76a33f7c3 100644
--- a/homeassistant/components/calendar/strings.json
+++ b/homeassistant/components/calendar/strings.json
@@ -89,6 +89,24 @@
           "description": "Returns active events from start_date_time until the specified duration."
         }
       }
+    },
+    "list_events": {
+      "name": "List event",
+      "description": "Lists events on a calendar within a time range.",
+      "fields": {
+        "start_date_time": {
+          "name": "[%key:component::calendar::services::get_events::fields::start_date_time::name%]",
+          "description": "[%key:component::calendar::services::get_events::fields::start_date_time::description%]"
+        },
+        "end_date_time": {
+          "name": "[%key:component::calendar::services::get_events::fields::end_date_time::name%]",
+          "description": "[%key:component::calendar::services::get_events::fields::end_date_time::description%]"
+        },
+        "duration": {
+          "name": "[%key:component::calendar::services::get_events::fields::duration::name%]",
+          "description": "[%key:component::calendar::services::get_events::fields::duration::description%]"
+        }
+      }
     }
   },
   "issues": {
diff --git a/homeassistant/components/cambridge_audio/__init__.py b/homeassistant/components/cambridge_audio/__init__.py
index a584f0db6c1..f00f4f41f91 100644
--- a/homeassistant/components/cambridge_audio/__init__.py
+++ b/homeassistant/components/cambridge_audio/__init__.py
@@ -13,9 +13,9 @@ from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import CONNECT_TIMEOUT, DOMAIN, STREAM_MAGIC_EXCEPTIONS
+from .const import CONNECT_TIMEOUT, STREAM_MAGIC_EXCEPTIONS
 
-PLATFORMS: list[Platform] = [Platform.MEDIA_PLAYER, Platform.SELECT, Platform.SWITCH]
+PLATFORMS: list[Platform] = [Platform.MEDIA_PLAYER, Platform.SELECT]
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,13 +45,7 @@ async def async_setup_entry(
         async with asyncio.timeout(CONNECT_TIMEOUT):
             await client.connect()
     except STREAM_MAGIC_EXCEPTIONS as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="entry_cannot_connect",
-            translation_placeholders={
-                "host": client.host,
-            },
-        ) from err
+        raise ConfigEntryNotReady(f"Error while connecting to {client.host}") from err
     entry.runtime_data = client
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/cambridge_audio/const.py b/homeassistant/components/cambridge_audio/const.py
index eae417ffe39..5a4e5a1f2e0 100644
--- a/homeassistant/components/cambridge_audio/const.py
+++ b/homeassistant/components/cambridge_audio/const.py
@@ -17,7 +17,3 @@ STREAM_MAGIC_EXCEPTIONS = (
 )
 
 CONNECT_TIMEOUT = 5
-
-CAMBRIDGE_MEDIA_TYPE_PRESET = "preset"
-CAMBRIDGE_MEDIA_TYPE_AIRABLE = "airable"
-CAMBRIDGE_MEDIA_TYPE_INTERNET_RADIO = "internet_radio"
diff --git a/homeassistant/components/cambridge_audio/diagnostics.py b/homeassistant/components/cambridge_audio/diagnostics.py
index a670b1f32eb..b4295e7c885 100644
--- a/homeassistant/components/cambridge_audio/diagnostics.py
+++ b/homeassistant/components/cambridge_audio/diagnostics.py
@@ -2,22 +2,20 @@
 
 from typing import Any
 
+from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.redact import async_redact_data
 
 from . import CambridgeAudioConfigEntry
 
+TO_REDACT = {CONF_HOST}
+
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: CambridgeAudioConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for the provided config entry."""
     client = entry.runtime_data
-    return {
-        "display": client.display.to_dict(),
-        "info": client.info.to_dict(),
-        "now_playing": client.now_playing.to_dict(),
-        "play_state": client.play_state.to_dict(),
-        "presets_list": client.preset_list.to_dict(),
-        "sources": [s.to_dict() for s in client.sources],
-        "update": client.update.to_dict(),
-    }
+    return async_redact_data(
+        {"info": client.info, "sources": client.sources}, TO_REDACT
+    )
diff --git a/homeassistant/components/cambridge_audio/entity.py b/homeassistant/components/cambridge_audio/entity.py
index de7a3e31765..ac43a673725 100644
--- a/homeassistant/components/cambridge_audio/entity.py
+++ b/homeassistant/components/cambridge_audio/entity.py
@@ -26,12 +26,7 @@ def command[_EntityT: CambridgeAudioEntity, **_P](
             await func(self, *args, **kwargs)
         except STREAM_MAGIC_EXCEPTIONS as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="command_error",
-                translation_placeholders={
-                    "function_name": func.__name__,
-                    "entity_id": self.entity_id,
-                },
+                f"Error executing {func.__name__} on entity {self.entity_id},"
             ) from exc
 
     return decorator
@@ -67,4 +62,4 @@ class CambridgeAudioEntity(Entity):
 
     async def async_will_remove_from_hass(self) -> None:
         """Remove callbacks."""
-        self.client.unregister_state_update_callbacks(self._state_update_callback)
+        await self.client.unregister_state_update_callbacks(self._state_update_callback)
diff --git a/homeassistant/components/cambridge_audio/icons.json b/homeassistant/components/cambridge_audio/icons.json
index b4346a7fe8e..9023e9dc1b7 100644
--- a/homeassistant/components/cambridge_audio/icons.json
+++ b/homeassistant/components/cambridge_audio/icons.json
@@ -8,20 +8,6 @@
           "dim": "mdi:brightness-6",
           "off": "mdi:brightness-3"
         }
-      },
-      "audio_output": {
-        "default": "mdi:audio-input-stereo-minijack"
-      }
-    },
-    "switch": {
-      "pre_amp": {
-        "default": "mdi:volume-high",
-        "state": {
-          "off": "mdi:volume-low"
-        }
-      },
-      "early_update": {
-        "default": "mdi:update"
       }
     }
   }
diff --git a/homeassistant/components/cambridge_audio/manifest.json b/homeassistant/components/cambridge_audio/manifest.json
index c359ca14a21..63671a6ad36 100644
--- a/homeassistant/components/cambridge_audio/manifest.json
+++ b/homeassistant/components/cambridge_audio/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["aiostreammagic"],
-  "requirements": ["aiostreammagic==2.8.5"],
+  "requirements": ["aiostreammagic==2.8.1"],
   "zeroconf": ["_stream-magic._tcp.local.", "_smoip._tcp.local."]
 }
diff --git a/homeassistant/components/cambridge_audio/media_player.py b/homeassistant/components/cambridge_audio/media_player.py
index 5e340cdd21e..1c490cd6ac9 100644
--- a/homeassistant/components/cambridge_audio/media_player.py
+++ b/homeassistant/components/cambridge_audio/media_player.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any
 
 from aiostreammagic import (
     RepeatMode as CambridgeRepeatMode,
@@ -22,22 +21,14 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import (
-    CAMBRIDGE_MEDIA_TYPE_AIRABLE,
-    CAMBRIDGE_MEDIA_TYPE_INTERNET_RADIO,
-    CAMBRIDGE_MEDIA_TYPE_PRESET,
-    DOMAIN,
-)
 from .entity import CambridgeAudioEntity, command
 
 BASE_FEATURES = (
     MediaPlayerEntityFeature.SELECT_SOURCE
     | MediaPlayerEntityFeature.TURN_OFF
     | MediaPlayerEntityFeature.TURN_ON
-    | MediaPlayerEntityFeature.PLAY_MEDIA
 )
 
 PREAMP_FEATURES = (
@@ -177,9 +168,12 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
         return volume / 100
 
     @property
-    def shuffle(self) -> bool:
+    def shuffle(self) -> bool | None:
         """Current shuffle configuration."""
-        return self.client.play_state.mode_shuffle != ShuffleMode.OFF
+        mode_shuffle = self.client.play_state.mode_shuffle
+        if not mode_shuffle:
+            return False
+        return mode_shuffle != ShuffleMode.OFF
 
     @property
     def repeat(self) -> RepeatMode | None:
@@ -291,48 +285,3 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
         if repeat in {RepeatMode.ALL, RepeatMode.ONE}:
             repeat_mode = CambridgeRepeatMode.ALL
         await self.client.set_repeat(repeat_mode)
-
-    @command
-    async def async_play_media(
-        self, media_type: MediaType | str, media_id: str, **kwargs: Any
-    ) -> None:
-        """Play media on the Cambridge Audio device."""
-
-        if media_type not in {
-            CAMBRIDGE_MEDIA_TYPE_PRESET,
-            CAMBRIDGE_MEDIA_TYPE_AIRABLE,
-            CAMBRIDGE_MEDIA_TYPE_INTERNET_RADIO,
-        }:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="unsupported_media_type",
-                translation_placeholders={"media_type": media_type},
-            )
-
-        if media_type == CAMBRIDGE_MEDIA_TYPE_PRESET:
-            try:
-                preset_id = int(media_id)
-            except ValueError as ve:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="preset_non_integer",
-                    translation_placeholders={"preset_id": media_id},
-                ) from ve
-            preset = None
-            for _preset in self.client.preset_list.presets:
-                if _preset.preset_id == preset_id:
-                    preset = _preset
-            if not preset:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="missing_preset",
-                    translation_placeholders={"preset_id": media_id},
-                )
-            await self.client.recall_preset(preset.preset_id)
-
-        if media_type == CAMBRIDGE_MEDIA_TYPE_AIRABLE:
-            preset_id = int(media_id)
-            await self.client.play_radio_airable("Radio", preset_id)
-
-        if media_type == CAMBRIDGE_MEDIA_TYPE_INTERNET_RADIO:
-            await self.client.play_radio_url("Radio", media_id)
diff --git a/homeassistant/components/cambridge_audio/select.py b/homeassistant/components/cambridge_audio/select.py
index c99abc853e5..d2d44ecfb92 100644
--- a/homeassistant/components/cambridge_audio/select.py
+++ b/homeassistant/components/cambridge_audio/select.py
@@ -1,7 +1,7 @@
 """Support for Cambridge Audio select entities."""
 
 from collections.abc import Awaitable, Callable
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 
 from aiostreammagic import StreamMagicClient
 from aiostreammagic.models import DisplayBrightness
@@ -19,61 +19,21 @@ from .entity import CambridgeAudioEntity
 class CambridgeAudioSelectEntityDescription(SelectEntityDescription):
     """Describes Cambridge Audio select entity."""
 
-    options_fn: Callable[[StreamMagicClient], list[str]] = field(default=lambda _: [])
-    load_fn: Callable[[StreamMagicClient], bool] = field(default=lambda _: True)
     value_fn: Callable[[StreamMagicClient], str | None]
     set_value_fn: Callable[[StreamMagicClient, str], Awaitable[None]]
 
 
-async def _audio_output_set_value_fn(client: StreamMagicClient, value: str) -> None:
-    """Set the audio output using the display name."""
-    audio_output_id = next(
-        (output.id for output in client.audio_output.outputs if value == output.name),
-        None,
-    )
-    assert audio_output_id is not None
-    await client.set_audio_output(audio_output_id)
-
-
-def _audio_output_value_fn(client: StreamMagicClient) -> str | None:
-    """Convert the current audio output id to name."""
-    return next(
-        (
-            output.name
-            for output in client.audio_output.outputs
-            if client.state.audio_output == output.id
-        ),
-        None,
-    )
-
-
 CONTROL_ENTITIES: tuple[CambridgeAudioSelectEntityDescription, ...] = (
     CambridgeAudioSelectEntityDescription(
         key="display_brightness",
         translation_key="display_brightness",
-        options=[
-            DisplayBrightness.BRIGHT.value,
-            DisplayBrightness.DIM.value,
-            DisplayBrightness.OFF.value,
-        ],
+        options=[x.value for x in DisplayBrightness],
         entity_category=EntityCategory.CONFIG,
-        load_fn=lambda client: client.display.brightness != DisplayBrightness.NONE,
         value_fn=lambda client: client.display.brightness,
         set_value_fn=lambda client, value: client.set_display_brightness(
             DisplayBrightness(value)
         ),
     ),
-    CambridgeAudioSelectEntityDescription(
-        key="audio_output",
-        translation_key="audio_output",
-        entity_category=EntityCategory.CONFIG,
-        options_fn=lambda client: [
-            output.name for output in client.audio_output.outputs
-        ],
-        load_fn=lambda client: len(client.audio_output.outputs) > 0,
-        value_fn=_audio_output_value_fn,
-        set_value_fn=_audio_output_set_value_fn,
-    ),
 )
 
 
@@ -86,9 +46,7 @@ async def async_setup_entry(
 
     client: StreamMagicClient = entry.runtime_data
     entities: list[CambridgeAudioSelect] = [
-        CambridgeAudioSelect(client, description)
-        for description in CONTROL_ENTITIES
-        if description.load_fn(client)
+        CambridgeAudioSelect(client, description) for description in CONTROL_ENTITIES
     ]
     async_add_entities(entities)
 
@@ -107,9 +65,6 @@ class CambridgeAudioSelect(CambridgeAudioEntity, SelectEntity):
         super().__init__(client)
         self.entity_description = description
         self._attr_unique_id = f"{client.info.unit_id}-{description.key}"
-        options_fn = description.options_fn(client)
-        if options_fn:
-            self._attr_options = options_fn
 
     @property
     def current_option(self) -> str | None:
diff --git a/homeassistant/components/cambridge_audio/strings.json b/homeassistant/components/cambridge_audio/strings.json
index c368ba060a7..3f7b2d39b3f 100644
--- a/homeassistant/components/cambridge_audio/strings.json
+++ b/homeassistant/components/cambridge_audio/strings.json
@@ -30,37 +30,9 @@
         "state": {
           "bright": "Bright",
           "dim": "Dim",
-          "off": "[%key:common::state::off%]"
+          "off": "Off"
         }
-      },
-      "audio_output": {
-        "name": "Audio output"
       }
-    },
-    "switch": {
-      "pre_amp": {
-        "name": "Pre-Amp"
-      },
-      "early_update": {
-        "name": "Early update"
-      }
-    }
-  },
-  "exceptions": {
-    "unsupported_media_type": {
-      "message": "Unsupported media type for Cambridge Audio device: {media_type}"
-    },
-    "missing_preset": {
-      "message": "Missing preset for media_id: {preset_id}"
-    },
-    "preset_non_integer": {
-      "message": "Preset must be an integer, got: {preset_id}"
-    },
-    "entry_cannot_connect": {
-      "message": "Error while connecting to {host}"
-    },
-    "command_error": {
-      "message": "Error executing {function_name} on entity {entity_id}"
     }
   }
 }
diff --git a/homeassistant/components/cambridge_audio/switch.py b/homeassistant/components/cambridge_audio/switch.py
deleted file mode 100644
index 3209b275d46..00000000000
--- a/homeassistant/components/cambridge_audio/switch.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""Support for Cambridge Audio switch entities."""
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import Any
-
-from aiostreammagic import StreamMagicClient
-
-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_platform import AddEntitiesCallback
-
-from .entity import CambridgeAudioEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class CambridgeAudioSwitchEntityDescription(SwitchEntityDescription):
-    """Describes Cambridge Audio switch entity."""
-
-    value_fn: Callable[[StreamMagicClient], bool]
-    set_value_fn: Callable[[StreamMagicClient, bool], Awaitable[None]]
-
-
-CONTROL_ENTITIES: tuple[CambridgeAudioSwitchEntityDescription, ...] = (
-    CambridgeAudioSwitchEntityDescription(
-        key="pre_amp",
-        translation_key="pre_amp",
-        entity_category=EntityCategory.CONFIG,
-        value_fn=lambda client: client.state.pre_amp_mode,
-        set_value_fn=lambda client, value: client.set_pre_amp_mode(value),
-    ),
-    CambridgeAudioSwitchEntityDescription(
-        key="early_update",
-        translation_key="early_update",
-        entity_category=EntityCategory.CONFIG,
-        value_fn=lambda client: client.update.early_update,
-        set_value_fn=lambda client, value: client.set_early_update(value),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Cambridge Audio switch entities based on a config entry."""
-    async_add_entities(
-        CambridgeAudioSwitch(entry.runtime_data, description)
-        for description in CONTROL_ENTITIES
-    )
-
-
-class CambridgeAudioSwitch(CambridgeAudioEntity, SwitchEntity):
-    """Defines a Cambridge Audio switch entity."""
-
-    entity_description: CambridgeAudioSwitchEntityDescription
-
-    def __init__(
-        self,
-        client: StreamMagicClient,
-        description: CambridgeAudioSwitchEntityDescription,
-    ) -> None:
-        """Initialize Cambridge Audio switch."""
-        super().__init__(client)
-        self.entity_description = description
-        self._attr_unique_id = f"{client.info.unit_id}-{description.key}"
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the switch."""
-        return self.entity_description.value_fn(self.client)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        await self.entity_description.set_value_fn(self.client, True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        await self.entity_description.set_value_fn(self.client, False)
diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index d31d21d424c..e943210fcd8 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -4,9 +4,9 @@ from __future__ import annotations
 
 import asyncio
 import collections
-from collections.abc import Awaitable, Callable, Coroutine
+from collections.abc import Awaitable, Callable
 from contextlib import suppress
-from dataclasses import asdict, dataclass
+from dataclasses import asdict
 from datetime import datetime, timedelta
 from enum import IntFlag
 from functools import partial
@@ -18,9 +18,8 @@ from typing import Any, Final, final
 
 from aiohttp import hdrs, web
 import attr
-from propcache import cached_property, under_cached_property
+from propcache import cached_property
 import voluptuous as vol
-from webrtc_models import RTCIceCandidate, RTCIceServer
 
 from homeassistant.components import websocket_api
 from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView
@@ -86,20 +85,13 @@ from .img_util import scale_jpeg_camera_image
 from .prefs import CameraPreferences, DynamicStreamSettings  # noqa: F401
 from .webrtc import (
     DATA_ICE_SERVERS,
-    CameraWebRTCLegacyProvider,
     CameraWebRTCProvider,
-    WebRTCAnswer,
-    WebRTCCandidate,  # noqa: F401
+    RTCIceServer,
     WebRTCClientConfiguration,
-    WebRTCError,
-    WebRTCMessage,  # noqa: F401
-    WebRTCSendMessage,
-    async_get_supported_legacy_provider,
-    async_get_supported_provider,
-    async_register_ice_servers,
+    async_get_supported_providers,
     async_register_rtsp_to_web_rtc_provider,  # noqa: F401
-    async_register_webrtc_provider,  # noqa: F401
-    async_register_ws,
+    register_ice_server,
+    ws_get_client_config,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -177,13 +169,6 @@ class Image:
     content: bytes = attr.ib()
 
 
-@dataclass(frozen=True)
-class CameraCapabilities:
-    """Camera capabilities."""
-
-    frontend_stream_types: set[StreamType]
-
-
 @bind_hass
 async def async_request_stream(hass: HomeAssistant, entity_id: str, fmt: str) -> str:
     """Request a stream for a camera entity."""
@@ -357,10 +342,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     hass.http.register_view(CameraMjpegStream(component))
 
     websocket_api.async_register_command(hass, ws_camera_stream)
+    websocket_api.async_register_command(hass, ws_camera_web_rtc_offer)
     websocket_api.async_register_command(hass, websocket_get_prefs)
     websocket_api.async_register_command(hass, websocket_update_prefs)
-    websocket_api.async_register_command(hass, ws_camera_capabilities)
-    async_register_ws(hass)
+    websocket_api.async_register_command(hass, ws_get_client_config)
 
     await component.async_setup(config)
 
@@ -416,20 +401,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         SERVICE_RECORD, CAMERA_SERVICE_RECORD, async_handle_record_service
     )
 
-    @callback
-    def get_ice_servers() -> list[RTCIceServer]:
-        if hass.config.webrtc.ice_servers:
-            return hass.config.webrtc.ice_servers
-        return [
-            RTCIceServer(
-                urls=[
-                    "stun:stun.home-assistant.io:80",
-                    "stun:stun.home-assistant.io:3478",
-                ]
-            ),
-        ]
+    async def get_ice_server() -> RTCIceServer:
+        return RTCIceServer(urls="stun:stun.home-assistant.io:3478")
 
-    async_register_ice_servers(hass, get_ice_servers)
+    register_ice_server(hass, get_ice_server)
     return True
 
 
@@ -476,11 +451,8 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
     _attr_state: None = None  # State is determined by is_on
     _attr_supported_features: CameraEntityFeature = CameraEntityFeature(0)
 
-    __supports_stream: CameraEntityFeature | None = None
-
     def __init__(self) -> None:
         """Initialize a camera."""
-        self._cache: dict[str, Any] = {}
         self.stream: Stream | None = None
         self.stream_options: dict[str, str | bool | float] = {}
         self.content_type: str = DEFAULT_CONTENT_TYPE
@@ -488,15 +460,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
         self._warned_old_signature = False
         self.async_update_token()
         self._create_stream_lock: asyncio.Lock | None = None
-        self._webrtc_provider: CameraWebRTCProvider | None = None
-        self._legacy_webrtc_provider: CameraWebRTCLegacyProvider | None = None
-        self._supports_native_sync_webrtc = (
-            type(self).async_handle_web_rtc_offer != Camera.async_handle_web_rtc_offer
-        )
-        self._supports_native_async_webrtc = (
-            type(self).async_handle_async_webrtc_offer
-            != Camera.async_handle_async_webrtc_offer
-        )
+        self._webrtc_providers: list[CameraWebRTCProvider] = []
 
     @cached_property
     def entity_picture(self) -> str:
@@ -570,7 +534,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
             return self._attr_frontend_stream_type
         if CameraEntityFeature.STREAM not in self.supported_features_compat:
             return None
-        if self._webrtc_provider or self._legacy_webrtc_provider:
+        if self._webrtc_providers:
             return StreamType.WEB_RTC
         return StreamType.HLS
 
@@ -620,66 +584,12 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
 
         Integrations can override with a native WebRTC implementation.
         """
-
-    async def async_handle_async_webrtc_offer(
-        self, offer_sdp: str, session_id: str, send_message: WebRTCSendMessage
-    ) -> None:
-        """Handle the async WebRTC offer.
-
-        Async means that it could take some time to process the offer and responses/message
-        will be sent with the send_message callback.
-        This method is used by cameras with CameraEntityFeature.STREAM and StreamType.WEB_RTC.
-        An integration overriding this method must also implement async_on_webrtc_candidate.
-
-        Integrations can override with a native WebRTC implementation.
-        """
-        if self._supports_native_sync_webrtc:
-            try:
-                answer = await self.async_handle_web_rtc_offer(offer_sdp)
-            except ValueError as ex:
-                _LOGGER.error("Error handling WebRTC offer: %s", ex)
-                send_message(
-                    WebRTCError(
-                        "webrtc_offer_failed",
-                        str(ex),
-                    )
-                )
-            except TimeoutError:
-                # This catch was already here and should stay through the deprecation
-                _LOGGER.error("Timeout handling WebRTC offer")
-                send_message(
-                    WebRTCError(
-                        "webrtc_offer_failed",
-                        "Timeout handling WebRTC offer",
-                    )
-                )
-            else:
-                if answer:
-                    send_message(WebRTCAnswer(answer))
-                else:
-                    _LOGGER.error("Error handling WebRTC offer: No answer")
-                    send_message(
-                        WebRTCError(
-                            "webrtc_offer_failed",
-                            "No answer on WebRTC offer",
-                        )
-                    )
-                return
-
-        if self._webrtc_provider:
-            await self._webrtc_provider.async_handle_async_webrtc_offer(
-                self, offer_sdp, session_id, send_message
-            )
-            return
-
-        if self._legacy_webrtc_provider and (
-            answer := await self._legacy_webrtc_provider.async_handle_web_rtc_offer(
-                self, offer_sdp
-            )
-        ):
-            send_message(WebRTCAnswer(answer))
-        else:
-            raise HomeAssistantError("Camera does not support WebRTC")
+        for provider in self._webrtc_providers:
+            if answer := await provider.async_handle_web_rtc_offer(self, offer_sdp):
+                return answer
+        raise HomeAssistantError(
+            "WebRTC offer was not accepted by the supported providers"
+        )
 
     def camera_image(
         self, width: int | None = None, height: int | None = None
@@ -789,133 +699,55 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
     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()
-        self.__supports_stream = (
-            self.supported_features_compat & CameraEntityFeature.STREAM
-        )
-        await self.async_refresh_providers(write_state=False)
+        # 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._webrtc_providers = await self._async_get_supported_webrtc_providers()
 
-    async def async_refresh_providers(self, *, write_state: bool = True) -> None:
+    async def async_refresh_providers(self) -> None:
         """Determine if any of the registered providers are suitable for this entity.
 
         This affects state attributes, so it should be invoked any time the registered
         providers or inputs to the state attributes change.
+
+        Returns True if any state was updated (and needs to be written)
         """
-        old_provider = self._webrtc_provider
-        old_legacy_provider = self._legacy_webrtc_provider
-        new_provider = None
-        new_legacy_provider = None
+        old_providers = self._webrtc_providers
+        new_providers = await self._async_get_supported_webrtc_providers()
+        self._webrtc_providers = new_providers
+        if old_providers != new_providers:
+            self.async_write_ha_state()
 
-        # Skip all providers if the camera has a native WebRTC implementation
-        if not (
-            self._supports_native_sync_webrtc or self._supports_native_async_webrtc
-        ):
-            # Camera doesn't have a native WebRTC implementation
-            new_provider = await self._async_get_supported_webrtc_provider(
-                async_get_supported_provider
-            )
-
-            if new_provider is None:
-                # Only add the legacy provider if the new provider is not available
-                new_legacy_provider = await self._async_get_supported_webrtc_provider(
-                    async_get_supported_legacy_provider
-                )
-
-        if old_provider != new_provider or old_legacy_provider != new_legacy_provider:
-            self._webrtc_provider = new_provider
-            self._legacy_webrtc_provider = new_legacy_provider
-            self._invalidate_camera_capabilities_cache()
-            if write_state:
-                self.async_write_ha_state()
-
-    async def _async_get_supported_webrtc_provider[_T](
-        self, fn: Callable[[HomeAssistant, Camera], Coroutine[None, None, _T | None]]
-    ) -> _T | None:
-        """Get first provider that supports this camera."""
+    async def _async_get_supported_webrtc_providers(
+        self,
+    ) -> list[CameraWebRTCProvider]:
+        """Get the all providers that supports this camera."""
         if CameraEntityFeature.STREAM not in self.supported_features_compat:
-            return None
+            return []
 
-        return await fn(self.hass, self)
+        return await async_get_supported_providers(self.hass, self)
 
-    @callback
-    def _async_get_webrtc_client_configuration(self) -> WebRTCClientConfiguration:
+    @property
+    def webrtc_providers(self) -> list[CameraWebRTCProvider]:
+        """Return the WebRTC providers."""
+        return self._webrtc_providers
+
+    async def _async_get_webrtc_client_configuration(self) -> WebRTCClientConfiguration:
         """Return the WebRTC client configuration adjustable per integration."""
         return WebRTCClientConfiguration()
 
     @final
-    @callback
-    def async_get_webrtc_client_configuration(self) -> WebRTCClientConfiguration:
+    async def async_get_webrtc_client_configuration(self) -> WebRTCClientConfiguration:
         """Return the WebRTC client configuration and extend it with the registered ice servers."""
-        config = self._async_get_webrtc_client_configuration()
+        config = await self._async_get_webrtc_client_configuration()
 
-        if not self._supports_native_sync_webrtc:
-            # Until 2024.11, the frontend was not resolving any ice servers
-            # The async approach was added 2024.11 and new integrations need to use it
-            ice_servers = [
-                server
-                for servers in self.hass.data.get(DATA_ICE_SERVERS, [])
-                for server in servers()
-            ]
-            config.configuration.ice_servers.extend(ice_servers)
-
-        config.get_candidates_upfront = (
-            self._supports_native_sync_webrtc
-            or self._legacy_webrtc_provider is not None
+        ice_servers = await asyncio.gather(
+            *[server() for server in self.hass.data.get(DATA_ICE_SERVERS, [])]
         )
+        config.configuration.ice_servers.extend(ice_servers)
 
         return config
 
-    async def async_on_webrtc_candidate(
-        self, session_id: str, candidate: RTCIceCandidate
-    ) -> None:
-        """Handle a WebRTC candidate."""
-        if self._webrtc_provider:
-            await self._webrtc_provider.async_on_webrtc_candidate(session_id, candidate)
-        else:
-            raise HomeAssistantError("Cannot handle WebRTC candidate")
-
-    @callback
-    def close_webrtc_session(self, session_id: str) -> None:
-        """Close a WebRTC session."""
-        if self._webrtc_provider:
-            self._webrtc_provider.async_close_session(session_id)
-
-    @callback
-    def _invalidate_camera_capabilities_cache(self) -> None:
-        """Invalidate the camera capabilities cache."""
-        self._cache.pop("camera_capabilities", None)
-
-    @final
-    @under_cached_property
-    def camera_capabilities(self) -> CameraCapabilities:
-        """Return the camera capabilities."""
-        frontend_stream_types = set()
-        if CameraEntityFeature.STREAM in self.supported_features_compat:
-            if self._supports_native_sync_webrtc or self._supports_native_async_webrtc:
-                # The camera has a native WebRTC implementation
-                frontend_stream_types.add(StreamType.WEB_RTC)
-            else:
-                frontend_stream_types.add(StreamType.HLS)
-
-                if self._webrtc_provider:
-                    frontend_stream_types.add(StreamType.WEB_RTC)
-
-        return CameraCapabilities(frontend_stream_types)
-
-    @callback
-    def async_write_ha_state(self) -> None:
-        """Write the state to the state machine.
-
-        Schedules async_refresh_providers if support of streams have changed.
-        """
-        super().async_write_ha_state()
-        if self.__supports_stream != (
-            supports_stream := self.supported_features_compat
-            & CameraEntityFeature.STREAM
-        ):
-            self.__supports_stream = supports_stream
-            self._invalidate_camera_capabilities_cache()
-            self.hass.async_create_task(self.async_refresh_providers())
-
 
 class CameraView(HomeAssistantView):
     """Base CameraView."""
@@ -1006,24 +838,6 @@ class CameraMjpegStream(CameraView):
             raise web.HTTPBadRequest from err
 
 
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "camera/capabilities",
-        vol.Required("entity_id"): cv.entity_id,
-    }
-)
-@websocket_api.async_response
-async def ws_camera_capabilities(
-    hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
-) -> None:
-    """Handle get camera capabilities websocket command.
-
-    Async friendly.
-    """
-    camera = get_camera_from_entity_id(hass, msg["entity_id"])
-    connection.send_result(msg["id"], asdict(camera.camera_capabilities))
-
-
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "camera/stream",
@@ -1054,6 +868,53 @@ async def ws_camera_stream(
         )
 
 
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "camera/web_rtc_offer",
+        vol.Required("entity_id"): cv.entity_id,
+        vol.Required("offer"): str,
+    }
+)
+@websocket_api.async_response
+async def ws_camera_web_rtc_offer(
+    hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Handle the signal path for a WebRTC stream.
+
+    This signal path is used to route the offer created by the client to the
+    camera device through the integration for negotiation on initial setup,
+    which returns an answer. The actual streaming is handled entirely between
+    the client and camera device.
+
+    Async friendly.
+    """
+    entity_id = msg["entity_id"]
+    offer = msg["offer"]
+    camera = get_camera_from_entity_id(hass, entity_id)
+    if camera.frontend_stream_type != StreamType.WEB_RTC:
+        connection.send_error(
+            msg["id"],
+            "web_rtc_offer_failed",
+            (
+                "Camera does not support WebRTC,"
+                f" frontend_stream_type={camera.frontend_stream_type}"
+            ),
+        )
+        return
+    try:
+        answer = await camera.async_handle_web_rtc_offer(offer)
+    except (HomeAssistantError, ValueError) as ex:
+        _LOGGER.error("Error handling WebRTC offer: %s", ex)
+        connection.send_error(msg["id"], "web_rtc_offer_failed", str(ex))
+    except TimeoutError:
+        _LOGGER.error("Timeout handling WebRTC offer")
+        connection.send_error(
+            msg["id"], "web_rtc_offer_failed", "Timeout handling WebRTC offer"
+        )
+    else:
+        connection.send_result(msg["id"], {"answer": answer})
+
+
 @websocket_api.websocket_command(
     {vol.Required("type"): "camera/get_prefs", vol.Required("entity_id"): cv.entity_id}
 )
diff --git a/homeassistant/components/camera/strings.json b/homeassistant/components/camera/strings.json
index 4a7e9aafc6e..9176c5ad84a 100644
--- a/homeassistant/components/camera/strings.json
+++ b/homeassistant/components/camera/strings.json
@@ -46,10 +46,6 @@
           }
         }
       }
-    },
-    "legacy_webrtc_provider": {
-      "title": "Detected use of legacy WebRTC provider registered by {legacy_integration}",
-      "description": "The {legacy_integration} integration has registered a legacy WebRTC provider. Home Assistant prefers using the built-in modern WebRTC provider registered by the {builtin_integration} integration.\n\nBenefits of the built-in integration are:\n\n- The camera stream is started faster.\n- More camera devices are supported.\n\nTo fix this issue, you can either keep using the built-in modern WebRTC provider and remove the {legacy_integration} integration or remove the {builtin_integration} integration to use the legacy provider, and then restart Home Assistant."
     }
   },
   "services": {
diff --git a/homeassistant/components/camera/webrtc.py b/homeassistant/components/camera/webrtc.py
index d627a888169..fb9f05b58da 100644
--- a/homeassistant/components/camera/webrtc.py
+++ b/homeassistant/components/camera/webrtc.py
@@ -2,23 +2,17 @@
 
 from __future__ import annotations
 
-from abc import ABC, abstractmethod
 import asyncio
-from collections.abc import Awaitable, Callable, Iterable
-from dataclasses import asdict, dataclass, field
-from functools import cache, partial, wraps
-import logging
+from collections.abc import Awaitable, Callable, Coroutine
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Protocol
 
 import voluptuous as vol
-from webrtc_models import RTCConfiguration, RTCIceCandidate, RTCIceServer
 
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv, issue_registry as ir
+from homeassistant.helpers import config_validation as cv
 from homeassistant.util.hass_dict import HassKey
-from homeassistant.util.ulid import ulid
 
 from .const import DATA_COMPONENT, DOMAIN, StreamType
 from .helper import get_camera_from_entity_id
@@ -26,79 +20,58 @@ from .helper import get_camera_from_entity_id
 if TYPE_CHECKING:
     from . import Camera
 
-_LOGGER = logging.getLogger(__name__)
-
 
 DATA_WEBRTC_PROVIDERS: HassKey[set[CameraWebRTCProvider]] = HassKey(
-    "camera_webrtc_providers"
+    "camera_web_rtc_providers"
 )
-DATA_WEBRTC_LEGACY_PROVIDERS: HassKey[dict[str, CameraWebRTCLegacyProvider]] = HassKey(
-    "camera_webrtc_legacy_providers"
-)
-DATA_ICE_SERVERS: HassKey[list[Callable[[], Iterable[RTCIceServer]]]] = HassKey(
-    "camera_webrtc_ice_servers"
+DATA_ICE_SERVERS: HassKey[list[Callable[[], Coroutine[Any, Any, RTCIceServer]]]] = (
+    HassKey("camera_web_rtc_ice_servers")
 )
 
 
-_WEBRTC = "WebRTC"
+@dataclass
+class RTCIceServer:
+    """RTC Ice Server.
 
+    See https://www.w3.org/TR/webrtc/#rtciceserver-dictionary
+    """
 
-@dataclass(frozen=True)
-class WebRTCMessage:
-    """Base class for WebRTC messages."""
+    urls: list[str] | str
+    username: str | None = None
+    credential: str | None = None
 
-    @classmethod
-    @cache
-    def _get_type(cls) -> str:
-        _, _, name = cls.__name__.partition(_WEBRTC)
-        return name.lower()
+    def to_frontend_dict(self) -> dict[str, Any]:
+        """Return a dict that can be used by the frontend."""
 
-    def as_dict(self) -> dict[str, Any]:
-        """Return a dict representation of the message."""
-        data = asdict(self)
-        data["type"] = self._get_type()
+        data = {
+            "urls": self.urls,
+        }
+        if self.username is not None:
+            data["username"] = self.username
+        if self.credential is not None:
+            data["credential"] = self.credential
         return data
 
 
-@dataclass(frozen=True)
-class WebRTCSession(WebRTCMessage):
-    """WebRTC session."""
+@dataclass
+class RTCConfiguration:
+    """RTC Configuration.
 
-    session_id: str
+    See https://www.w3.org/TR/webrtc/#rtcconfiguration-dictionary
+    """
 
+    ice_servers: list[RTCIceServer] = field(default_factory=list)
 
-@dataclass(frozen=True)
-class WebRTCAnswer(WebRTCMessage):
-    """WebRTC answer."""
+    def to_frontend_dict(self) -> dict[str, Any]:
+        """Return a dict that can be used by the frontend."""
+        if not self.ice_servers:
+            return {}
 
-    answer: str
-
-
-@dataclass(frozen=True)
-class WebRTCCandidate(WebRTCMessage):
-    """WebRTC candidate."""
-
-    candidate: RTCIceCandidate
-
-    def as_dict(self) -> dict[str, Any]:
-        """Return a dict representation of the message."""
         return {
-            "type": self._get_type(),
-            "candidate": self.candidate.candidate,
+            "iceServers": [server.to_frontend_dict() for server in self.ice_servers]
         }
 
 
-@dataclass(frozen=True)
-class WebRTCError(WebRTCMessage):
-    """WebRTC error."""
-
-    code: str
-    message: str
-
-
-type WebRTCSendMessage = Callable[[WebRTCMessage], None]
-
-
 @dataclass(kw_only=True)
 class WebRTCClientConfiguration:
     """WebRTC configuration for the client.
@@ -108,55 +81,18 @@ class WebRTCClientConfiguration:
 
     configuration: RTCConfiguration = field(default_factory=RTCConfiguration)
     data_channel: str | None = None
-    get_candidates_upfront: bool = False
 
     def to_frontend_dict(self) -> dict[str, Any]:
         """Return a dict that can be used by the frontend."""
         data: dict[str, Any] = {
-            "configuration": self.configuration.to_dict(),
-            "getCandidatesUpfront": self.get_candidates_upfront,
+            "configuration": self.configuration.to_frontend_dict(),
         }
         if self.data_channel is not None:
             data["dataChannel"] = self.data_channel
         return data
 
 
-class CameraWebRTCProvider(ABC):
-    """WebRTC provider."""
-
-    @property
-    @abstractmethod
-    def domain(self) -> str:
-        """Return the integration domain of the provider."""
-
-    @callback
-    @abstractmethod
-    def async_is_supported(self, stream_source: str) -> bool:
-        """Determine if the provider supports the stream source."""
-
-    @abstractmethod
-    async def async_handle_async_webrtc_offer(
-        self,
-        camera: Camera,
-        offer_sdp: str,
-        session_id: str,
-        send_message: WebRTCSendMessage,
-    ) -> None:
-        """Handle the WebRTC offer and return the answer via the provided callback."""
-
-    @abstractmethod
-    async def async_on_webrtc_candidate(
-        self, session_id: str, candidate: RTCIceCandidate
-    ) -> None:
-        """Handle the WebRTC candidate."""
-
-    @callback
-    def async_close_session(self, session_id: str) -> None:
-        """Close the session."""
-        return  ## This is an optional method so we need a default here.
-
-
-class CameraWebRTCLegacyProvider(Protocol):
+class CameraWebRTCProvider(Protocol):
     """WebRTC provider."""
 
     async def async_is_supported(self, stream_source: str) -> bool:
@@ -168,7 +104,6 @@ class CameraWebRTCLegacyProvider(Protocol):
         """Handle the WebRTC offer and return an answer."""
 
 
-@callback
 def async_register_webrtc_provider(
     hass: HomeAssistant,
     provider: CameraWebRTCProvider,
@@ -180,7 +115,9 @@ def async_register_webrtc_provider(
     if DOMAIN not in hass.data:
         raise ValueError("Unexpected state, camera not loaded")
 
-    providers = hass.data.setdefault(DATA_WEBRTC_PROVIDERS, set())
+    providers: set[CameraWebRTCProvider] = hass.data.setdefault(
+        DATA_WEBRTC_PROVIDERS, set()
+    )
 
     @callback
     def remove_provider() -> None:
@@ -197,7 +134,6 @@ def async_register_webrtc_provider(
 
 async def _async_refresh_providers(hass: HomeAssistant) -> None:
     """Check all cameras for any state changes for registered providers."""
-    _async_check_conflicting_legacy_provider(hass)
 
     component = hass.data[DATA_COMPONENT]
     await asyncio.gather(
@@ -205,103 +141,6 @@ async def _async_refresh_providers(hass: HomeAssistant) -> None:
     )
 
 
-type WsCommandWithCamera = Callable[
-    [websocket_api.ActiveConnection, dict[str, Any], Camera],
-    Awaitable[None],
-]
-
-
-def require_webrtc_support(
-    error_code: str,
-) -> Callable[[WsCommandWithCamera], websocket_api.AsyncWebSocketCommandHandler]:
-    """Validate that the camera supports WebRTC."""
-
-    def decorate(
-        func: WsCommandWithCamera,
-    ) -> websocket_api.AsyncWebSocketCommandHandler:
-        """Decorate func."""
-
-        @wraps(func)
-        async def validate(
-            hass: HomeAssistant,
-            connection: websocket_api.ActiveConnection,
-            msg: dict[str, Any],
-        ) -> None:
-            """Validate that the camera supports WebRTC."""
-            entity_id = msg["entity_id"]
-            camera = get_camera_from_entity_id(hass, entity_id)
-            if camera.frontend_stream_type != StreamType.WEB_RTC:
-                connection.send_error(
-                    msg["id"],
-                    error_code,
-                    (
-                        "Camera does not support WebRTC,"
-                        f" frontend_stream_type={camera.frontend_stream_type}"
-                    ),
-                )
-                return
-
-            await func(connection, msg, camera)
-
-        return validate
-
-    return decorate
-
-
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "camera/webrtc/offer",
-        vol.Required("entity_id"): cv.entity_id,
-        vol.Required("offer"): str,
-    }
-)
-@websocket_api.async_response
-@require_webrtc_support("webrtc_offer_failed")
-async def ws_webrtc_offer(
-    connection: websocket_api.ActiveConnection, msg: dict[str, Any], camera: Camera
-) -> None:
-    """Handle the signal path for a WebRTC stream.
-
-    This signal path is used to route the offer created by the client to the
-    camera device through the integration for negotiation on initial setup.
-    The ws endpoint returns a subscription id, where ice candidates and the
-    final answer will be returned.
-    The actual streaming is handled entirely between the client and camera device.
-
-    Async friendly.
-    """
-    offer = msg["offer"]
-    session_id = ulid()
-    connection.subscriptions[msg["id"]] = partial(
-        camera.close_webrtc_session, session_id
-    )
-
-    connection.send_message(websocket_api.result_message(msg["id"]))
-
-    @callback
-    def send_message(message: WebRTCMessage) -> None:
-        """Push a value to websocket."""
-        connection.send_message(
-            websocket_api.event_message(
-                msg["id"],
-                message.as_dict(),
-            )
-        )
-
-    send_message(WebRTCSession(session_id))
-
-    try:
-        await camera.async_handle_async_webrtc_offer(offer, session_id, send_message)
-    except HomeAssistantError as ex:
-        _LOGGER.error("Error handling WebRTC offer: %s", ex)
-        send_message(
-            WebRTCError(
-                "webrtc_offer_failed",
-                str(ex),
-            )
-        )
-
-
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "camera/webrtc/get_client_config",
@@ -309,81 +148,49 @@ async def ws_webrtc_offer(
     }
 )
 @websocket_api.async_response
-@require_webrtc_support("webrtc_get_client_config_failed")
 async def ws_get_client_config(
-    connection: websocket_api.ActiveConnection, msg: dict[str, Any], camera: Camera
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle get WebRTC client config websocket command."""
-    config = camera.async_get_webrtc_client_configuration().to_frontend_dict()
+    entity_id = msg["entity_id"]
+    camera = get_camera_from_entity_id(hass, entity_id)
+    if camera.frontend_stream_type != StreamType.WEB_RTC:
+        connection.send_error(
+            msg["id"],
+            "web_rtc_offer_failed",
+            (
+                "Camera does not support WebRTC,"
+                f" frontend_stream_type={camera.frontend_stream_type}"
+            ),
+        )
+        return
+
+    config = (await camera.async_get_webrtc_client_configuration()).to_frontend_dict()
     connection.send_result(
         msg["id"],
         config,
     )
 
 
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "camera/webrtc/candidate",
-        vol.Required("entity_id"): cv.entity_id,
-        vol.Required("session_id"): str,
-        vol.Required("candidate"): str,
-    }
-)
-@websocket_api.async_response
-@require_webrtc_support("webrtc_candidate_failed")
-async def ws_candidate(
-    connection: websocket_api.ActiveConnection, msg: dict[str, Any], camera: Camera
-) -> None:
-    """Handle WebRTC candidate websocket command."""
-    await camera.async_on_webrtc_candidate(
-        msg["session_id"], RTCIceCandidate(msg["candidate"])
-    )
-    connection.send_message(websocket_api.result_message(msg["id"]))
-
-
-@callback
-def async_register_ws(hass: HomeAssistant) -> None:
-    """Register camera webrtc ws endpoints."""
-
-    websocket_api.async_register_command(hass, ws_webrtc_offer)
-    websocket_api.async_register_command(hass, ws_get_client_config)
-    websocket_api.async_register_command(hass, ws_candidate)
-
-
-async def async_get_supported_provider(
+async def async_get_supported_providers(
     hass: HomeAssistant, camera: Camera
-) -> CameraWebRTCProvider | None:
-    """Return the first supported provider for the camera."""
+) -> list[CameraWebRTCProvider]:
+    """Return a list of supported providers for the camera."""
     providers = hass.data.get(DATA_WEBRTC_PROVIDERS)
     if not providers or not (stream_source := await camera.stream_source()):
-        return None
+        return []
 
-    for provider in providers:
-        if provider.async_is_supported(stream_source):
-            return provider
-
-    return None
-
-
-async def async_get_supported_legacy_provider(
-    hass: HomeAssistant, camera: Camera
-) -> CameraWebRTCLegacyProvider | None:
-    """Return the first supported provider for the camera."""
-    providers = hass.data.get(DATA_WEBRTC_LEGACY_PROVIDERS)
-    if not providers or not (stream_source := await camera.stream_source()):
-        return None
-
-    for provider in providers.values():
-        if await provider.async_is_supported(stream_source):
-            return provider
-
-    return None
+    return [
+        provider
+        for provider in providers
+        if await provider.async_is_supported(stream_source)
+    ]
 
 
 @callback
-def async_register_ice_servers(
+def register_ice_server(
     hass: HomeAssistant,
-    get_ice_server_fn: Callable[[], Iterable[RTCIceServer]],
+    get_ice_server_fn: Callable[[], Coroutine[Any, Any, RTCIceServer]],
 ) -> Callable[[], None]:
     """Register a ICE server.
 
@@ -412,7 +219,7 @@ _RTSP_PREFIXES = {"rtsp://", "rtsps://", "rtmp://"}
 type RtspToWebRtcProviderType = Callable[[str, str, str], Awaitable[str | None]]
 
 
-class _CameraRtspToWebRTCProvider(CameraWebRTCLegacyProvider):
+class _CameraRtspToWebRTCProvider(CameraWebRTCProvider):
     def __init__(self, fn: RtspToWebRtcProviderType) -> None:
         """Initialize the RTSP to WebRTC provider."""
         self._fn = fn
@@ -440,49 +247,5 @@ def async_register_rtsp_to_web_rtc_provider(
 
     The first provider to satisfy the offer will be used.
     """
-    if DOMAIN not in hass.data:
-        raise ValueError("Unexpected state, camera not loaded")
-
-    legacy_providers = hass.data.setdefault(DATA_WEBRTC_LEGACY_PROVIDERS, {})
-
-    if domain in legacy_providers:
-        raise ValueError("Provider already registered")
-
     provider_instance = _CameraRtspToWebRTCProvider(provider)
-
-    @callback
-    def remove_provider() -> None:
-        legacy_providers.pop(domain)
-        hass.async_create_task(_async_refresh_providers(hass))
-
-    legacy_providers[domain] = provider_instance
-    hass.async_create_task(_async_refresh_providers(hass))
-
-    return remove_provider
-
-
-@callback
-def _async_check_conflicting_legacy_provider(hass: HomeAssistant) -> None:
-    """Check if a legacy provider is registered together with the builtin provider."""
-    builtin_provider_domain = "go2rtc"
-    if (
-        (legacy_providers := hass.data.get(DATA_WEBRTC_LEGACY_PROVIDERS))
-        and (providers := hass.data.get(DATA_WEBRTC_PROVIDERS))
-        and any(provider.domain == builtin_provider_domain for provider in providers)
-    ):
-        for domain in legacy_providers:
-            ir.async_create_issue(
-                hass,
-                DOMAIN,
-                f"legacy_webrtc_provider_{domain}",
-                is_fixable=False,
-                is_persistent=False,
-                issue_domain=domain,
-                learn_more_url="https://www.home-assistant.io/integrations/go2rtc/",
-                severity=ir.IssueSeverity.WARNING,
-                translation_key="legacy_webrtc_provider",
-                translation_placeholders={
-                    "legacy_integration": domain,
-                    "builtin_integration": builtin_provider_domain,
-                },
-            )
+    return async_register_webrtc_provider(hass, provider_instance)
diff --git a/homeassistant/components/canary/alarm_control_panel.py b/homeassistant/components/canary/alarm_control_panel.py
index 69600e4bbc7..a7d5dc8ab98 100644
--- a/homeassistant/components/canary/alarm_control_panel.py
+++ b/homeassistant/components/canary/alarm_control_panel.py
@@ -10,9 +10,14 @@ from canary.model import Location
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -65,18 +70,18 @@ class CanaryAlarm(
         return self.coordinator.data["locations"][self._location_id]
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         if self.location.is_private:
-            return AlarmControlPanelState.DISARMED
+            return STATE_ALARM_DISARMED
 
         mode = self.location.mode
         if mode.name == LOCATION_MODE_AWAY:
-            return AlarmControlPanelState.ARMED_AWAY
+            return STATE_ALARM_ARMED_AWAY
         if mode.name == LOCATION_MODE_HOME:
-            return AlarmControlPanelState.ARMED_HOME
+            return STATE_ALARM_ARMED_HOME
         if mode.name == LOCATION_MODE_NIGHT:
-            return AlarmControlPanelState.ARMED_NIGHT
+            return STATE_ALARM_ARMED_NIGHT
 
         return None
 
diff --git a/homeassistant/components/canary/config_flow.py b/homeassistant/components/canary/config_flow.py
index 2dd3a678b5d..5af7142af8f 100644
--- a/homeassistant/components/canary/config_flow.py
+++ b/homeassistant/components/canary/config_flow.py
@@ -52,7 +52,7 @@ class CanaryConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return CanaryOptionsFlowHandler()
+        return CanaryOptionsFlowHandler(config_entry)
 
     async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
         """Handle a flow initiated by configuration file."""
@@ -104,6 +104,10 @@ class CanaryConfigFlow(ConfigFlow, domain=DOMAIN):
 class CanaryOptionsFlowHandler(OptionsFlow):
     """Handle Canary client options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/cast/config_flow.py b/homeassistant/components/cast/config_flow.py
index 03a3f2ea1f8..0ebfa553f62 100644
--- a/homeassistant/components/cast/config_flow.py
+++ b/homeassistant/components/cast/config_flow.py
@@ -41,7 +41,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> CastOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return CastOptionsFlowHandler()
+        return CastOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -109,8 +109,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
 class CastOptionsFlowHandler(OptionsFlow):
     """Handle Google Cast options."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize Google Cast options flow."""
+        self.config_entry = config_entry
         self.updated_config: dict[str, Any] = {}
 
     async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
diff --git a/homeassistant/components/cast/manifest.json b/homeassistant/components/cast/manifest.json
index 0650f267544..fbca632c671 100644
--- a/homeassistant/components/cast/manifest.json
+++ b/homeassistant/components/cast/manifest.json
@@ -14,7 +14,7 @@
   "documentation": "https://www.home-assistant.io/integrations/cast",
   "iot_class": "local_polling",
   "loggers": ["casttube", "pychromecast"],
-  "requirements": ["PyChromecast==14.0.5"],
+  "requirements": ["PyChromecast==14.0.4"],
   "single_config_entry": true,
   "zeroconf": ["_googlecast._tcp.local."]
 }
diff --git a/homeassistant/components/cloud/client.py b/homeassistant/components/cloud/client.py
index ee46fa42125..01c8de77156 100644
--- a/homeassistant/components/cloud/client.py
+++ b/homeassistant/components/cloud/client.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Callable
 from datetime import datetime
 from http import HTTPStatus
 import logging
@@ -12,14 +11,12 @@ from typing import Any, Literal
 
 import aiohttp
 from hass_nabucasa.client import CloudClient as Interface, RemoteActivationNotAllowed
-from webrtc_models import RTCIceServer
 
 from homeassistant.components import google_assistant, persistent_notification, webhook
 from homeassistant.components.alexa import (
     errors as alexa_errors,
     smart_home as alexa_smart_home,
 )
-from homeassistant.components.camera.webrtc import async_register_ice_servers
 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
@@ -30,7 +27,7 @@ from homeassistant.helpers.issue_registry import IssueSeverity, async_create_iss
 from homeassistant.util.aiohttp import MockRequest, serialize_response
 
 from . import alexa_config, google_config
-from .const import DISPATCHER_REMOTE_UPDATE, DOMAIN, PREF_ENABLE_CLOUD_ICE_SERVERS
+from .const import DISPATCHER_REMOTE_UPDATE, DOMAIN
 from .prefs import CloudPreferences
 
 _LOGGER = logging.getLogger(__name__)
@@ -63,7 +60,6 @@ class CloudClient(Interface):
         self._alexa_config_init_lock = asyncio.Lock()
         self._google_config_init_lock = asyncio.Lock()
         self._relayer_region: str | None = None
-        self._cloud_ice_servers_listener: Callable[[], None] | None = None
 
     @property
     def base_path(self) -> Path:
@@ -191,49 +187,6 @@ class CloudClient(Interface):
             if is_new_user:
                 await gconf.async_sync_entities(gconf.agent_user_id)
 
-        async def setup_cloud_ice_servers(_: datetime) -> None:
-            async def register_cloud_ice_server(
-                ice_servers: list[RTCIceServer],
-            ) -> Callable[[], None]:
-                """Register cloud ice server."""
-
-                def get_ice_servers() -> list[RTCIceServer]:
-                    return ice_servers
-
-                return async_register_ice_servers(self._hass, get_ice_servers)
-
-            async def async_register_cloud_ice_servers_listener(
-                prefs: CloudPreferences,
-            ) -> None:
-                is_cloud_ice_servers_enabled = (
-                    self.cloud.is_logged_in
-                    and not self.cloud.subscription_expired
-                    and prefs.cloud_ice_servers_enabled
-                )
-                if is_cloud_ice_servers_enabled:
-                    if self._cloud_ice_servers_listener is None:
-                        self._cloud_ice_servers_listener = await self.cloud.ice_servers.async_register_ice_servers_listener(
-                            register_cloud_ice_server
-                        )
-                elif self._cloud_ice_servers_listener:
-                    self._cloud_ice_servers_listener()
-                    self._cloud_ice_servers_listener = None
-
-            async def async_prefs_updated(prefs: CloudPreferences) -> None:
-                updated_prefs = prefs.last_updated
-
-                if (
-                    updated_prefs is None
-                    or PREF_ENABLE_CLOUD_ICE_SERVERS not in updated_prefs
-                ):
-                    return
-
-                await async_register_cloud_ice_servers_listener(prefs)
-
-            await async_register_cloud_ice_servers_listener(self._prefs)
-
-            self._prefs.async_listen_updates(async_prefs_updated)
-
         tasks = []
 
         if self._prefs.alexa_enabled and self._prefs.alexa_report_state:
@@ -242,8 +195,6 @@ class CloudClient(Interface):
         if self._prefs.google_enabled:
             tasks.append(enable_google)
 
-        tasks.append(setup_cloud_ice_servers)
-
         if tasks:
             await asyncio.gather(*(task(None) for task in tasks))
 
@@ -271,10 +222,6 @@ class CloudClient(Interface):
             self._google_config.async_deinitialize()
         self._google_config = None
 
-        if self._cloud_ice_servers_listener:
-            self._cloud_ice_servers_listener()
-            self._cloud_ice_servers_listener = None
-
     @callback
     def user_message(self, identifier: str, title: str, message: str) -> None:
         """Create a message for user to UI."""
diff --git a/homeassistant/components/cloud/const.py b/homeassistant/components/cloud/const.py
index 4392bf94827..5e9fb2e9dc7 100644
--- a/homeassistant/components/cloud/const.py
+++ b/homeassistant/components/cloud/const.py
@@ -43,7 +43,6 @@ PREF_GOOGLE_SETTINGS_VERSION = "google_settings_version"
 PREF_TTS_DEFAULT_VOICE = "tts_default_voice"
 PREF_GOOGLE_CONNECTED = "google_connected"
 PREF_REMOTE_ALLOW_REMOTE_ENABLE = "remote_allow_remote_enable"
-PREF_ENABLE_CLOUD_ICE_SERVERS = "cloud_ice_servers_enabled"
 DEFAULT_TTS_DEFAULT_VOICE = ("en-US", "JennyNeural")
 DEFAULT_DISABLE_2FA = False
 DEFAULT_ALEXA_REPORT_STATE = True
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index 4f2ad0ddcf7..b1931515745 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -42,7 +42,6 @@ from .const import (
     PREF_ALEXA_REPORT_STATE,
     PREF_DISABLE_2FA,
     PREF_ENABLE_ALEXA,
-    PREF_ENABLE_CLOUD_ICE_SERVERS,
     PREF_ENABLE_GOOGLE,
     PREF_GOOGLE_REPORT_STATE,
     PREF_GOOGLE_SECURE_DEVICES_PIN,
@@ -440,16 +439,15 @@ def validate_language_voice(value: tuple[str, str]) -> tuple[str, str]:
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "cloud/update_prefs",
-        vol.Optional(PREF_ALEXA_REPORT_STATE): bool,
-        vol.Optional(PREF_ENABLE_ALEXA): bool,
-        vol.Optional(PREF_ENABLE_CLOUD_ICE_SERVERS): bool,
         vol.Optional(PREF_ENABLE_GOOGLE): bool,
+        vol.Optional(PREF_ENABLE_ALEXA): bool,
+        vol.Optional(PREF_ALEXA_REPORT_STATE): bool,
         vol.Optional(PREF_GOOGLE_REPORT_STATE): bool,
         vol.Optional(PREF_GOOGLE_SECURE_DEVICES_PIN): vol.Any(None, str),
-        vol.Optional(PREF_REMOTE_ALLOW_REMOTE_ENABLE): bool,
         vol.Optional(PREF_TTS_DEFAULT_VOICE): vol.All(
             vol.Coerce(tuple), validate_language_voice
         ),
+        vol.Optional(PREF_REMOTE_ALLOW_REMOTE_ENABLE): bool,
     }
 )
 @websocket_api.async_response
diff --git a/homeassistant/components/cloud/manifest.json b/homeassistant/components/cloud/manifest.json
index 4201cb1b2d4..47bb3028578 100644
--- a/homeassistant/components/cloud/manifest.json
+++ b/homeassistant/components/cloud/manifest.json
@@ -8,6 +8,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["hass_nabucasa"],
-  "requirements": ["hass-nabucasa==0.84.0"],
+  "requirements": ["hass-nabucasa==0.81.1"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/cloud/prefs.py b/homeassistant/components/cloud/prefs.py
index ae4b2794e1b..9f76c16a113 100644
--- a/homeassistant/components/cloud/prefs.py
+++ b/homeassistant/components/cloud/prefs.py
@@ -32,7 +32,6 @@ from .const import (
     PREF_CLOUD_USER,
     PREF_CLOUDHOOKS,
     PREF_ENABLE_ALEXA,
-    PREF_ENABLE_CLOUD_ICE_SERVERS,
     PREF_ENABLE_GOOGLE,
     PREF_ENABLE_REMOTE,
     PREF_GOOGLE_CONNECTED,
@@ -163,21 +162,20 @@ class CloudPreferences:
     async def async_update(
         self,
         *,
-        alexa_enabled: bool | UndefinedType = UNDEFINED,
-        alexa_report_state: bool | UndefinedType = UNDEFINED,
-        alexa_settings_version: int | UndefinedType = UNDEFINED,
-        cloud_ice_servers_enabled: bool | UndefinedType = UNDEFINED,
-        cloud_user: str | UndefinedType = UNDEFINED,
-        cloudhooks: dict[str, dict[str, str | bool]] | UndefinedType = UNDEFINED,
-        google_connected: bool | UndefinedType = UNDEFINED,
         google_enabled: bool | UndefinedType = UNDEFINED,
-        google_report_state: bool | UndefinedType = UNDEFINED,
-        google_secure_devices_pin: str | None | UndefinedType = UNDEFINED,
-        google_settings_version: int | UndefinedType = UNDEFINED,
-        remote_allow_remote_enable: bool | UndefinedType = UNDEFINED,
-        remote_domain: str | None | 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,
+        google_connected: bool | UndefinedType = UNDEFINED,
+        remote_allow_remote_enable: bool | UndefinedType = UNDEFINED,
     ) -> None:
         """Update user preferences."""
         prefs = {**self._prefs}
@@ -186,21 +184,20 @@ class CloudPreferences:
             {
                 key: value
                 for key, value in (
-                    (PREF_ALEXA_REPORT_STATE, alexa_report_state),
-                    (PREF_ALEXA_SETTINGS_VERSION, alexa_settings_version),
-                    (PREF_CLOUD_USER, cloud_user),
-                    (PREF_CLOUDHOOKS, cloudhooks),
-                    (PREF_ENABLE_ALEXA, alexa_enabled),
-                    (PREF_ENABLE_CLOUD_ICE_SERVERS, cloud_ice_servers_enabled),
                     (PREF_ENABLE_GOOGLE, google_enabled),
+                    (PREF_ENABLE_ALEXA, alexa_enabled),
                     (PREF_ENABLE_REMOTE, remote_enabled),
-                    (PREF_GOOGLE_CONNECTED, google_connected),
-                    (PREF_GOOGLE_REPORT_STATE, google_report_state),
                     (PREF_GOOGLE_SECURE_DEVICES_PIN, google_secure_devices_pin),
+                    (PREF_CLOUDHOOKS, cloudhooks),
+                    (PREF_CLOUD_USER, cloud_user),
+                    (PREF_ALEXA_REPORT_STATE, alexa_report_state),
+                    (PREF_GOOGLE_REPORT_STATE, google_report_state),
+                    (PREF_ALEXA_SETTINGS_VERSION, alexa_settings_version),
                     (PREF_GOOGLE_SETTINGS_VERSION, google_settings_version),
-                    (PREF_REMOTE_ALLOW_REMOTE_ENABLE, remote_allow_remote_enable),
-                    (PREF_REMOTE_DOMAIN, remote_domain),
                     (PREF_TTS_DEFAULT_VOICE, tts_default_voice),
+                    (PREF_REMOTE_DOMAIN, remote_domain),
+                    (PREF_GOOGLE_CONNECTED, google_connected),
+                    (PREF_REMOTE_ALLOW_REMOTE_ENABLE, remote_allow_remote_enable),
                 )
                 if value is not UNDEFINED
             }
@@ -242,7 +239,6 @@ class CloudPreferences:
             PREF_ALEXA_REPORT_STATE: self.alexa_report_state,
             PREF_CLOUDHOOKS: self.cloudhooks,
             PREF_ENABLE_ALEXA: self.alexa_enabled,
-            PREF_ENABLE_CLOUD_ICE_SERVERS: self.cloud_ice_servers_enabled,
             PREF_ENABLE_GOOGLE: self.google_enabled,
             PREF_ENABLE_REMOTE: self.remote_enabled,
             PREF_GOOGLE_DEFAULT_EXPOSE: self.google_default_expose,
@@ -366,14 +362,6 @@ class CloudPreferences:
         """
         return self._prefs.get(PREF_TTS_DEFAULT_VOICE, DEFAULT_TTS_DEFAULT_VOICE)  # type: ignore[no-any-return]
 
-    @property
-    def cloud_ice_servers_enabled(self) -> bool:
-        """Return if cloud ICE servers are enabled."""
-        cloud_ice_servers_enabled: bool = self._prefs.get(
-            PREF_ENABLE_CLOUD_ICE_SERVERS, True
-        )
-        return cloud_ice_servers_enabled
-
     async def get_cloud_user(self) -> str:
         """Return ID of Home Assistant Cloud system user."""
         user = await self._load_cloud_user()
@@ -421,7 +409,6 @@ class CloudPreferences:
             PREF_ENABLE_ALEXA: True,
             PREF_ENABLE_GOOGLE: True,
             PREF_ENABLE_REMOTE: False,
-            PREF_ENABLE_CLOUD_ICE_SERVERS: True,
             PREF_GOOGLE_CONNECTED: False,
             PREF_GOOGLE_DEFAULT_EXPOSE: DEFAULT_EXPOSED_DOMAINS,
             PREF_GOOGLE_ENTITY_CONFIGS: {},
diff --git a/homeassistant/components/cloud/system_health.py b/homeassistant/components/cloud/system_health.py
index ac50c2fb49b..0e65aa93eaf 100644
--- a/homeassistant/components/cloud/system_health.py
+++ b/homeassistant/components/cloud/system_health.py
@@ -33,7 +33,6 @@ async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
         data["remote_connected"] = cloud.remote.is_connected
         data["alexa_enabled"] = client.prefs.alexa_enabled
         data["google_enabled"] = client.prefs.google_enabled
-        data["cloud_ice_servers_enabled"] = client.prefs.cloud_ice_servers_enabled
         data["remote_server"] = cloud.remote.snitun_server
         data["certificate_status"] = cloud.remote.certificate_status
         data["instance_id"] = client.prefs.instance_id
diff --git a/homeassistant/components/co2signal/config_flow.py b/homeassistant/components/co2signal/config_flow.py
index 0d357cce199..622c09f0d38 100644
--- a/homeassistant/components/co2signal/config_flow.py
+++ b/homeassistant/components/co2signal/config_flow.py
@@ -168,7 +168,7 @@ class ElectricityMapsConfigFlow(ConfigFlow, domain=DOMAIN):
                     )
 
                 return self.async_create_entry(
-                    title=get_extra_name(data) or "Electricity Maps",
+                    title=get_extra_name(data) or "CO2 Signal",
                     data=data,
                 )
 
diff --git a/homeassistant/components/coinbase/config_flow.py b/homeassistant/components/coinbase/config_flow.py
index 8b7b4b9e313..616fdaf8f7a 100644
--- a/homeassistant/components/coinbase/config_flow.py
+++ b/homeassistant/components/coinbase/config_flow.py
@@ -158,12 +158,16 @@ class CoinbaseConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for Coinbase."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/comelit/alarm_control_panel.py b/homeassistant/components/comelit/alarm_control_panel.py
index b3bd6664bf8..b325de25e97 100644
--- a/homeassistant/components/comelit/alarm_control_panel.py
+++ b/homeassistant/components/comelit/alarm_control_panel.py
@@ -10,12 +10,21 @@ from aiocomelit.const import ALARM_AREAS, AlarmAreaState
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_DISARMING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -103,7 +112,7 @@ class ComelitAlarmEntity(CoordinatorEntity[ComelitVedoSystem], AlarmControlPanel
         return super().available
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> StateType:
         """Return the state of the alarm."""
 
         _LOGGER.debug(
@@ -114,16 +123,16 @@ class ComelitAlarmEntity(CoordinatorEntity[ComelitVedoSystem], AlarmControlPanel
         )
         if self._area.human_status == AlarmAreaState.ARMED:
             if self._area.armed == ALARM_AREA_ARMED_STATUS[AWAY]:
-                return AlarmControlPanelState.ARMED_AWAY
+                return STATE_ALARM_ARMED_AWAY
             if self._area.armed == ALARM_AREA_ARMED_STATUS[NIGHT]:
-                return AlarmControlPanelState.ARMED_NIGHT
-            return AlarmControlPanelState.ARMED_HOME
+                return STATE_ALARM_ARMED_NIGHT
+            return STATE_ALARM_ARMED_HOME
 
         return {
-            AlarmAreaState.DISARMED: AlarmControlPanelState.DISARMED,
-            AlarmAreaState.ENTRY_DELAY: AlarmControlPanelState.DISARMING,
-            AlarmAreaState.EXIT_DELAY: AlarmControlPanelState.ARMING,
-            AlarmAreaState.TRIGGERED: AlarmControlPanelState.TRIGGERED,
+            AlarmAreaState.DISARMED: STATE_ALARM_DISARMED,
+            AlarmAreaState.ENTRY_DELAY: STATE_ALARM_DISARMING,
+            AlarmAreaState.EXIT_DELAY: STATE_ALARM_ARMING,
+            AlarmAreaState.TRIGGERED: STATE_ALARM_TRIGGERED,
         }.get(self._area.human_status)
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
diff --git a/homeassistant/components/comelit/manifest.json b/homeassistant/components/comelit/manifest.json
index d25d5c1d7d5..b9264d16f69 100644
--- a/homeassistant/components/comelit/manifest.json
+++ b/homeassistant/components/comelit/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["aiocomelit"],
   "quality_scale": "silver",
-  "requirements": ["aiocomelit==0.9.1"]
+  "requirements": ["aiocomelit==0.9.0"]
 }
diff --git a/homeassistant/components/compensation/manifest.json b/homeassistant/components/compensation/manifest.json
index 775bde3c859..caae9190bca 100644
--- a/homeassistant/components/compensation/manifest.json
+++ b/homeassistant/components/compensation/manifest.json
@@ -4,5 +4,5 @@
   "codeowners": ["@Petro31"],
   "documentation": "https://www.home-assistant.io/integrations/compensation",
   "iot_class": "calculated",
-  "requirements": ["numpy==2.1.3"]
+  "requirements": ["numpy==1.26.4"]
 }
diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py
index 02453b56376..12981880cdf 100644
--- a/homeassistant/components/concord232/alarm_control_panel.py
+++ b/homeassistant/components/concord232/alarm_control_panel.py
@@ -13,10 +13,18 @@ from homeassistant.components.alarm_control_panel import (
     PLATFORM_SCHEMA as ALARM_CONTROL_PANEL_PLATFORM_SCHEMA,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
-from homeassistant.const import CONF_CODE, CONF_HOST, CONF_MODE, CONF_NAME, CONF_PORT
+from homeassistant.const import (
+    CONF_CODE,
+    CONF_HOST,
+    CONF_MODE,
+    CONF_NAME,
+    CONF_PORT,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -67,6 +75,7 @@ class Concord232Alarm(AlarmControlPanelEntity):
     """Representation of the Concord232-based alarm panel."""
 
     _attr_code_format = CodeFormat.NUMBER
+    _attr_state: str | None
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
@@ -98,21 +107,21 @@ class Concord232Alarm(AlarmControlPanelEntity):
             return
 
         if part["arming_level"] == "Off":
-            self._attr_alarm_state = AlarmControlPanelState.DISARMED
+            self._attr_state = STATE_ALARM_DISARMED
         elif "Home" in part["arming_level"]:
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+            self._attr_state = STATE_ALARM_ARMED_HOME
         else:
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+            self._attr_state = STATE_ALARM_ARMED_AWAY
 
     def alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
-        if not self._validate_code(code, AlarmControlPanelState.DISARMED):
+        if not self._validate_code(code, STATE_ALARM_DISARMED):
             return
         self._alarm.disarm(code)
 
     def alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
-        if not self._validate_code(code, AlarmControlPanelState.ARMED_HOME):
+        if not self._validate_code(code, STATE_ALARM_ARMED_HOME):
             return
         if self._mode == "silent":
             self._alarm.arm("stay", "silent")
@@ -121,7 +130,7 @@ class Concord232Alarm(AlarmControlPanelEntity):
 
     def alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
-        if not self._validate_code(code, AlarmControlPanelState.ARMED_AWAY):
+        if not self._validate_code(code, STATE_ALARM_ARMED_AWAY):
             return
         self._alarm.arm("away")
 
diff --git a/homeassistant/components/control4/config_flow.py b/homeassistant/components/control4/config_flow.py
index 19fae1ef7ca..77ae2c98c7d 100644
--- a/homeassistant/components/control4/config_flow.py
+++ b/homeassistant/components/control4/config_flow.py
@@ -154,12 +154,16 @@ class Control4ConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for Control4."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/conversation/default_agent.py b/homeassistant/components/conversation/default_agent.py
index 4838d19537a..6b5cef89fd6 100644
--- a/homeassistant/components/conversation/default_agent.py
+++ b/homeassistant/components/conversation/default_agent.py
@@ -16,11 +16,11 @@ from hassil.expression import Expression, ListReference, Sequence
 from hassil.intents import Intents, SlotList, TextSlotList, WildcardSlotList
 from hassil.recognize import (
     MISSING_ENTITY,
+    MatchEntity,
     RecognizeResult,
+    UnmatchedTextEntity,
     recognize_all,
-    recognize_best,
 )
-from hassil.string_matcher import UnmatchedRangeEntity, UnmatchedTextEntity
 from hassil.util import merge_dict
 from home_assistant_intents import ErrorKey, get_intents, get_languages
 import yaml
@@ -294,7 +294,7 @@ class DefaultAgent(ConversationEntity):
                     self.hass, language, DOMAIN, [DOMAIN]
                 )
                 response_text = translations.get(
-                    f"component.{DOMAIN}.conversation.agent.done", "Done"
+                    f"component.{DOMAIN}.agent.done", "Done"
                 )
 
             response.async_set_speech(response_text)
@@ -499,7 +499,6 @@ class DefaultAgent(ConversationEntity):
         maybe_result: RecognizeResult | None = None
         best_num_matched_entities = 0
         best_num_unmatched_entities = 0
-        best_num_unmatched_ranges = 0
         for result in recognize_all(
             user_input.text,
             lang_intents.intents,
@@ -518,14 +517,10 @@ class DefaultAgent(ConversationEntity):
                     num_matched_entities += 1
 
             num_unmatched_entities = 0
-            num_unmatched_ranges = 0
             for unmatched_entity in result.unmatched_entities_list:
                 if isinstance(unmatched_entity, UnmatchedTextEntity):
                     if unmatched_entity.text != MISSING_ENTITY:
                         num_unmatched_entities += 1
-                elif isinstance(unmatched_entity, UnmatchedRangeEntity):
-                    num_unmatched_ranges += 1
-                    num_unmatched_entities += 1
                 else:
                     num_unmatched_entities += 1
 
@@ -537,24 +532,15 @@ class DefaultAgent(ConversationEntity):
                     (num_matched_entities == best_num_matched_entities)
                     and (num_unmatched_entities < best_num_unmatched_entities)
                 )
-                or (
-                    # Prefer unmatched ranges
-                    (num_matched_entities == best_num_matched_entities)
-                    and (num_unmatched_entities == best_num_unmatched_entities)
-                    and (num_unmatched_ranges > best_num_unmatched_ranges)
-                )
                 or (
                     # More literal text matched
                     (num_matched_entities == best_num_matched_entities)
                     and (num_unmatched_entities == best_num_unmatched_entities)
-                    and (num_unmatched_ranges == best_num_unmatched_ranges)
                     and (result.text_chunks_matched > maybe_result.text_chunks_matched)
                 )
                 or (
                     # Prefer match failures with entities
                     (result.text_chunks_matched == maybe_result.text_chunks_matched)
-                    and (num_unmatched_entities == best_num_unmatched_entities)
-                    and (num_unmatched_ranges == best_num_unmatched_ranges)
                     and (
                         ("name" in result.entities)
                         or ("name" in result.unmatched_entities)
@@ -564,7 +550,6 @@ class DefaultAgent(ConversationEntity):
                 maybe_result = result
                 best_num_matched_entities = num_matched_entities
                 best_num_unmatched_entities = num_unmatched_entities
-                best_num_unmatched_ranges = num_unmatched_ranges
 
         return maybe_result
 
@@ -577,15 +562,76 @@ class DefaultAgent(ConversationEntity):
         language: str,
     ) -> RecognizeResult | None:
         """Search intents for a strict match to user input."""
-        return recognize_best(
+        custom_found = False
+        name_found = False
+        best_results: list[RecognizeResult] = []
+        best_name_quality: int | None = None
+        best_text_chunks_matched: int | None = None
+        for result in recognize_all(
             user_input.text,
             lang_intents.intents,
             slot_lists=slot_lists,
             intent_context=intent_context,
             language=language,
-            best_metadata_key=METADATA_CUSTOM_SENTENCE,
-            best_slot_name="name",
-        )
+        ):
+            # Prioritize user intents
+            is_custom = (
+                result.intent_metadata is not None
+                and result.intent_metadata.get(METADATA_CUSTOM_SENTENCE)
+            )
+
+            if custom_found and not is_custom:
+                continue
+
+            if not custom_found and is_custom:
+                custom_found = True
+                # Clear builtin results
+                name_found = False
+                best_results = []
+                best_name_quality = None
+                best_text_chunks_matched = None
+
+            # Prioritize results with a "name" slot
+            name = result.entities.get("name")
+            is_name = name and not name.is_wildcard
+
+            if name_found and not is_name:
+                continue
+
+            if not name_found and is_name:
+                name_found = True
+                # Clear non-name results
+                best_results = []
+                best_text_chunks_matched = None
+
+            if is_name:
+                # Prioritize results with a better "name" slot
+                name_quality = len(cast(MatchEntity, name).value.split())
+                if (best_name_quality is None) or (name_quality > best_name_quality):
+                    best_name_quality = name_quality
+                    # Clear worse name results
+                    best_results = []
+                    best_text_chunks_matched = None
+                elif name_quality < best_name_quality:
+                    continue
+
+            # Prioritize results with more literal text
+            # This causes wildcards to match last.
+            if (best_text_chunks_matched is None) or (
+                result.text_chunks_matched > best_text_chunks_matched
+            ):
+                best_results = [result]
+                best_text_chunks_matched = result.text_chunks_matched
+            elif result.text_chunks_matched == best_text_chunks_matched:
+                # Accumulate results with the same number of literal text matched.
+                # We will resolve the ambiguity below.
+                best_results.append(result)
+
+        if best_results:
+            # Successful strict match
+            return best_results[0]
+
+        return None
 
     async def _build_speech(
         self,
diff --git a/homeassistant/components/conversation/http.py b/homeassistant/components/conversation/http.py
index 5e5800ad6f1..df1ffc7f74f 100644
--- a/homeassistant/components/conversation/http.py
+++ b/homeassistant/components/conversation/http.py
@@ -6,8 +6,12 @@ from collections.abc import Iterable
 from typing import Any
 
 from aiohttp import web
-from hassil.recognize import MISSING_ENTITY, RecognizeResult
-from hassil.string_matcher import UnmatchedRangeEntity, UnmatchedTextEntity
+from hassil.recognize import (
+    MISSING_ENTITY,
+    RecognizeResult,
+    UnmatchedRangeEntity,
+    UnmatchedTextEntity,
+)
 import voluptuous as vol
 
 from homeassistant.components import http, websocket_api
diff --git a/homeassistant/components/conversation/manifest.json b/homeassistant/components/conversation/manifest.json
index 1676cdf8254..c2168ce7152 100644
--- a/homeassistant/components/conversation/manifest.json
+++ b/homeassistant/components/conversation/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["hassil==2.0.1", "home-assistant-intents==2024.11.13"]
+  "requirements": ["hassil==1.7.4", "home-assistant-intents==2024.10.2"]
 }
diff --git a/homeassistant/components/conversation/trigger.py b/homeassistant/components/conversation/trigger.py
index a4f64ffbad9..ec7ecc76da0 100644
--- a/homeassistant/components/conversation/trigger.py
+++ b/homeassistant/components/conversation/trigger.py
@@ -4,8 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from hassil.recognize import RecognizeResult
-from hassil.util import PUNCTUATION_ALL
+from hassil.recognize import PUNCTUATION, RecognizeResult
 import voluptuous as vol
 
 from homeassistant.const import CONF_COMMAND, CONF_PLATFORM
@@ -21,7 +20,7 @@ from .const import DATA_DEFAULT_ENTITY, DOMAIN
 def has_no_punctuation(value: list[str]) -> list[str]:
     """Validate result does not contain punctuation."""
     for sentence in value:
-        if PUNCTUATION_ALL.search(sentence):
+        if PUNCTUATION.search(sentence):
             raise vol.Invalid("sentence should not contain punctuation")
 
     return value
diff --git a/homeassistant/components/crownstone/config_flow.py b/homeassistant/components/crownstone/config_flow.py
index bf6e9204714..7d86fbbd7fb 100644
--- a/homeassistant/components/crownstone/config_flow.py
+++ b/homeassistant/components/crownstone/config_flow.py
@@ -213,19 +213,18 @@ class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize Crownstone options."""
         super().__init__(OPTIONS_FLOW, self.async_create_new_entry)
-        self.options = config_entry.options.copy()
+        self.entry = config_entry
+        self.updated_options = config_entry.options.copy()
 
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Manage Crownstone options."""
-        self.cloud: CrownstoneCloud = self.hass.data[DOMAIN][
-            self.config_entry.entry_id
-        ].cloud
+        self.cloud: CrownstoneCloud = self.hass.data[DOMAIN][self.entry.entry_id].cloud
 
         spheres = {sphere.name: sphere.cloud_id for sphere in self.cloud.cloud_data}
-        usb_path = self.config_entry.options.get(CONF_USB_PATH)
-        usb_sphere = self.config_entry.options.get(CONF_USB_SPHERE)
+        usb_path = self.entry.options.get(CONF_USB_PATH)
+        usb_sphere = self.entry.options.get(CONF_USB_SPHERE)
 
         options_schema = vol.Schema(
             {vol.Optional(CONF_USE_USB_OPTION, default=usb_path is not None): bool}
@@ -244,14 +243,14 @@ class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
             if user_input[CONF_USE_USB_OPTION] and usb_path is None:
                 return await self.async_step_usb_config()
             if not user_input[CONF_USE_USB_OPTION] and usb_path is not None:
-                self.options[CONF_USB_PATH] = None
-                self.options[CONF_USB_SPHERE] = None
+                self.updated_options[CONF_USB_PATH] = None
+                self.updated_options[CONF_USB_SPHERE] = None
             elif (
                 CONF_USB_SPHERE_OPTION in user_input
                 and spheres[user_input[CONF_USB_SPHERE_OPTION]] != usb_sphere
             ):
                 sphere_id = spheres[user_input[CONF_USB_SPHERE_OPTION]]
-                self.options[CONF_USB_SPHERE] = sphere_id
+                self.updated_options[CONF_USB_SPHERE] = sphere_id
 
             return self.async_create_new_entry()
 
@@ -261,7 +260,7 @@ class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
         """Create a new entry."""
         # these attributes will only change when a usb was configured
         if self.usb_path is not None and self.usb_sphere_id is not None:
-            self.options[CONF_USB_PATH] = self.usb_path
-            self.options[CONF_USB_SPHERE] = self.usb_sphere_id
+            self.updated_options[CONF_USB_PATH] = self.usb_path
+            self.updated_options[CONF_USB_SPHERE] = self.usb_sphere_id
 
-        return super().async_create_entry(title="", data=self.options)
+        return super().async_create_entry(title="", data=self.updated_options)
diff --git a/homeassistant/components/deako/manifest.json b/homeassistant/components/deako/manifest.json
index e3099439b9d..e8f6f235107 100644
--- a/homeassistant/components/deako/manifest.json
+++ b/homeassistant/components/deako/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/deako",
   "iot_class": "local_polling",
   "loggers": ["pydeako"],
-  "requirements": ["pydeako==0.5.4"],
+  "requirements": ["pydeako==0.4.0"],
   "single_config_entry": true,
   "zeroconf": ["_deako._tcp.local."]
 }
diff --git a/homeassistant/components/deconz/alarm_control_panel.py b/homeassistant/components/deconz/alarm_control_panel.py
index 678e441a7a9..2f9bda6d5ed 100644
--- a/homeassistant/components/deconz/alarm_control_panel.py
+++ b/homeassistant/components/deconz/alarm_control_panel.py
@@ -13,10 +13,18 @@ from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_CONTROl_PANEL_DOMAIN,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -24,16 +32,16 @@ from .entity import DeconzDevice
 from .hub import DeconzHub
 
 DECONZ_TO_ALARM_STATE = {
-    AncillaryControlPanel.ARMED_AWAY: AlarmControlPanelState.ARMED_AWAY,
-    AncillaryControlPanel.ARMED_NIGHT: AlarmControlPanelState.ARMED_NIGHT,
-    AncillaryControlPanel.ARMED_STAY: AlarmControlPanelState.ARMED_HOME,
-    AncillaryControlPanel.ARMING_AWAY: AlarmControlPanelState.ARMING,
-    AncillaryControlPanel.ARMING_NIGHT: AlarmControlPanelState.ARMING,
-    AncillaryControlPanel.ARMING_STAY: AlarmControlPanelState.ARMING,
-    AncillaryControlPanel.DISARMED: AlarmControlPanelState.DISARMED,
-    AncillaryControlPanel.ENTRY_DELAY: AlarmControlPanelState.PENDING,
-    AncillaryControlPanel.EXIT_DELAY: AlarmControlPanelState.PENDING,
-    AncillaryControlPanel.IN_ALARM: AlarmControlPanelState.TRIGGERED,
+    AncillaryControlPanel.ARMED_AWAY: STATE_ALARM_ARMED_AWAY,
+    AncillaryControlPanel.ARMED_NIGHT: STATE_ALARM_ARMED_NIGHT,
+    AncillaryControlPanel.ARMED_STAY: STATE_ALARM_ARMED_HOME,
+    AncillaryControlPanel.ARMING_AWAY: STATE_ALARM_ARMING,
+    AncillaryControlPanel.ARMING_NIGHT: STATE_ALARM_ARMING,
+    AncillaryControlPanel.ARMING_STAY: STATE_ALARM_ARMING,
+    AncillaryControlPanel.DISARMED: STATE_ALARM_DISARMED,
+    AncillaryControlPanel.ENTRY_DELAY: STATE_ALARM_PENDING,
+    AncillaryControlPanel.EXIT_DELAY: STATE_ALARM_PENDING,
+    AncillaryControlPanel.IN_ALARM: STATE_ALARM_TRIGGERED,
 }
 
 
@@ -97,7 +105,7 @@ class DeconzAlarmControlPanel(DeconzDevice[AncillaryControl], AlarmControlPanelE
             super().async_update_callback()
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the control panel."""
         if self._device.panel in DECONZ_TO_ALARM_STATE:
             return DECONZ_TO_ALARM_STATE[self._device.panel]
diff --git a/homeassistant/components/deconz/config_flow.py b/homeassistant/components/deconz/config_flow.py
index ed54701f656..d017e2c5c65 100644
--- a/homeassistant/components/deconz/config_flow.py
+++ b/homeassistant/components/deconz/config_flow.py
@@ -20,6 +20,7 @@ from pydeconz.utils import (
 import voluptuous as vol
 
 from homeassistant.components import ssdp
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import (
     SOURCE_HASSIO,
     ConfigEntry,
@@ -30,7 +31,6 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .const import (
     CONF_ALLOW_CLIP_SENSOR,
@@ -74,11 +74,9 @@ class DeconzFlowHandler(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> DeconzOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return DeconzOptionsFlowHandler()
+        return DeconzOptionsFlowHandler(config_entry)
 
     def __init__(self) -> None:
         """Initialize the deCONZ config flow."""
@@ -301,6 +299,11 @@ class DeconzOptionsFlowHandler(OptionsFlow):
 
     gateway: DeconzHub
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize deCONZ options flow."""
+        self.config_entry = config_entry
+        self.options = dict(config_entry.options)
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -312,7 +315,8 @@ class DeconzOptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the deconz devices options."""
         if user_input is not None:
-            return self.async_create_entry(data=self.config_entry.options | user_input)
+            self.options.update(user_input)
+            return self.async_create_entry(title="", data=self.options)
 
         schema_options = {}
         for option, default in (
diff --git a/homeassistant/components/default_config/manifest.json b/homeassistant/components/default_config/manifest.json
index 8299fe43f09..addf49b9542 100644
--- a/homeassistant/components/default_config/manifest.json
+++ b/homeassistant/components/default_config/manifest.json
@@ -9,7 +9,6 @@
     "conversation",
     "dhcp",
     "energy",
-    "go2rtc",
     "history",
     "homeassistant_alerts",
     "logbook",
diff --git a/homeassistant/components/demo/alarm_control_panel.py b/homeassistant/components/demo/alarm_control_panel.py
index d34830042d7..f9b791668e8 100644
--- a/homeassistant/components/demo/alarm_control_panel.py
+++ b/homeassistant/components/demo/alarm_control_panel.py
@@ -4,10 +4,20 @@ from __future__ import annotations
 
 import datetime
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.components.manual.alarm_control_panel import ManualAlarm
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ARMING_TIME, CONF_DELAY_TIME, CONF_TRIGGER_TIME
+from homeassistant.const import (
+    CONF_ARMING_TIME,
+    CONF_DELAY_TIME,
+    CONF_TRIGGER_TIME,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -29,36 +39,36 @@ async def async_setup_entry(
                 True,
                 False,
                 {
-                    AlarmControlPanelState.ARMED_AWAY: {
+                    STATE_ALARM_ARMED_AWAY: {
                         CONF_ARMING_TIME: datetime.timedelta(seconds=5),
                         CONF_DELAY_TIME: datetime.timedelta(seconds=0),
                         CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
                     },
-                    AlarmControlPanelState.ARMED_HOME: {
+                    STATE_ALARM_ARMED_HOME: {
                         CONF_ARMING_TIME: datetime.timedelta(seconds=5),
                         CONF_DELAY_TIME: datetime.timedelta(seconds=0),
                         CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
                     },
-                    AlarmControlPanelState.ARMED_NIGHT: {
+                    STATE_ALARM_ARMED_NIGHT: {
                         CONF_ARMING_TIME: datetime.timedelta(seconds=5),
                         CONF_DELAY_TIME: datetime.timedelta(seconds=0),
                         CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
                     },
-                    AlarmControlPanelState.ARMED_VACATION: {
+                    STATE_ALARM_ARMED_VACATION: {
                         CONF_ARMING_TIME: datetime.timedelta(seconds=5),
                         CONF_DELAY_TIME: datetime.timedelta(seconds=0),
                         CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
                     },
-                    AlarmControlPanelState.DISARMED: {
+                    STATE_ALARM_DISARMED: {
                         CONF_DELAY_TIME: datetime.timedelta(seconds=0),
                         CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
                     },
-                    AlarmControlPanelState.ARMED_CUSTOM_BYPASS: {
+                    STATE_ALARM_ARMED_CUSTOM_BYPASS: {
                         CONF_ARMING_TIME: datetime.timedelta(seconds=5),
                         CONF_DELAY_TIME: datetime.timedelta(seconds=0),
                         CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
                     },
-                    AlarmControlPanelState.TRIGGERED: {
+                    STATE_ALARM_TRIGGERED: {
                         CONF_ARMING_TIME: datetime.timedelta(seconds=5)
                     },
                 },
diff --git a/homeassistant/components/demo/config_flow.py b/homeassistant/components/demo/config_flow.py
index 53c1678aa81..241f62bed69 100644
--- a/homeassistant/components/demo/config_flow.py
+++ b/homeassistant/components/demo/config_flow.py
@@ -47,6 +47,7 @@ class OptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self.options = dict(config_entry.options)
 
     async def async_step_init(
diff --git a/homeassistant/components/demo/update.py b/homeassistant/components/demo/update.py
index 3fa037f6b02..7e53f5ce8ca 100644
--- a/homeassistant/components/demo/update.py
+++ b/homeassistant/components/demo/update.py
@@ -75,21 +75,6 @@ async def async_setup_entry(
                 support_release_notes=True,
                 release_url="https://www.example.com/release/1.93.3",
                 device_class=UpdateDeviceClass.FIRMWARE,
-                update_steps=10,
-            ),
-            DemoUpdate(
-                unique_id="update_support_decimal_progress",
-                device_name="Demo Update with Decimal Progress",
-                title="Philips Lamps Firmware",
-                installed_version="1.93.3",
-                latest_version="1.94.2",
-                support_progress=True,
-                release_summary="Added support for effects",
-                support_release_notes=True,
-                release_url="https://www.example.com/release/1.93.3",
-                device_class=UpdateDeviceClass.FIRMWARE,
-                display_precision=2,
-                update_steps=1000,
             ),
         ]
     )
@@ -121,13 +106,10 @@ class DemoUpdate(UpdateEntity):
         support_install: bool = True,
         support_release_notes: bool = False,
         device_class: UpdateDeviceClass | None = None,
-        display_precision: int = 0,
-        update_steps: int = 100,
     ) -> None:
         """Initialize the Demo select entity."""
         self._attr_installed_version = installed_version
         self._attr_device_class = device_class
-        self._attr_display_precision = display_precision
         self._attr_latest_version = latest_version
         self._attr_release_summary = release_summary
         self._attr_release_url = release_url
@@ -137,7 +119,6 @@ class DemoUpdate(UpdateEntity):
             identifiers={(DOMAIN, unique_id)},
             name=device_name,
         )
-        self._update_steps = update_steps
         if support_install:
             self._attr_supported_features |= (
                 UpdateEntityFeature.INSTALL
@@ -155,14 +136,12 @@ class DemoUpdate(UpdateEntity):
     ) -> None:
         """Install an update."""
         if self.supported_features & UpdateEntityFeature.PROGRESS:
-            self._attr_in_progress = True
-            for progress in range(0, self._update_steps, 1):
-                self._attr_update_percentage = progress / (self._update_steps / 100)
+            for progress in range(0, 100, 10):
+                self._attr_in_progress = progress
                 self.async_write_ha_state()
                 await _fake_install()
 
         self._attr_in_progress = False
-        self._attr_update_percentage = None
         self._attr_installed_version = (
             version if version is not None else self.latest_version
         )
diff --git a/homeassistant/components/denonavr/config_flow.py b/homeassistant/components/denonavr/config_flow.py
index 9ff05411588..9a7d2a30438 100644
--- a/homeassistant/components/denonavr/config_flow.py
+++ b/homeassistant/components/denonavr/config_flow.py
@@ -52,6 +52,10 @@ CONFIG_SCHEMA = vol.Schema({vol.Optional(CONF_HOST): str})
 class OptionsFlowHandler(OptionsFlow):
     """Options for the component."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Init object."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -115,7 +119,7 @@ class DenonAvrFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/devolo_home_network/__init__.py b/homeassistant/components/devolo_home_network/__init__.py
index 70a94531431..f8a0f015543 100644
--- a/homeassistant/components/devolo_home_network/__init__.py
+++ b/homeassistant/components/devolo_home_network/__init__.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from asyncio import Semaphore
 from dataclasses import dataclass
 import logging
 from typing import Any
@@ -33,7 +32,7 @@ from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.httpx_client import get_async_client
-from homeassistant.helpers.update_coordinator import UpdateFailed
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import (
     CONNECTED_PLC_DEVICES,
@@ -48,7 +47,6 @@ from .const import (
     SWITCH_GUEST_WIFI,
     SWITCH_LEDS,
 )
-from .coordinator import DevoloDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -60,7 +58,7 @@ class DevoloHomeNetworkData:
     """The devolo Home Network data."""
 
     device: Device
-    coordinators: dict[str, DevoloDataUpdateCoordinator[Any]]
+    coordinators: dict[str, DataUpdateCoordinator[Any]]
 
 
 async def async_setup_entry(
@@ -70,7 +68,6 @@ async def async_setup_entry(
     zeroconf_instance = await zeroconf.async_get_async_instance(hass)
     async_client = get_async_client(hass)
     device_registry = dr.async_get(hass)
-    semaphore = Semaphore(1)
 
     try:
         device = Device(
@@ -166,72 +163,58 @@ async def async_setup_entry(
         """Disconnect from device."""
         await device.async_disconnect()
 
-    coordinators: dict[str, DevoloDataUpdateCoordinator[Any]] = {}
+    coordinators: dict[str, DataUpdateCoordinator[Any]] = {}
     if device.plcnet:
-        coordinators[CONNECTED_PLC_DEVICES] = DevoloDataUpdateCoordinator(
+        coordinators[CONNECTED_PLC_DEVICES] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=CONNECTED_PLC_DEVICES,
-            semaphore=semaphore,
             update_method=async_update_connected_plc_devices,
             update_interval=LONG_UPDATE_INTERVAL,
         )
     if device.device and "led" in device.device.features:
-        coordinators[SWITCH_LEDS] = DevoloDataUpdateCoordinator(
+        coordinators[SWITCH_LEDS] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=SWITCH_LEDS,
-            semaphore=semaphore,
             update_method=async_update_led_status,
             update_interval=SHORT_UPDATE_INTERVAL,
         )
     if device.device and "restart" in device.device.features:
-        coordinators[LAST_RESTART] = DevoloDataUpdateCoordinator(
+        coordinators[LAST_RESTART] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=LAST_RESTART,
-            semaphore=semaphore,
             update_method=async_update_last_restart,
             update_interval=SHORT_UPDATE_INTERVAL,
         )
     if device.device and "update" in device.device.features:
-        coordinators[REGULAR_FIRMWARE] = DevoloDataUpdateCoordinator(
+        coordinators[REGULAR_FIRMWARE] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=REGULAR_FIRMWARE,
-            semaphore=semaphore,
             update_method=async_update_firmware_available,
             update_interval=FIRMWARE_UPDATE_INTERVAL,
         )
     if device.device and "wifi1" in device.device.features:
-        coordinators[CONNECTED_WIFI_CLIENTS] = DevoloDataUpdateCoordinator(
+        coordinators[CONNECTED_WIFI_CLIENTS] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=CONNECTED_WIFI_CLIENTS,
-            semaphore=semaphore,
             update_method=async_update_wifi_connected_station,
             update_interval=SHORT_UPDATE_INTERVAL,
         )
-        coordinators[NEIGHBORING_WIFI_NETWORKS] = DevoloDataUpdateCoordinator(
+        coordinators[NEIGHBORING_WIFI_NETWORKS] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=NEIGHBORING_WIFI_NETWORKS,
-            semaphore=semaphore,
             update_method=async_update_wifi_neighbor_access_points,
             update_interval=LONG_UPDATE_INTERVAL,
         )
-        coordinators[SWITCH_GUEST_WIFI] = DevoloDataUpdateCoordinator(
+        coordinators[SWITCH_GUEST_WIFI] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=SWITCH_GUEST_WIFI,
-            semaphore=semaphore,
             update_method=async_update_guest_wifi_status,
             update_interval=SHORT_UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/devolo_home_network/binary_sensor.py b/homeassistant/components/devolo_home_network/binary_sensor.py
index 5752956ffb5..c96d0273a50 100644
--- a/homeassistant/components/devolo_home_network/binary_sensor.py
+++ b/homeassistant/components/devolo_home_network/binary_sensor.py
@@ -15,13 +15,13 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import CONNECTED_PLC_DEVICES, CONNECTED_TO_ROUTER
-from .coordinator import DevoloDataUpdateCoordinator
 from .entity import DevoloCoordinatorEntity
 
-PARALLEL_UPDATES = 0
+PARALLEL_UPDATES = 1
 
 
 def _is_connected_to_router(entity: DevoloBinarySensorEntity) -> bool:
@@ -78,7 +78,7 @@ class DevoloBinarySensorEntity(
     def __init__(
         self,
         entry: DevoloHomeNetworkConfigEntry,
-        coordinator: DevoloDataUpdateCoordinator[LogicalNetwork],
+        coordinator: DataUpdateCoordinator[LogicalNetwork],
         description: DevoloBinarySensorEntityDescription,
     ) -> None:
         """Initialize entity."""
diff --git a/homeassistant/components/devolo_home_network/button.py b/homeassistant/components/devolo_home_network/button.py
index 06822ff199e..ca17b572522 100644
--- a/homeassistant/components/devolo_home_network/button.py
+++ b/homeassistant/components/devolo_home_network/button.py
@@ -22,7 +22,7 @@ from . import DevoloHomeNetworkConfigEntry
 from .const import DOMAIN, IDENTIFY, PAIRING, RESTART, START_WPS
 from .entity import DevoloEntity
 
-PARALLEL_UPDATES = 0
+PARALLEL_UPDATES = 1
 
 
 @dataclass(frozen=True, kw_only=True)
diff --git a/homeassistant/components/devolo_home_network/coordinator.py b/homeassistant/components/devolo_home_network/coordinator.py
deleted file mode 100644
index c0af9668279..00000000000
--- a/homeassistant/components/devolo_home_network/coordinator.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""Base coordinator."""
-
-from asyncio import Semaphore
-from collections.abc import Awaitable, Callable
-from datetime import timedelta
-from logging import Logger
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-
-class DevoloDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
-    """Class to manage fetching data from devolo Home Network devices."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        logger: Logger,
-        *,
-        config_entry: ConfigEntry,
-        name: str,
-        semaphore: Semaphore,
-        update_interval: timedelta,
-        update_method: Callable[[], Awaitable[_DataT]],
-    ) -> None:
-        """Initialize global data updater."""
-        super().__init__(
-            hass,
-            logger,
-            config_entry=config_entry,
-            name=name,
-            update_interval=update_interval,
-            update_method=update_method,
-        )
-        self._semaphore = semaphore
-
-    async def _async_update_data(self) -> _DataT:
-        """Fetch the latest data from the source."""
-        async with self._semaphore:
-            return await super()._async_update_data()
diff --git a/homeassistant/components/devolo_home_network/device_tracker.py b/homeassistant/components/devolo_home_network/device_tracker.py
index 583f022df84..d372ba3d468 100644
--- a/homeassistant/components/devolo_home_network/device_tracker.py
+++ b/homeassistant/components/devolo_home_network/device_tracker.py
@@ -13,13 +13,15 @@ from homeassistant.const import STATE_UNKNOWN, UnitOfFrequency
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import CONNECTED_WIFI_CLIENTS, DOMAIN, WIFI_APTYPE, WIFI_BANDS
-from .coordinator import DevoloDataUpdateCoordinator
 
-PARALLEL_UPDATES = 0
+PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
@@ -29,7 +31,7 @@ async def async_setup_entry(
 ) -> None:
     """Get all devices and sensors and setup them via config entry."""
     device = entry.runtime_data.device
-    coordinators: dict[str, DevoloDataUpdateCoordinator[list[ConnectedStationInfo]]] = (
+    coordinators: dict[str, DataUpdateCoordinator[list[ConnectedStationInfo]]] = (
         entry.runtime_data.coordinators
     )
     registry = er.async_get(hass)
@@ -49,7 +51,7 @@ async def async_setup_entry(
                 )
             )
             tracked.add(station.mac_address)
-        async_add_entities(new_entities)
+            async_add_entities(new_entities)
 
     @callback
     def restore_entities() -> None:
@@ -81,16 +83,14 @@ async def async_setup_entry(
     )
 
 
-# The pylint disable is needed because of https://github.com/pylint-dev/pylint/issues/9138
-class DevoloScannerEntity(  # pylint: disable=hass-enforce-class-module
-    CoordinatorEntity[DevoloDataUpdateCoordinator[list[ConnectedStationInfo]]],
-    ScannerEntity,
+class DevoloScannerEntity(
+    CoordinatorEntity[DataUpdateCoordinator[list[ConnectedStationInfo]]], ScannerEntity
 ):
     """Representation of a devolo device tracker."""
 
     def __init__(
         self,
-        coordinator: DevoloDataUpdateCoordinator[list[ConnectedStationInfo]],
+        coordinator: DataUpdateCoordinator[list[ConnectedStationInfo]],
         device: Device,
         mac: str,
     ) -> None:
diff --git a/homeassistant/components/devolo_home_network/entity.py b/homeassistant/components/devolo_home_network/entity.py
index 93ec1b9a3a2..d381f48ca05 100644
--- a/homeassistant/components/devolo_home_network/entity.py
+++ b/homeassistant/components/devolo_home_network/entity.py
@@ -9,14 +9,15 @@ from devolo_plc_api.device_api import (
 )
 from devolo_plc_api.plcnet_api import DataRate, LogicalNetwork
 
-from homeassistant.const import ATTR_CONNECTIONS
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import DOMAIN
-from .coordinator import DevoloDataUpdateCoordinator
 
 type _DataType = (
     LogicalNetwork
@@ -44,6 +45,7 @@ class DevoloEntity(Entity):
 
         self._attr_device_info = DeviceInfo(
             configuration_url=f"http://{self.device.ip}",
+            connections={(CONNECTION_NETWORK_MAC, self.device.mac)},
             identifiers={(DOMAIN, str(self.device.serial_number))},
             manufacturer="devolo",
             model=self.device.product,
@@ -51,10 +53,6 @@ class DevoloEntity(Entity):
             serial_number=self.device.serial_number,
             sw_version=self.device.firmware_version,
         )
-        if self.device.mac:
-            self._attr_device_info[ATTR_CONNECTIONS] = {
-                (CONNECTION_NETWORK_MAC, self.device.mac)
-            }
         self._attr_translation_key = self.entity_description.key
         self._attr_unique_id = (
             f"{self.device.serial_number}_{self.entity_description.key}"
@@ -62,14 +60,14 @@ class DevoloEntity(Entity):
 
 
 class DevoloCoordinatorEntity[_DataT: _DataType](
-    CoordinatorEntity[DevoloDataUpdateCoordinator[_DataT]], DevoloEntity
+    CoordinatorEntity[DataUpdateCoordinator[_DataT]], DevoloEntity
 ):
     """Representation of a coordinated devolo home network device."""
 
     def __init__(
         self,
         entry: DevoloHomeNetworkConfigEntry,
-        coordinator: DevoloDataUpdateCoordinator[_DataT],
+        coordinator: DataUpdateCoordinator[_DataT],
     ) -> None:
         """Initialize a devolo home network device."""
         super().__init__(coordinator)
diff --git a/homeassistant/components/devolo_home_network/image.py b/homeassistant/components/devolo_home_network/image.py
index 240686ed3bb..58052d3021e 100644
--- a/homeassistant/components/devolo_home_network/image.py
+++ b/homeassistant/components/devolo_home_network/image.py
@@ -13,14 +13,14 @@ from homeassistant.components.image import ImageEntity, ImageEntityDescription
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 import homeassistant.util.dt as dt_util
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import IMAGE_GUEST_WIFI, SWITCH_GUEST_WIFI
-from .coordinator import DevoloDataUpdateCoordinator
 from .entity import DevoloCoordinatorEntity
 
-PARALLEL_UPDATES = 0
+PARALLEL_UPDATES = 1
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -66,7 +66,7 @@ class DevoloImageEntity(DevoloCoordinatorEntity[WifiGuestAccessGet], ImageEntity
     def __init__(
         self,
         entry: DevoloHomeNetworkConfigEntry,
-        coordinator: DevoloDataUpdateCoordinator[WifiGuestAccessGet],
+        coordinator: DataUpdateCoordinator[WifiGuestAccessGet],
         description: DevoloImageEntityDescription,
     ) -> None:
         """Initialize entity."""
diff --git a/homeassistant/components/devolo_home_network/sensor.py b/homeassistant/components/devolo_home_network/sensor.py
index 220ab66312a..667bbc2c557 100644
--- a/homeassistant/components/devolo_home_network/sensor.py
+++ b/homeassistant/components/devolo_home_network/sensor.py
@@ -6,7 +6,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from enum import StrEnum
-from typing import Any
+from typing import Any, Generic, TypeVar
 
 from devolo_plc_api.device_api import ConnectedStationInfo, NeighborAPInfo
 from devolo_plc_api.plcnet_api import REMOTE, DataRate, LogicalNetwork
@@ -20,6 +20,7 @@ from homeassistant.components.sensor import (
 from homeassistant.const import EntityCategory, UnitOfDataRate
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.dt import utcnow
 
 from . import DevoloHomeNetworkConfigEntry
@@ -31,10 +32,9 @@ from .const import (
     PLC_RX_RATE,
     PLC_TX_RATE,
 )
-from .coordinator import DevoloDataUpdateCoordinator
 from .entity import DevoloCoordinatorEntity
 
-PARALLEL_UPDATES = 0
+PARALLEL_UPDATES = 1
 
 
 def _last_restart(runtime: int) -> datetime:
@@ -47,10 +47,26 @@ def _last_restart(runtime: int) -> datetime:
     )
 
 
-type _CoordinatorDataType = (
-    LogicalNetwork | DataRate | list[ConnectedStationInfo] | list[NeighborAPInfo] | int
+_CoordinatorDataT = TypeVar(
+    "_CoordinatorDataT",
+    bound=LogicalNetwork
+    | DataRate
+    | list[ConnectedStationInfo]
+    | list[NeighborAPInfo]
+    | int,
+)
+_ValueDataT = TypeVar(
+    "_ValueDataT",
+    bound=LogicalNetwork
+    | DataRate
+    | list[ConnectedStationInfo]
+    | list[NeighborAPInfo]
+    | int,
+)
+_SensorDataT = TypeVar(
+    "_SensorDataT",
+    bound=int | float | datetime,
 )
-type _SensorDataType = int | float | datetime
 
 
 class DataRateDirection(StrEnum):
@@ -61,10 +77,9 @@ class DataRateDirection(StrEnum):
 
 
 @dataclass(frozen=True, kw_only=True)
-class DevoloSensorEntityDescription[
-    _CoordinatorDataT: _CoordinatorDataType,
-    _SensorDataT: _SensorDataType,
-](SensorEntityDescription):
+class DevoloSensorEntityDescription(
+    SensorEntityDescription, Generic[_CoordinatorDataT, _SensorDataT]
+):
     """Describes devolo sensor entity."""
 
     value_func: Callable[[_CoordinatorDataT], _SensorDataT]
@@ -185,11 +200,8 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class BaseDevoloSensorEntity[
-    _CoordinatorDataT: _CoordinatorDataType,
-    _ValueDataT: _CoordinatorDataType,
-    _SensorDataT: _SensorDataType,
-](
+class BaseDevoloSensorEntity(
+    Generic[_CoordinatorDataT, _ValueDataT, _SensorDataT],
     DevoloCoordinatorEntity[_CoordinatorDataT],
     SensorEntity,
 ):
@@ -198,7 +210,7 @@ class BaseDevoloSensorEntity[
     def __init__(
         self,
         entry: DevoloHomeNetworkConfigEntry,
-        coordinator: DevoloDataUpdateCoordinator[_CoordinatorDataT],
+        coordinator: DataUpdateCoordinator[_CoordinatorDataT],
         description: DevoloSensorEntityDescription[_ValueDataT, _SensorDataT],
     ) -> None:
         """Initialize entity."""
@@ -206,11 +218,9 @@ class BaseDevoloSensorEntity[
         super().__init__(entry, coordinator)
 
 
-class DevoloSensorEntity[
-    _CoordinatorDataT: _CoordinatorDataType,
-    _ValueDataT: _CoordinatorDataType,
-    _SensorDataT: _SensorDataType,
-](BaseDevoloSensorEntity[_CoordinatorDataT, _ValueDataT, _SensorDataT]):
+class DevoloSensorEntity(
+    BaseDevoloSensorEntity[_CoordinatorDataT, _CoordinatorDataT, _SensorDataT]
+):
     """Representation of a generic devolo sensor."""
 
     entity_description: DevoloSensorEntityDescription[_CoordinatorDataT, _SensorDataT]
@@ -231,7 +241,7 @@ class DevoloPlcDataRateSensorEntity(
     def __init__(
         self,
         entry: DevoloHomeNetworkConfigEntry,
-        coordinator: DevoloDataUpdateCoordinator[LogicalNetwork],
+        coordinator: DataUpdateCoordinator[LogicalNetwork],
         description: DevoloSensorEntityDescription[DataRate, float],
         peer: str,
     ) -> None:
diff --git a/homeassistant/components/devolo_home_network/switch.py b/homeassistant/components/devolo_home_network/switch.py
index 8ff35dcc4b6..c3400916d78 100644
--- a/homeassistant/components/devolo_home_network/switch.py
+++ b/homeassistant/components/devolo_home_network/switch.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
-from typing import Any
+from typing import Any, Generic, TypeVar
 
 from devolo_plc_api.device import Device
 from devolo_plc_api.device_api import WifiGuestAccessGet
@@ -15,19 +15,19 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import DOMAIN, SWITCH_GUEST_WIFI, SWITCH_LEDS
-from .coordinator import DevoloDataUpdateCoordinator
 from .entity import DevoloCoordinatorEntity
 
-PARALLEL_UPDATES = 0
+PARALLEL_UPDATES = 1
 
-type _DataType = WifiGuestAccessGet | bool
+_DataT = TypeVar("_DataT", bound=WifiGuestAccessGet | bool)
 
 
 @dataclass(frozen=True, kw_only=True)
-class DevoloSwitchEntityDescription[_DataT: _DataType](SwitchEntityDescription):
+class DevoloSwitchEntityDescription(SwitchEntityDescription, Generic[_DataT]):
     """Describes devolo switch entity."""
 
     is_on_func: Callable[[_DataT], bool]
@@ -81,9 +81,7 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class DevoloSwitchEntity[_DataT: _DataType](
-    DevoloCoordinatorEntity[_DataT], SwitchEntity
-):
+class DevoloSwitchEntity(DevoloCoordinatorEntity[_DataT], SwitchEntity):
     """Representation of a devolo switch."""
 
     entity_description: DevoloSwitchEntityDescription[_DataT]
@@ -91,7 +89,7 @@ class DevoloSwitchEntity[_DataT: _DataType](
     def __init__(
         self,
         entry: DevoloHomeNetworkConfigEntry,
-        coordinator: DevoloDataUpdateCoordinator[_DataT],
+        coordinator: DataUpdateCoordinator[_DataT],
         description: DevoloSwitchEntityDescription[_DataT],
     ) -> None:
         """Initialize entity."""
diff --git a/homeassistant/components/devolo_home_network/update.py b/homeassistant/components/devolo_home_network/update.py
index 5091ce8e1e7..29c0c8762b9 100644
--- a/homeassistant/components/devolo_home_network/update.py
+++ b/homeassistant/components/devolo_home_network/update.py
@@ -20,13 +20,13 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import DevoloHomeNetworkConfigEntry
 from .const import DOMAIN, REGULAR_FIRMWARE
-from .coordinator import DevoloDataUpdateCoordinator
 from .entity import DevoloCoordinatorEntity
 
-PARALLEL_UPDATES = 0
+PARALLEL_UPDATES = 1
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -79,7 +79,7 @@ class DevoloUpdateEntity(DevoloCoordinatorEntity, UpdateEntity):
     def __init__(
         self,
         entry: DevoloHomeNetworkConfigEntry,
-        coordinator: DevoloDataUpdateCoordinator,
+        coordinator: DataUpdateCoordinator,
         description: DevoloUpdateEntityDescription,
     ) -> None:
         """Initialize entity."""
diff --git a/homeassistant/components/dexcom/__init__.py b/homeassistant/components/dexcom/__init__.py
index b9a3bdba12d..5ff95fae47e 100644
--- a/homeassistant/components/dexcom/__init__.py
+++ b/homeassistant/components/dexcom/__init__.py
@@ -46,7 +46,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator[GlucoseReading](
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=async_update_data,
         update_interval=SCAN_INTERVAL,
diff --git a/homeassistant/components/dexcom/config_flow.py b/homeassistant/components/dexcom/config_flow.py
index c5c830dedf6..c3ed43c8e9a 100644
--- a/homeassistant/components/dexcom/config_flow.py
+++ b/homeassistant/components/dexcom/config_flow.py
@@ -69,12 +69,16 @@ class DexcomConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> DexcomOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return DexcomOptionsFlowHandler()
+        return DexcomOptionsFlowHandler(config_entry)
 
 
 class DexcomOptionsFlowHandler(OptionsFlow):
     """Handle a option flow for Dexcom."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/dlna_dmr/config_flow.py b/homeassistant/components/dlna_dmr/config_flow.py
index 75f50192500..06ac935e8d9 100644
--- a/homeassistant/components/dlna_dmr/config_flow.py
+++ b/homeassistant/components/dlna_dmr/config_flow.py
@@ -74,7 +74,7 @@ class DlnaDmrFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Define the config flow to handle options."""
-        return DlnaDmrOptionsFlowHandler()
+        return DlnaDmrOptionsFlowHandler(config_entry)
 
     async def async_step_user(self, user_input: FlowInput = None) -> ConfigFlowResult:
         """Handle a flow initialized by the user.
@@ -327,6 +327,10 @@ class DlnaDmrOptionsFlowHandler(OptionsFlow):
     Configures the single instance and updates the existing config entry.
     """
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/dnsip/config_flow.py b/homeassistant/components/dnsip/config_flow.py
index 8c2cfa5e556..6dda0c03910 100644
--- a/homeassistant/components/dnsip/config_flow.py
+++ b/homeassistant/components/dnsip/config_flow.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_NAME, CONF_PORT
 from homeassistant.core import callback
@@ -101,7 +101,7 @@ class DnsIPConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> DnsIPOptionsFlowHandler:
         """Return Option handler."""
-        return DnsIPOptionsFlowHandler()
+        return DnsIPOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -165,7 +165,7 @@ class DnsIPConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class DnsIPOptionsFlowHandler(OptionsFlow):
+class DnsIPOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle a option config flow for dnsip integration."""
 
     async def async_step_init(
diff --git a/homeassistant/components/doods/manifest.json b/homeassistant/components/doods/manifest.json
index 7c85ca63467..fabb2c30190 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==11.0.0"]
+  "requirements": ["pydoods==1.0.2", "Pillow==10.4.0"]
 }
diff --git a/homeassistant/components/doorbird/config_flow.py b/homeassistant/components/doorbird/config_flow.py
index ebb1d6fc126..650ddb8811d 100644
--- a/homeassistant/components/doorbird/config_flow.py
+++ b/homeassistant/components/doorbird/config_flow.py
@@ -213,12 +213,16 @@ class DoorBirdConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for doorbird."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/doorbird/manifest.json b/homeassistant/components/doorbird/manifest.json
index 8480a496762..153f552b698 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==3.0.8"],
+  "requirements": ["DoorBirdPy==3.0.4"],
   "zeroconf": [
     {
       "type": "_axis-video._tcp.local.",
diff --git a/homeassistant/components/dormakaba_dkey/__init__.py b/homeassistant/components/dormakaba_dkey/__init__.py
index b4304e75aab..a8868e8563c 100644
--- a/homeassistant/components/dormakaba_dkey/__init__.py
+++ b/homeassistant/components/dormakaba_dkey/__init__.py
@@ -69,7 +69,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=lock.name,
         update_method=_async_update,
         update_interval=timedelta(seconds=UPDATE_SECONDS),
diff --git a/homeassistant/components/dsmr/config_flow.py b/homeassistant/components/dsmr/config_flow.py
index 7d6a641b006..49e1818edcc 100644
--- a/homeassistant/components/dsmr/config_flow.py
+++ b/homeassistant/components/dsmr/config_flow.py
@@ -171,11 +171,9 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> DSMROptionFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> DSMROptionFlowHandler:
         """Get the options flow for this handler."""
-        return DSMROptionFlowHandler()
+        return DSMROptionFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -313,6 +311,10 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
 class DSMROptionFlowHandler(OptionsFlow):
     """Handle options."""
 
+    def __init__(self, entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.entry = entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -326,7 +328,7 @@ class DSMROptionFlowHandler(OptionsFlow):
                 {
                     vol.Optional(
                         CONF_TIME_BETWEEN_UPDATE,
-                        default=self.config_entry.options.get(
+                        default=self.entry.options.get(
                             CONF_TIME_BETWEEN_UPDATE, DEFAULT_TIME_BETWEEN_UPDATE
                         ),
                     ): vol.All(vol.Coerce(int), vol.Range(min=0)),
diff --git a/homeassistant/components/duotecno/manifest.json b/homeassistant/components/duotecno/manifest.json
index 2a427e36e84..928faf56d92 100644
--- a/homeassistant/components/duotecno/manifest.json
+++ b/homeassistant/components/duotecno/manifest.json
@@ -7,6 +7,6 @@
   "iot_class": "local_push",
   "loggers": ["pyduotecno", "pyduotecno-node", "pyduotecno-unit"],
   "quality_scale": "silver",
-  "requirements": ["pyDuotecno==2024.10.1"],
+  "requirements": ["pyDuotecno==2024.10.0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/dwd_weather_warnings/coordinator.py b/homeassistant/components/dwd_weather_warnings/coordinator.py
index 8cf3813a85d..55705625685 100644
--- a/homeassistant/components/dwd_weather_warnings/coordinator.py
+++ b/homeassistant/components/dwd_weather_warnings/coordinator.py
@@ -37,8 +37,8 @@ class DwdWeatherWarningsCoordinator(DataUpdateCoordinator[None]):
         self._device_tracker = None
         self._previous_position = None
 
-    async def _async_setup(self) -> None:
-        """Set up coordinator."""
+    async def async_config_entry_first_refresh(self) -> None:
+        """Perform first refresh."""
         if region_identifier := self.config_entry.data.get(CONF_REGION_IDENTIFIER):
             self.api = await self.hass.async_add_executor_job(
                 DwdWeatherWarningsAPI, region_identifier
@@ -48,6 +48,8 @@ class DwdWeatherWarningsCoordinator(DataUpdateCoordinator[None]):
                 CONF_REGION_DEVICE_TRACKER
             )
 
+        await super().async_config_entry_first_refresh()
+
     async def _async_update_data(self) -> None:
         """Get the latest data from the DWD Weather Warnings API."""
         if self._device_tracker:
diff --git a/homeassistant/components/eafm/__init__.py b/homeassistant/components/eafm/__init__.py
index dc618a983f3..1f95437484f 100644
--- a/homeassistant/components/eafm/__init__.py
+++ b/homeassistant/components/eafm/__init__.py
@@ -48,7 +48,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator[dict[str, dict[str, Any]]](
         hass,
         _LOGGER,
-        config_entry=entry,
         name="sensor",
         update_method=_async_update_data,
         update_interval=timedelta(seconds=15 * 60),
diff --git a/homeassistant/components/ecobee/number.py b/homeassistant/components/ecobee/number.py
index ed3744bf11e..ab09407903d 100644
--- a/homeassistant/components/ecobee/number.py
+++ b/homeassistant/components/ecobee/number.py
@@ -6,14 +6,9 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 import logging
 
-from homeassistant.components.number import (
-    NumberDeviceClass,
-    NumberEntity,
-    NumberEntityDescription,
-    NumberMode,
-)
+from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfTemperature, UnitOfTime
+from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -59,30 +54,21 @@ async def async_setup_entry(
 ) -> None:
     """Set up the ecobee thermostat number entity."""
     data: EcobeeData = hass.data[DOMAIN]
+    _LOGGER.debug("Adding min time ventilators numbers (if present)")
 
-    assert data is not None
-
-    entities: list[NumberEntity] = [
-        EcobeeVentilatorMinTime(data, index, numbers)
-        for index, thermostat in enumerate(data.ecobee.thermostats)
-        if thermostat["settings"]["ventilatorType"] != "none"
-        for numbers in VENTILATOR_NUMBERS
-    ]
-
-    _LOGGER.debug("Adding compressor min temp number (if present)")
-    entities.extend(
+    async_add_entities(
         (
-            EcobeeCompressorMinTemp(data, index)
+            EcobeeVentilatorMinTime(data, index, numbers)
             for index, thermostat in enumerate(data.ecobee.thermostats)
-            if thermostat["settings"]["hasHeatPump"]
-        )
+            if thermostat["settings"]["ventilatorType"] != "none"
+            for numbers in VENTILATOR_NUMBERS
+        ),
+        True,
     )
 
-    async_add_entities(entities, True)
-
 
 class EcobeeVentilatorMinTime(EcobeeBaseEntity, NumberEntity):
-    """A number class, representing min time for an ecobee thermostat with ventilator attached."""
+    """A number class, representing min time  for an ecobee thermostat with ventilator attached."""
 
     entity_description: EcobeeNumberEntityDescription
 
@@ -119,53 +105,3 @@ class EcobeeVentilatorMinTime(EcobeeBaseEntity, NumberEntity):
         """Set new ventilator Min On Time value."""
         self.entity_description.set_fn(self.data, self.thermostat_index, int(value))
         self.update_without_throttle = True
-
-
-class EcobeeCompressorMinTemp(EcobeeBaseEntity, NumberEntity):
-    """Minimum outdoor temperature at which the compressor will operate.
-
-    This applies more to air source heat pumps than geothermal. This serves as a safety
-         feature (compressors have a minimum operating temperature) as well as
-        providing the ability to choose fuel in a dual-fuel system (i.e. choose between
-        electrical heat pump and fossil auxiliary heat depending on Time of Use, Solar,
-        etc.).
-        Note that python-ecobee-api refers to this as Aux Cutover Threshold, but Ecobee
-        uses Compressor Protection Min Temp.
-    """
-
-    _attr_device_class = NumberDeviceClass.TEMPERATURE
-    _attr_has_entity_name = True
-    _attr_icon = "mdi:thermometer-off"
-    _attr_mode = NumberMode.BOX
-    _attr_native_min_value = -25
-    _attr_native_max_value = 66
-    _attr_native_step = 5
-    _attr_native_unit_of_measurement = UnitOfTemperature.FAHRENHEIT
-    _attr_translation_key = "compressor_protection_min_temp"
-
-    def __init__(
-        self,
-        data: EcobeeData,
-        thermostat_index: int,
-    ) -> None:
-        """Initialize ecobee compressor min temperature."""
-        super().__init__(data, thermostat_index)
-        self._attr_unique_id = f"{self.base_unique_id}_compressor_protection_min_temp"
-        self.update_without_throttle = False
-
-    async def async_update(self) -> None:
-        """Get the latest state from the thermostat."""
-        if self.update_without_throttle:
-            await self.data.update(no_throttle=True)
-            self.update_without_throttle = False
-        else:
-            await self.data.update()
-
-        self._attr_native_value = (
-            (self.thermostat["settings"]["compressorProtectionMinTemp"]) / 10
-        )
-
-    def set_native_value(self, value: float) -> None:
-        """Set new compressor minimum temperature."""
-        self.data.ecobee.set_aux_cutover_threshold(self.thermostat_index, value)
-        self.update_without_throttle = True
diff --git a/homeassistant/components/ecobee/strings.json b/homeassistant/components/ecobee/strings.json
index 8c636bd9b04..18929cb45de 100644
--- a/homeassistant/components/ecobee/strings.json
+++ b/homeassistant/components/ecobee/strings.json
@@ -33,18 +33,15 @@
     },
     "number": {
       "ventilator_min_type_home": {
-        "name": "Ventilator minimum time home"
+        "name": "Ventilator min time home"
       },
       "ventilator_min_type_away": {
-        "name": "Ventilator minimum time away"
-      },
-      "compressor_protection_min_temp": {
-        "name": "Compressor minimum temperature"
+        "name": "Ventilator min time away"
       }
     },
     "switch": {
       "aux_heat_only": {
-        "name": "Auxiliary heat only"
+        "name": "Aux heat only"
       }
     }
   },
diff --git a/homeassistant/components/ecobee/switch.py b/homeassistant/components/ecobee/switch.py
index 89ee433c072..67be78fb21d 100644
--- a/homeassistant/components/ecobee/switch.py
+++ b/homeassistant/components/ecobee/switch.py
@@ -31,26 +31,25 @@ async def async_setup_entry(
     """Set up the ecobee thermostat switch entity."""
     data: EcobeeData = hass.data[DOMAIN]
 
-    entities: list[SwitchEntity] = [
-        EcobeeVentilator20MinSwitch(
-            data,
-            index,
-            (await dt_util.async_get_time_zone(thermostat["location"]["timeZone"]))
-            or dt_util.get_default_time_zone(),
-        )
-        for index, thermostat in enumerate(data.ecobee.thermostats)
-        if thermostat["settings"]["ventilatorType"] != "none"
-    ]
-
-    entities.extend(
-        (
-            EcobeeSwitchAuxHeatOnly(data, index)
+    async_add_entities(
+        [
+            EcobeeVentilator20MinSwitch(
+                data,
+                index,
+                (await dt_util.async_get_time_zone(thermostat["location"]["timeZone"]))
+                or dt_util.get_default_time_zone(),
+            )
             for index, thermostat in enumerate(data.ecobee.thermostats)
-            if thermostat["settings"]["hasHeatPump"]
-        )
+            if thermostat["settings"]["ventilatorType"] != "none"
+        ],
+        update_before_add=True,
     )
 
-    async_add_entities(entities, update_before_add=True)
+    async_add_entities(
+        EcobeeSwitchAuxHeatOnly(data, index)
+        for index, thermostat in enumerate(data.ecobee.thermostats)
+        if thermostat["settings"]["hasHeatPump"]
+    )
 
 
 class EcobeeVentilator20MinSwitch(EcobeeBaseEntity, SwitchEntity):
diff --git a/homeassistant/components/ecovacs/manifest.json b/homeassistant/components/ecovacs/manifest.json
index 0ab9f9a4612..33977b3b0de 100644
--- a/homeassistant/components/ecovacs/manifest.json
+++ b/homeassistant/components/ecovacs/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ecovacs",
   "iot_class": "cloud_push",
   "loggers": ["sleekxmppfs", "sucks", "deebot_client"],
-  "requirements": ["py-sucks==0.9.10", "deebot-client==8.4.1"]
+  "requirements": ["py-sucks==0.9.10", "deebot-client==8.4.0"]
 }
diff --git a/homeassistant/components/egardia/alarm_control_panel.py b/homeassistant/components/egardia/alarm_control_panel.py
index 5a18a23541a..706ba0db719 100644
--- a/homeassistant/components/egardia/alarm_control_panel.py
+++ b/homeassistant/components/egardia/alarm_control_panel.py
@@ -9,7 +9,13 @@ import requests
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
+)
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -27,13 +33,13 @@ from . import (
 _LOGGER = logging.getLogger(__name__)
 
 STATES = {
-    "ARM": AlarmControlPanelState.ARMED_AWAY,
-    "DAY HOME": AlarmControlPanelState.ARMED_HOME,
-    "DISARM": AlarmControlPanelState.DISARMED,
-    "ARMHOME": AlarmControlPanelState.ARMED_HOME,
-    "HOME": AlarmControlPanelState.ARMED_HOME,
-    "NIGHT HOME": AlarmControlPanelState.ARMED_NIGHT,
-    "TRIGGERED": AlarmControlPanelState.TRIGGERED,
+    "ARM": STATE_ALARM_ARMED_AWAY,
+    "DAY HOME": STATE_ALARM_ARMED_HOME,
+    "DISARM": STATE_ALARM_DISARMED,
+    "ARMHOME": STATE_ALARM_ARMED_HOME,
+    "HOME": STATE_ALARM_ARMED_HOME,
+    "NIGHT HOME": STATE_ALARM_ARMED_NIGHT,
+    "TRIGGERED": STATE_ALARM_TRIGGERED,
 }
 
 
@@ -60,6 +66,7 @@ def setup_platform(
 class EgardiaAlarm(AlarmControlPanelEntity):
     """Representation of a Egardia alarm."""
 
+    _attr_state: str | None
     _attr_code_arm_required = False
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
@@ -116,7 +123,7 @@ class EgardiaAlarm(AlarmControlPanelEntity):
             _LOGGER.debug("Not ignoring status %s", status)
             newstatus = STATES.get(status.upper())
             _LOGGER.debug("newstatus %s", newstatus)
-            self._attr_alarm_state = newstatus
+            self._attr_state = newstatus
         else:
             _LOGGER.error("Ignoring status")
 
diff --git a/homeassistant/components/elevenlabs/config_flow.py b/homeassistant/components/elevenlabs/config_flow.py
index 227150a0f4e..b596ec05b00 100644
--- a/homeassistant/components/elevenlabs/config_flow.py
+++ b/homeassistant/components/elevenlabs/config_flow.py
@@ -14,6 +14,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
@@ -102,12 +103,13 @@ class ElevenLabsConfigFlow(ConfigFlow, domain=DOMAIN):
         return ElevenLabsOptionsFlow(config_entry)
 
 
-class ElevenLabsOptionsFlow(OptionsFlow):
+class ElevenLabsOptionsFlow(OptionsFlowWithConfigEntry):
     """ElevenLabs options flow."""
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
-        self.api_key: str = config_entry.data[CONF_API_KEY]
+        super().__init__(config_entry)
+        self.api_key: str = self.config_entry.data[CONF_API_KEY]
         # id -> name
         self.voices: dict[str, str] = {}
         self.models: dict[str, str] = {}
@@ -168,7 +170,7 @@ class ElevenLabsOptionsFlow(OptionsFlow):
                     vol.Required(CONF_CONFIGURE_VOICE, default=False): bool,
                 }
             ),
-            self.config_entry.options,
+            self.options,
         )
 
     async def async_step_voice_settings(
diff --git a/homeassistant/components/elkm1/alarm_control_panel.py b/homeassistant/components/elkm1/alarm_control_panel.py
index f1ecf626263..f5437b6ed94 100644
--- a/homeassistant/components/elkm1/alarm_control_panel.py
+++ b/homeassistant/components/elkm1/alarm_control_panel.py
@@ -15,9 +15,17 @@ from homeassistant.components.alarm_control_panel import (
     ATTR_CHANGED_BY,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
@@ -117,7 +125,7 @@ class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
         self._changed_by_time: str | None = None
         self._changed_by_id: int | None = None
         self._changed_by: str | None = None
-        self._state: AlarmControlPanelState | None = None
+        self._state: str | None = None
 
     async def async_added_to_hass(self) -> None:
         """Register callback for ElkM1 changes."""
@@ -169,7 +177,7 @@ class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
         return CodeFormat.NUMBER
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the element."""
         return self._state
 
@@ -199,25 +207,23 @@ class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
 
     def _element_changed(self, element: Element, changeset: dict[str, Any]) -> None:
         elk_state_to_hass_state = {
-            ArmedStatus.DISARMED: AlarmControlPanelState.DISARMED,
-            ArmedStatus.ARMED_AWAY: AlarmControlPanelState.ARMED_AWAY,
-            ArmedStatus.ARMED_STAY: AlarmControlPanelState.ARMED_HOME,
-            ArmedStatus.ARMED_STAY_INSTANT: AlarmControlPanelState.ARMED_HOME,
-            ArmedStatus.ARMED_TO_NIGHT: AlarmControlPanelState.ARMED_NIGHT,
-            ArmedStatus.ARMED_TO_NIGHT_INSTANT: AlarmControlPanelState.ARMED_NIGHT,
-            ArmedStatus.ARMED_TO_VACATION: AlarmControlPanelState.ARMED_AWAY,
+            ArmedStatus.DISARMED: STATE_ALARM_DISARMED,
+            ArmedStatus.ARMED_AWAY: STATE_ALARM_ARMED_AWAY,
+            ArmedStatus.ARMED_STAY: STATE_ALARM_ARMED_HOME,
+            ArmedStatus.ARMED_STAY_INSTANT: STATE_ALARM_ARMED_HOME,
+            ArmedStatus.ARMED_TO_NIGHT: STATE_ALARM_ARMED_NIGHT,
+            ArmedStatus.ARMED_TO_NIGHT_INSTANT: STATE_ALARM_ARMED_NIGHT,
+            ArmedStatus.ARMED_TO_VACATION: STATE_ALARM_ARMED_AWAY,
         }
 
         if self._element.alarm_state is None:
             self._state = None
         elif self._element.in_alarm_state():
             # Area is in alarm state
-            self._state = AlarmControlPanelState.TRIGGERED
+            self._state = STATE_ALARM_TRIGGERED
         elif self._entry_exit_timer_is_running():
             self._state = (
-                AlarmControlPanelState.ARMING
-                if self._element.is_exit
-                else AlarmControlPanelState.PENDING
+                STATE_ALARM_ARMING if self._element.is_exit else STATE_ALARM_PENDING
             )
         elif self._element.armed_status is not None:
             self._state = elk_state_to_hass_state[self._element.armed_status]
diff --git a/homeassistant/components/elmax/alarm_control_panel.py b/homeassistant/components/elmax/alarm_control_panel.py
index 841b94a3d72..4162b177975 100644
--- a/homeassistant/components/elmax/alarm_control_panel.py
+++ b/homeassistant/components/elmax/alarm_control_panel.py
@@ -10,13 +10,20 @@ from elmax_api.model.panel import PanelStatus
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_DISARMING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, InvalidStateError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
 
 from .const import DOMAIN
 from .coordinator import ElmaxCoordinator
@@ -67,16 +74,16 @@ class ElmaxArea(ElmaxEntity, AlarmControlPanelEntity):
     _attr_code_arm_required = False
     _attr_has_entity_name = True
     _attr_supported_features = AlarmControlPanelEntityFeature.ARM_AWAY
-    _pending_state: AlarmControlPanelState | None = None
+    _pending_state: str | None = None
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
-        if self._attr_alarm_state == AlarmStatus.NOT_ARMED_NOT_ARMABLE:
+        if self._attr_state == AlarmStatus.NOT_ARMED_NOT_ARMABLE:
             raise InvalidStateError(
                 f"Cannot arm {self.name}: please check for open windows/doors first"
             )
 
-        self._pending_state = AlarmControlPanelState.ARMING
+        self._pending_state = STATE_ALARM_ARMING
         self.async_write_ha_state()
 
         try:
@@ -100,7 +107,7 @@ class ElmaxArea(ElmaxEntity, AlarmControlPanelEntity):
         if code is None or code == "":
             raise ValueError("Please input the disarm code.")
 
-        self._pending_state = AlarmControlPanelState.DISARMING
+        self._pending_state = STATE_ALARM_DISARMING
         self.async_write_ha_state()
 
         try:
@@ -123,7 +130,7 @@ class ElmaxArea(ElmaxEntity, AlarmControlPanelEntity):
             await self.coordinator.async_refresh()
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> StateType:
         """Return the state of the entity."""
         if self._pending_state is not None:
             return self._pending_state
@@ -144,10 +151,10 @@ class ElmaxArea(ElmaxEntity, AlarmControlPanelEntity):
 
 
 ALARM_STATE_TO_HA = {
-    AlarmArmStatus.ARMED_TOTALLY: AlarmControlPanelState.ARMED_AWAY,
-    AlarmArmStatus.ARMED_P1_P2: AlarmControlPanelState.ARMED_AWAY,
-    AlarmArmStatus.ARMED_P2: AlarmControlPanelState.ARMED_AWAY,
-    AlarmArmStatus.ARMED_P1: AlarmControlPanelState.ARMED_AWAY,
-    AlarmArmStatus.NOT_ARMED: AlarmControlPanelState.DISARMED,
-    AlarmStatus.TRIGGERED: AlarmControlPanelState.TRIGGERED,
+    AlarmArmStatus.ARMED_TOTALLY: STATE_ALARM_ARMED_AWAY,
+    AlarmArmStatus.ARMED_P1_P2: STATE_ALARM_ARMED_AWAY,
+    AlarmArmStatus.ARMED_P2: STATE_ALARM_ARMED_AWAY,
+    AlarmArmStatus.ARMED_P1: STATE_ALARM_ARMED_AWAY,
+    AlarmArmStatus.NOT_ARMED: STATE_ALARM_DISARMED,
+    AlarmStatus.TRIGGERED: STATE_ALARM_TRIGGERED,
 }
diff --git a/homeassistant/components/emoncms/__init__.py b/homeassistant/components/emoncms/__init__.py
index 0cd686b5b56..98ed6328578 100644
--- a/homeassistant/components/emoncms/__init__.py
+++ b/homeassistant/components/emoncms/__init__.py
@@ -5,11 +5,8 @@ from pyemoncms import EmoncmsClient
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_URL, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
-from .const import DOMAIN, EMONCMS_UUID_DOC_URL, LOGGER
 from .coordinator import EmoncmsCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
@@ -17,49 +14,6 @@ PLATFORMS: list[Platform] = [Platform.SENSOR]
 type EmonCMSConfigEntry = ConfigEntry[EmoncmsCoordinator]
 
 
-def _migrate_unique_id(
-    hass: HomeAssistant, entry: EmonCMSConfigEntry, emoncms_unique_id: str
-) -> None:
-    """Migrate to emoncms unique id if needed."""
-    ent_reg = er.async_get(hass)
-    entry_entities = ent_reg.entities.get_entries_for_config_entry_id(entry.entry_id)
-    for entity in entry_entities:
-        if entity.unique_id.split("-")[0] == entry.entry_id:
-            feed_id = entity.unique_id.split("-")[-1]
-            LOGGER.debug(f"moving feed {feed_id} to hardware uuid")
-            ent_reg.async_update_entity(
-                entity.entity_id, new_unique_id=f"{emoncms_unique_id}-{feed_id}"
-            )
-    hass.config_entries.async_update_entry(
-        entry,
-        unique_id=emoncms_unique_id,
-    )
-
-
-async def _check_unique_id_migration(
-    hass: HomeAssistant, entry: EmonCMSConfigEntry, emoncms_client: EmoncmsClient
-) -> None:
-    """Check if we can migrate to the emoncms uuid."""
-    emoncms_unique_id = await emoncms_client.async_get_uuid()
-    if emoncms_unique_id:
-        if entry.unique_id != emoncms_unique_id:
-            _migrate_unique_id(hass, entry, emoncms_unique_id)
-    else:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "migrate database",
-            is_fixable=False,
-            issue_domain=DOMAIN,
-            severity=IssueSeverity.WARNING,
-            translation_key="migrate_database",
-            translation_placeholders={
-                "url": entry.data[CONF_URL],
-                "doc_url": EMONCMS_UUID_DOC_URL,
-            },
-        )
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> bool:
     """Load a config entry."""
     emoncms_client = EmoncmsClient(
@@ -67,7 +21,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> b
         entry.data[CONF_API_KEY],
         session=async_get_clientsession(hass),
     )
-    await _check_unique_id_migration(hass, entry, emoncms_client)
     coordinator = EmoncmsCoordinator(hass, emoncms_client)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
diff --git a/homeassistant/components/emoncms/config_flow.py b/homeassistant/components/emoncms/config_flow.py
index e0d4d0d03e9..fdd5d29788e 100644
--- a/homeassistant/components/emoncms/config_flow.py
+++ b/homeassistant/components/emoncms/config_flow.py
@@ -1,7 +1,5 @@
 """Configflow for the emoncms integration."""
 
-from __future__ import annotations
-
 from typing import Any
 
 from pyemoncms import EmoncmsClient
@@ -11,10 +9,10 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_API_KEY, CONF_URL
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.selector import selector
 from homeassistant.helpers.typing import ConfigType
@@ -48,10 +46,13 @@ def sensor_name(url: str) -> str:
     return f"emoncms@{sensorip}"
 
 
-async def get_feed_list(
-    emoncms_client: EmoncmsClient,
-) -> dict[str, Any]:
+async def get_feed_list(hass: HomeAssistant, url: str, api_key: str) -> dict[str, Any]:
     """Check connection to emoncms and return feed list if successful."""
+    emoncms_client = EmoncmsClient(
+        url,
+        api_key,
+        session=async_get_clientsession(hass),
+    )
     return await emoncms_client.async_request("/feed/list.json")
 
 
@@ -67,7 +68,7 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> EmoncmsOptionsFlow:
+    ) -> OptionsFlowWithConfigEntry:
         """Get the options flow for this handler."""
         return EmoncmsOptionsFlow(config_entry)
 
@@ -76,28 +77,23 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Initiate a flow via the UI."""
         errors: dict[str, str] = {}
-        description_placeholders = {}
 
         if user_input is not None:
-            self.url = user_input[CONF_URL]
-            self.api_key = user_input[CONF_API_KEY]
             self._async_abort_entries_match(
                 {
-                    CONF_API_KEY: self.api_key,
-                    CONF_URL: self.url,
+                    CONF_API_KEY: user_input[CONF_API_KEY],
+                    CONF_URL: user_input[CONF_URL],
                 }
             )
-            emoncms_client = EmoncmsClient(
-                self.url, self.api_key, session=async_get_clientsession(self.hass)
+            result = await get_feed_list(
+                self.hass, user_input[CONF_URL], user_input[CONF_API_KEY]
             )
-            result = await get_feed_list(emoncms_client)
             if not result[CONF_SUCCESS]:
-                errors["base"] = "api_error"
-                description_placeholders = {"details": result[CONF_MESSAGE]}
+                errors["base"] = result[CONF_MESSAGE]
             else:
                 self.include_only_feeds = user_input.get(CONF_ONLY_INCLUDE_FEEDID)
-                await self.async_set_unique_id(await emoncms_client.async_get_uuid())
-                self._abort_if_unique_id_configured()
+                self.url = user_input[CONF_URL]
+                self.api_key = user_input[CONF_API_KEY]
                 options = get_options(result[CONF_MESSAGE])
                 self.dropdown = {
                     "options": options,
@@ -117,7 +113,6 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
                 user_input,
             ),
             errors=errors,
-            description_placeholders=description_placeholders,
         )
 
     async def async_step_choose_feeds(
@@ -172,41 +167,32 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
         return result
 
 
-class EmoncmsOptionsFlow(OptionsFlow):
+class EmoncmsOptionsFlow(OptionsFlowWithConfigEntry):
     """Emoncms Options flow handler."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialize emoncms options flow."""
-        self._url = config_entry.data[CONF_URL]
-        self._api_key = config_entry.data[CONF_API_KEY]
-
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Manage the options."""
         errors: dict[str, str] = {}
-        description_placeholders = {}
-        include_only_feeds = self.config_entry.options.get(
-            CONF_ONLY_INCLUDE_FEEDID,
-            self.config_entry.data.get(CONF_ONLY_INCLUDE_FEEDID, []),
-        )
+        data = self.options if self.options else self._config_entry.data
+        url = data[CONF_URL]
+        api_key = data[CONF_API_KEY]
+        include_only_feeds = data.get(CONF_ONLY_INCLUDE_FEEDID, [])
         options: list = include_only_feeds
-        emoncms_client = EmoncmsClient(
-            self._url,
-            self._api_key,
-            session=async_get_clientsession(self.hass),
-        )
-        result = await get_feed_list(emoncms_client)
+        result = await get_feed_list(self.hass, url, api_key)
         if not result[CONF_SUCCESS]:
-            errors["base"] = "api_error"
-            description_placeholders = {"details": result[CONF_MESSAGE]}
+            errors["base"] = result[CONF_MESSAGE]
         else:
             options = get_options(result[CONF_MESSAGE])
         dropdown = {"options": options, "mode": "dropdown", "multiple": True}
         if user_input:
             include_only_feeds = user_input[CONF_ONLY_INCLUDE_FEEDID]
             return self.async_create_entry(
+                title=sensor_name(url),
                 data={
+                    CONF_URL: url,
+                    CONF_API_KEY: api_key,
                     CONF_ONLY_INCLUDE_FEEDID: include_only_feeds,
                 },
             )
@@ -221,5 +207,4 @@ class EmoncmsOptionsFlow(OptionsFlow):
                 }
             ),
             errors=errors,
-            description_placeholders=description_placeholders,
         )
diff --git a/homeassistant/components/emoncms/const.py b/homeassistant/components/emoncms/const.py
index c53f7cc8a9f..256db5726bb 100644
--- a/homeassistant/components/emoncms/const.py
+++ b/homeassistant/components/emoncms/const.py
@@ -7,10 +7,6 @@ CONF_ONLY_INCLUDE_FEEDID = "include_only_feed_id"
 CONF_MESSAGE = "message"
 CONF_SUCCESS = "success"
 DOMAIN = "emoncms"
-EMONCMS_UUID_DOC_URL = (
-    "https://docs.openenergymonitor.org/emoncms/update.html"
-    "#upgrading-to-a-version-producing-a-unique-identifier"
-)
 FEED_ID = "id"
 FEED_NAME = "name"
 FEED_TAG = "tag"
diff --git a/homeassistant/components/emoncms/manifest.json b/homeassistant/components/emoncms/manifest.json
index c7f18cb205e..f8f0f2edb95 100644
--- a/homeassistant/components/emoncms/manifest.json
+++ b/homeassistant/components/emoncms/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/emoncms",
   "iot_class": "local_polling",
-  "requirements": ["pyemoncms==0.1.1"]
+  "requirements": ["pyemoncms==0.0.7"]
 }
diff --git a/homeassistant/components/emoncms/sensor.py b/homeassistant/components/emoncms/sensor.py
index c696a569135..4add7c9625d 100644
--- a/homeassistant/components/emoncms/sensor.py
+++ b/homeassistant/components/emoncms/sensor.py
@@ -138,30 +138,29 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the emoncms sensors."""
-    name = sensor_name(entry.data[CONF_URL])
-    exclude_feeds = entry.data.get(CONF_EXCLUDE_FEEDID)
-    include_only_feeds = entry.options.get(
-        CONF_ONLY_INCLUDE_FEEDID, entry.data.get(CONF_ONLY_INCLUDE_FEEDID)
-    )
+    config = entry.options if entry.options else entry.data
+    name = sensor_name(config[CONF_URL])
+    exclude_feeds = config.get(CONF_EXCLUDE_FEEDID)
+    include_only_feeds = config.get(CONF_ONLY_INCLUDE_FEEDID)
 
     if exclude_feeds is None and include_only_feeds is None:
         return
 
     coordinator = entry.runtime_data
-    # uuid was added in emoncms database 11.5.7
-    unique_id = entry.unique_id if entry.unique_id else entry.entry_id
     elems = coordinator.data
     if not elems:
         return
+
     sensors: list[EmonCmsSensor] = []
 
     for idx, elem in enumerate(elems):
         if include_only_feeds is not None and elem[FEED_ID] not in include_only_feeds:
             continue
+
         sensors.append(
             EmonCmsSensor(
                 coordinator,
-                unique_id,
+                entry.entry_id,
                 elem["unit"],
                 name,
                 idx,
@@ -176,7 +175,7 @@ class EmonCmsSensor(CoordinatorEntity[EmoncmsCoordinator], SensorEntity):
     def __init__(
         self,
         coordinator: EmoncmsCoordinator,
-        unique_id: str,
+        entry_id: str,
         unit_of_measurement: str | None,
         name: str,
         idx: int,
@@ -189,7 +188,7 @@ class EmonCmsSensor(CoordinatorEntity[EmoncmsCoordinator], SensorEntity):
             elem = self.coordinator.data[self.idx]
         self._attr_name = f"{name} {elem[FEED_NAME]}"
         self._attr_native_unit_of_measurement = unit_of_measurement
-        self._attr_unique_id = f"{unique_id}-{elem[FEED_ID]}"
+        self._attr_unique_id = f"{entry_id}-{elem[FEED_ID]}"
         if unit_of_measurement in ("kWh", "Wh"):
             self._attr_device_class = SensorDeviceClass.ENERGY
             self._attr_state_class = SensorStateClass.TOTAL_INCREASING
diff --git a/homeassistant/components/emoncms/strings.json b/homeassistant/components/emoncms/strings.json
index 0d841f2efb4..4a700cc8981 100644
--- a/homeassistant/components/emoncms/strings.json
+++ b/homeassistant/components/emoncms/strings.json
@@ -1,8 +1,5 @@
 {
   "config": {
-    "error": {
-      "api_error": "An error occured in the pyemoncms API : {details}"
-    },
     "step": {
       "user": {
         "data": {
@@ -19,15 +16,9 @@
           "include_only_feed_id": "Choose feeds to include"
         }
       }
-    },
-    "abort": {
-      "already_configured": "This server is already configured"
     }
   },
   "options": {
-    "error": {
-      "api_error": "[%key:component::emoncms::config::error::api_error%]"
-    },
     "step": {
       "init": {
         "data": {
@@ -44,10 +35,6 @@
     "missing_include_only_feed_id": {
       "title": "No feed synchronized with the {domain} sensor",
       "description": "Configuring {domain} using YAML is being removed.\n\nPlease add manually the feeds you want to synchronize with the `configure` button of the integration."
-    },
-    "migrate_database": {
-      "title": "Upgrade your emoncms version",
-      "description": "Your [emoncms]({url}) does not ship a unique identifier.\n\n Please upgrade to at least version 11.5.7 and migrate your emoncms database.\n\n More info on [emoncms documentation]({doc_url})"
     }
   }
 }
diff --git a/homeassistant/components/emonitor/__init__.py b/homeassistant/components/emonitor/__init__.py
index 4316487352b..7506edae1d3 100644
--- a/homeassistant/components/emonitor/__init__.py
+++ b/homeassistant/components/emonitor/__init__.py
@@ -31,7 +31,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: EmonitorConfigEntry) ->
     coordinator = DataUpdateCoordinator[EmonitorStatus](
         hass,
         _LOGGER,
-        config_entry=entry,
         name=entry.title,
         update_method=emonitor.async_get_status,
         update_interval=timedelta(seconds=DEFAULT_UPDATE_RATE),
diff --git a/homeassistant/components/emulated_kasa/manifest.json b/homeassistant/components/emulated_kasa/manifest.json
index d4889c0c5f5..640a2113d6f 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.13.3"]
+  "requirements": ["sense-energy==0.12.4"]
 }
diff --git a/homeassistant/components/energy/data.py b/homeassistant/components/energy/data.py
index ff86177cf41..9c5a9fbacd1 100644
--- a/homeassistant/components/energy/data.py
+++ b/homeassistant/components/energy/data.py
@@ -331,7 +331,7 @@ class EnergyManager:
             "device_consumption",
         ):
             if key in update:
-                data[key] = update[key]
+                data[key] = update[key]  # type: ignore[literal-required]
 
         self.data = data
         self._store.async_delay_save(lambda: data, 60)
diff --git a/homeassistant/components/enphase_envoy/config_flow.py b/homeassistant/components/enphase_envoy/config_flow.py
index 23c769293c8..d04f77d8e88 100644
--- a/homeassistant/components/enphase_envoy/config_flow.py
+++ b/homeassistant/components/enphase_envoy/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant, callback
@@ -66,11 +66,9 @@ class EnphaseConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> EnvoyOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> EnvoyOptionsFlowHandler:
         """Options flow handler for Enphase_Envoy."""
-        return EnvoyOptionsFlowHandler()
+        return EnvoyOptionsFlowHandler(config_entry)
 
     @callback
     def _async_generate_schema(self) -> vol.Schema:
@@ -290,7 +288,7 @@ class EnphaseConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class EnvoyOptionsFlowHandler(OptionsFlow):
+class EnvoyOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Envoy config flow options handler."""
 
     async def async_step_init(
diff --git a/homeassistant/components/envisalink/alarm_control_panel.py b/homeassistant/components/envisalink/alarm_control_panel.py
index ce65178b8d8..4ad9a927d9c 100644
--- a/homeassistant/components/envisalink/alarm_control_panel.py
+++ b/homeassistant/components/envisalink/alarm_control_panel.py
@@ -9,10 +9,20 @@ import voluptuous as vol
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
-from homeassistant.const import ATTR_ENTITY_ID, CONF_CODE
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    CONF_CODE,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+    STATE_UNKNOWN,
+)
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -134,24 +144,24 @@ class EnvisalinkAlarm(EnvisalinkEntity, AlarmControlPanelEntity):
             self.async_write_ha_state()
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str:
         """Return the state of the device."""
-        state = None
+        state = STATE_UNKNOWN
 
         if self._info["status"]["alarm"]:
-            state = AlarmControlPanelState.TRIGGERED
+            state = STATE_ALARM_TRIGGERED
         elif self._info["status"]["armed_zero_entry_delay"]:
-            state = AlarmControlPanelState.ARMED_NIGHT
+            state = STATE_ALARM_ARMED_NIGHT
         elif self._info["status"]["armed_away"]:
-            state = AlarmControlPanelState.ARMED_AWAY
+            state = STATE_ALARM_ARMED_AWAY
         elif self._info["status"]["armed_stay"]:
-            state = AlarmControlPanelState.ARMED_HOME
+            state = STATE_ALARM_ARMED_HOME
         elif self._info["status"]["exit_delay"]:
-            state = AlarmControlPanelState.ARMING
+            state = STATE_ALARM_ARMING
         elif self._info["status"]["entry_delay"]:
-            state = AlarmControlPanelState.PENDING
+            state = STATE_ALARM_PENDING
         elif self._info["status"]["alpha"]:
-            state = AlarmControlPanelState.DISARMED
+            state = STATE_ALARM_DISARMED
         return state
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
diff --git a/homeassistant/components/eq3btsmart/__init__.py b/homeassistant/components/eq3btsmart/__init__.py
index 84b27161edd..f63e627ea7d 100644
--- a/homeassistant/components/eq3btsmart/__init__.py
+++ b/homeassistant/components/eq3btsmart/__init__.py
@@ -15,23 +15,17 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-from .const import SIGNAL_THERMOSTAT_CONNECTED, SIGNAL_THERMOSTAT_DISCONNECTED
+from .const import DOMAIN, SIGNAL_THERMOSTAT_CONNECTED, SIGNAL_THERMOSTAT_DISCONNECTED
 from .models import Eq3Config, Eq3ConfigEntryData
 
 PLATFORMS = [
-    Platform.BINARY_SENSOR,
     Platform.CLIMATE,
-    Platform.NUMBER,
-    Platform.SWITCH,
 ]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-type Eq3ConfigEntry = ConfigEntry[Eq3ConfigEntryData]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Handle config entry setup."""
 
     mac_address: str | None = entry.unique_id
@@ -59,11 +53,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
         ble_device=device,
     )
 
-    entry.runtime_data = Eq3ConfigEntryData(
-        eq3_config=eq3_config, thermostat=thermostat
-    )
+    eq3_config_entry = Eq3ConfigEntryData(eq3_config=eq3_config, thermostat=thermostat)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = eq3_config_entry
+
     entry.async_on_unload(entry.add_update_listener(update_listener))
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
     entry.async_create_background_task(
         hass, _async_run_thermostat(hass, entry), entry.entry_id
     )
@@ -71,27 +66,29 @@ async def async_setup_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Handle config entry unload."""
 
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        await entry.runtime_data.thermostat.async_disconnect()
+        eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN].pop(entry.entry_id)
+        await eq3_config_entry.thermostat.async_disconnect()
 
     return unload_ok
 
 
-async def update_listener(hass: HomeAssistant, entry: Eq3ConfigEntry) -> None:
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle config entry update."""
 
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-async def _async_run_thermostat(hass: HomeAssistant, entry: Eq3ConfigEntry) -> None:
+async def _async_run_thermostat(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Run the thermostat."""
 
-    thermostat = entry.runtime_data.thermostat
-    mac_address = entry.runtime_data.eq3_config.mac_address
-    scan_interval = entry.runtime_data.eq3_config.scan_interval
+    eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN][entry.entry_id]
+    thermostat = eq3_config_entry.thermostat
+    mac_address = eq3_config_entry.eq3_config.mac_address
+    scan_interval = eq3_config_entry.eq3_config.scan_interval
 
     await _async_reconnect_thermostat(hass, entry)
 
@@ -120,14 +117,13 @@ async def _async_run_thermostat(hass: HomeAssistant, entry: Eq3ConfigEntry) -> N
         await asyncio.sleep(scan_interval)
 
 
-async def _async_reconnect_thermostat(
-    hass: HomeAssistant, entry: Eq3ConfigEntry
-) -> None:
+async def _async_reconnect_thermostat(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Reconnect the thermostat."""
 
-    thermostat = entry.runtime_data.thermostat
-    mac_address = entry.runtime_data.eq3_config.mac_address
-    scan_interval = entry.runtime_data.eq3_config.scan_interval
+    eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN][entry.entry_id]
+    thermostat = eq3_config_entry.thermostat
+    mac_address = eq3_config_entry.eq3_config.mac_address
+    scan_interval = eq3_config_entry.eq3_config.scan_interval
 
     while True:
         try:
diff --git a/homeassistant/components/eq3btsmart/binary_sensor.py b/homeassistant/components/eq3btsmart/binary_sensor.py
deleted file mode 100644
index 27525d47972..00000000000
--- a/homeassistant/components/eq3btsmart/binary_sensor.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""Platform for eq3 binary sensor entities."""
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from eq3btsmart.models import Status
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import Eq3ConfigEntry
-from .const import ENTITY_KEY_BATTERY, ENTITY_KEY_DST, ENTITY_KEY_WINDOW
-from .entity import Eq3Entity
-
-
-@dataclass(frozen=True, kw_only=True)
-class Eq3BinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Entity description for eq3 binary sensors."""
-
-    value_func: Callable[[Status], bool]
-
-
-BINARY_SENSOR_ENTITY_DESCRIPTIONS = [
-    Eq3BinarySensorEntityDescription(
-        value_func=lambda status: status.is_low_battery,
-        key=ENTITY_KEY_BATTERY,
-        device_class=BinarySensorDeviceClass.BATTERY,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    Eq3BinarySensorEntityDescription(
-        value_func=lambda status: status.is_window_open,
-        key=ENTITY_KEY_WINDOW,
-        device_class=BinarySensorDeviceClass.WINDOW,
-    ),
-    Eq3BinarySensorEntityDescription(
-        value_func=lambda status: status.is_dst,
-        key=ENTITY_KEY_DST,
-        translation_key=ENTITY_KEY_DST,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the entry."""
-
-    async_add_entities(
-        Eq3BinarySensorEntity(entry, entity_description)
-        for entity_description in BINARY_SENSOR_ENTITY_DESCRIPTIONS
-    )
-
-
-class Eq3BinarySensorEntity(Eq3Entity, BinarySensorEntity):
-    """Base class for eQ-3 binary sensor entities."""
-
-    entity_description: Eq3BinarySensorEntityDescription
-
-    def __init__(
-        self,
-        entry: Eq3ConfigEntry,
-        entity_description: Eq3BinarySensorEntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-
-        super().__init__(entry, entity_description.key)
-        self.entity_description = entity_description
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the binary sensor."""
-
-        if TYPE_CHECKING:
-            assert self._thermostat.status is not None
-
-        return self.entity_description.value_func(self._thermostat.status)
diff --git a/homeassistant/components/eq3btsmart/climate.py b/homeassistant/components/eq3btsmart/climate.py
index ae01d0fc9a7..7b8ccb6c990 100644
--- a/homeassistant/components/eq3btsmart/climate.py
+++ b/homeassistant/components/eq3btsmart/climate.py
@@ -3,6 +3,7 @@
 import logging
 from typing import Any
 
+from eq3btsmart import Thermostat
 from eq3btsmart.const import EQ3BT_MAX_TEMP, EQ3BT_OFF_TEMP, Eq3Preset, OperationMode
 from eq3btsmart.exceptions import Eq3Exception
 
@@ -14,35 +15,45 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH
+from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import slugify
 
-from . import Eq3ConfigEntry
 from .const import (
+    DEVICE_MODEL,
+    DOMAIN,
     EQ_TO_HA_HVAC,
     HA_TO_EQ_HVAC,
+    MANUFACTURER,
+    SIGNAL_THERMOSTAT_CONNECTED,
+    SIGNAL_THERMOSTAT_DISCONNECTED,
     CurrentTemperatureSelector,
     Preset,
     TargetTemperatureSelector,
 )
 from .entity import Eq3Entity
+from .models import Eq3Config, Eq3ConfigEntryData
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: Eq3ConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Handle config entry setup."""
 
+    eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN][config_entry.entry_id]
+
     async_add_entities(
-        [Eq3Climate(entry)],
+        [Eq3Climate(eq3_config_entry.eq3_config, eq3_config_entry.thermostat)],
     )
 
 
@@ -69,6 +80,53 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
     _attr_preset_mode: str | None = None
     _target_temperature: float | None = None
 
+    def __init__(self, eq3_config: Eq3Config, thermostat: Thermostat) -> None:
+        """Initialize the climate entity."""
+
+        super().__init__(eq3_config, thermostat)
+        self._attr_unique_id = dr.format_mac(eq3_config.mac_address)
+        self._attr_device_info = DeviceInfo(
+            name=slugify(self._eq3_config.mac_address),
+            manufacturer=MANUFACTURER,
+            model=DEVICE_MODEL,
+            connections={(CONNECTION_BLUETOOTH, self._eq3_config.mac_address)},
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Run when entity about to be added to hass."""
+
+        self._thermostat.register_update_callback(self._async_on_updated)
+
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{SIGNAL_THERMOSTAT_DISCONNECTED}_{self._eq3_config.mac_address}",
+                self._async_on_disconnected,
+            )
+        )
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{SIGNAL_THERMOSTAT_CONNECTED}_{self._eq3_config.mac_address}",
+                self._async_on_connected,
+            )
+        )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Run when entity will be removed from hass."""
+
+        self._thermostat.unregister_update_callback(self._async_on_updated)
+
+    @callback
+    def _async_on_disconnected(self) -> None:
+        self._attr_available = False
+        self.async_write_ha_state()
+
+    @callback
+    def _async_on_connected(self) -> None:
+        self._attr_available = True
+        self.async_write_ha_state()
+
     @callback
     def _async_on_updated(self) -> None:
         """Handle updated data from the thermostat."""
@@ -79,15 +137,12 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
         if self._thermostat.device_data is not None:
             self._async_on_device_updated()
 
-        super()._async_on_updated()
+        self.async_write_ha_state()
 
     @callback
     def _async_on_status_updated(self) -> None:
         """Handle updated status from the thermostat."""
 
-        if self._thermostat.status is None:
-            return
-
         self._target_temperature = self._thermostat.status.target_temperature.value
         self._attr_hvac_mode = EQ_TO_HA_HVAC[self._thermostat.status.operation_mode]
         self._attr_current_temperature = self._get_current_temperature()
@@ -99,16 +154,13 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
     def _async_on_device_updated(self) -> None:
         """Handle updated device data from the thermostat."""
 
-        if self._thermostat.device_data is None:
-            return
-
         device_registry = dr.async_get(self.hass)
         if device := device_registry.async_get_device(
             connections={(CONNECTION_BLUETOOTH, self._eq3_config.mac_address)},
         ):
             device_registry.async_update_device(
                 device.id,
-                sw_version=str(self._thermostat.device_data.firmware_version),
+                sw_version=self._thermostat.device_data.firmware_version,
                 serial_number=self._thermostat.device_data.device_serial.value,
             )
 
@@ -213,7 +265,7 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
         self.async_write_ha_state()
 
         try:
-            await self._thermostat.async_set_temperature(temperature)
+            await self._thermostat.async_set_temperature(self._target_temperature)
         except Eq3Exception:
             _LOGGER.error(
                 "[%s] Failed setting temperature", self._eq3_config.mac_address
diff --git a/homeassistant/components/eq3btsmart/const.py b/homeassistant/components/eq3btsmart/const.py
index 78292940e60..111c4d0eba4 100644
--- a/homeassistant/components/eq3btsmart/const.py
+++ b/homeassistant/components/eq3btsmart/const.py
@@ -18,20 +18,9 @@ DOMAIN = "eq3btsmart"
 MANUFACTURER = "eQ-3 AG"
 DEVICE_MODEL = "CC-RT-BLE-EQ"
 
-ENTITY_KEY_DST = "dst"
-ENTITY_KEY_BATTERY = "battery"
-ENTITY_KEY_WINDOW = "window"
-ENTITY_KEY_LOCK = "lock"
-ENTITY_KEY_BOOST = "boost"
-ENTITY_KEY_AWAY = "away"
-ENTITY_KEY_COMFORT = "comfort"
-ENTITY_KEY_ECO = "eco"
-ENTITY_KEY_OFFSET = "offset"
-ENTITY_KEY_WINDOW_OPEN_TEMPERATURE = "window_open_temperature"
-ENTITY_KEY_WINDOW_OPEN_TIMEOUT = "window_open_timeout"
-
 GET_DEVICE_TIMEOUT = 5  # seconds
 
+
 EQ_TO_HA_HVAC: dict[OperationMode, HVACMode] = {
     OperationMode.OFF: HVACMode.OFF,
     OperationMode.ON: HVACMode.HEAT,
@@ -82,5 +71,3 @@ DEFAULT_SCAN_INTERVAL = 10  # seconds
 
 SIGNAL_THERMOSTAT_DISCONNECTED = f"{DOMAIN}.thermostat_disconnected"
 SIGNAL_THERMOSTAT_CONNECTED = f"{DOMAIN}.thermostat_connected"
-
-EQ3BT_STEP = 0.5
diff --git a/homeassistant/components/eq3btsmart/entity.py b/homeassistant/components/eq3btsmart/entity.py
index e68545c08c7..e8c00d4e3cf 100644
--- a/homeassistant/components/eq3btsmart/entity.py
+++ b/homeassistant/components/eq3btsmart/entity.py
@@ -1,22 +1,10 @@
 """Base class for all eQ-3 entities."""
 
-from homeassistant.core import callback
-from homeassistant.helpers.device_registry import (
-    CONNECTION_BLUETOOTH,
-    DeviceInfo,
-    format_mac,
-)
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import Entity
-from homeassistant.util import slugify
+from eq3btsmart.thermostat import Thermostat
 
-from . import Eq3ConfigEntry
-from .const import (
-    DEVICE_MODEL,
-    MANUFACTURER,
-    SIGNAL_THERMOSTAT_CONNECTED,
-    SIGNAL_THERMOSTAT_DISCONNECTED,
-)
+from homeassistant.helpers.entity import Entity
+
+from .models import Eq3Config
 
 
 class Eq3Entity(Entity):
@@ -24,70 +12,8 @@ class Eq3Entity(Entity):
 
     _attr_has_entity_name = True
 
-    def __init__(
-        self,
-        entry: Eq3ConfigEntry,
-        unique_id_key: str | None = None,
-    ) -> None:
+    def __init__(self, eq3_config: Eq3Config, thermostat: Thermostat) -> None:
         """Initialize the eq3 entity."""
 
-        self._eq3_config = entry.runtime_data.eq3_config
-        self._thermostat = entry.runtime_data.thermostat
-        self._attr_device_info = DeviceInfo(
-            name=slugify(self._eq3_config.mac_address),
-            manufacturer=MANUFACTURER,
-            model=DEVICE_MODEL,
-            connections={(CONNECTION_BLUETOOTH, self._eq3_config.mac_address)},
-        )
-        suffix = f"_{unique_id_key}" if unique_id_key else ""
-        self._attr_unique_id = f"{format_mac(self._eq3_config.mac_address)}{suffix}"
-
-    async def async_added_to_hass(self) -> None:
-        """Run when entity about to be added to hass."""
-
-        self._thermostat.register_update_callback(self._async_on_updated)
-
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                f"{SIGNAL_THERMOSTAT_DISCONNECTED}_{self._eq3_config.mac_address}",
-                self._async_on_disconnected,
-            )
-        )
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                f"{SIGNAL_THERMOSTAT_CONNECTED}_{self._eq3_config.mac_address}",
-                self._async_on_connected,
-            )
-        )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Run when entity will be removed from hass."""
-
-        self._thermostat.unregister_update_callback(self._async_on_updated)
-
-    def _async_on_updated(self) -> None:
-        """Handle updated data from the thermostat."""
-
-        self.async_write_ha_state()
-
-    @callback
-    def _async_on_disconnected(self) -> None:
-        """Handle disconnection from the thermostat."""
-
-        self._attr_available = False
-        self.async_write_ha_state()
-
-    @callback
-    def _async_on_connected(self) -> None:
-        """Handle connection to the thermostat."""
-
-        self._attr_available = True
-        self.async_write_ha_state()
-
-    @property
-    def available(self) -> bool:
-        """Whether the entity is available."""
-
-        return self._thermostat.status is not None and self._attr_available
+        self._eq3_config = eq3_config
+        self._thermostat = thermostat
diff --git a/homeassistant/components/eq3btsmart/icons.json b/homeassistant/components/eq3btsmart/icons.json
deleted file mode 100644
index e6eb7532f37..00000000000
--- a/homeassistant/components/eq3btsmart/icons.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "entity": {
-    "binary_sensor": {
-      "dst": {
-        "default": "mdi:sun-clock",
-        "state": {
-          "off": "mdi:sun-clock-outline"
-        }
-      }
-    },
-    "number": {
-      "comfort": {
-        "default": "mdi:sun-thermometer"
-      },
-      "eco": {
-        "default": "mdi:snowflake-thermometer"
-      },
-      "offset": {
-        "default": "mdi:thermometer-plus"
-      },
-      "window_open_temperature": {
-        "default": "mdi:window-open-variant"
-      },
-      "window_open_timeout": {
-        "default": "mdi:timer-refresh"
-      }
-    },
-    "switch": {
-      "away": {
-        "default": "mdi:home-account",
-        "state": {
-          "on": "mdi:home-export"
-        }
-      },
-      "lock": {
-        "default": "mdi:lock",
-        "state": {
-          "off": "mdi:lock-off"
-        }
-      },
-      "boost": {
-        "default": "mdi:fire",
-        "state": {
-          "off": "mdi:fire-off"
-        }
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/eq3btsmart/manifest.json b/homeassistant/components/eq3btsmart/manifest.json
index b30f806bf63..e25c675bf82 100644
--- a/homeassistant/components/eq3btsmart/manifest.json
+++ b/homeassistant/components/eq3btsmart/manifest.json
@@ -23,5 +23,5 @@
   "iot_class": "local_polling",
   "loggers": ["eq3btsmart"],
   "quality_scale": "silver",
-  "requirements": ["eq3btsmart==1.4.1", "bleak-esphome==1.1.0"]
+  "requirements": ["eq3btsmart==1.2.0", "bleak-esphome==1.1.0"]
 }
diff --git a/homeassistant/components/eq3btsmart/models.py b/homeassistant/components/eq3btsmart/models.py
index 858465effa8..8ea0955dbdd 100644
--- a/homeassistant/components/eq3btsmart/models.py
+++ b/homeassistant/components/eq3btsmart/models.py
@@ -2,6 +2,7 @@
 
 from dataclasses import dataclass
 
+from eq3btsmart.const import DEFAULT_AWAY_HOURS, DEFAULT_AWAY_TEMP
 from eq3btsmart.thermostat import Thermostat
 
 from .const import (
@@ -22,6 +23,8 @@ class Eq3Config:
     target_temp_selector: TargetTemperatureSelector = DEFAULT_TARGET_TEMP_SELECTOR
     external_temp_sensor: str = ""
     scan_interval: int = DEFAULT_SCAN_INTERVAL
+    default_away_hours: float = DEFAULT_AWAY_HOURS
+    default_away_temperature: float = DEFAULT_AWAY_TEMP
 
 
 @dataclass(slots=True)
diff --git a/homeassistant/components/eq3btsmart/number.py b/homeassistant/components/eq3btsmart/number.py
deleted file mode 100644
index 2e069180fa3..00000000000
--- a/homeassistant/components/eq3btsmart/number.py
+++ /dev/null
@@ -1,158 +0,0 @@
-"""Platform for eq3 number entities."""
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from eq3btsmart import Thermostat
-from eq3btsmart.const import (
-    EQ3BT_MAX_OFFSET,
-    EQ3BT_MAX_TEMP,
-    EQ3BT_MIN_OFFSET,
-    EQ3BT_MIN_TEMP,
-)
-from eq3btsmart.models import Presets
-
-from homeassistant.components.number import (
-    NumberDeviceClass,
-    NumberEntity,
-    NumberEntityDescription,
-    NumberMode,
-)
-from homeassistant.const import EntityCategory, UnitOfTemperature, UnitOfTime
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import Eq3ConfigEntry
-from .const import (
-    ENTITY_KEY_COMFORT,
-    ENTITY_KEY_ECO,
-    ENTITY_KEY_OFFSET,
-    ENTITY_KEY_WINDOW_OPEN_TEMPERATURE,
-    ENTITY_KEY_WINDOW_OPEN_TIMEOUT,
-    EQ3BT_STEP,
-)
-from .entity import Eq3Entity
-
-
-@dataclass(frozen=True, kw_only=True)
-class Eq3NumberEntityDescription(NumberEntityDescription):
-    """Entity description for eq3 number entities."""
-
-    value_func: Callable[[Presets], float]
-    value_set_func: Callable[
-        [Thermostat],
-        Callable[[float], Awaitable[None]],
-    ]
-    mode: NumberMode = NumberMode.BOX
-    entity_category: EntityCategory | None = EntityCategory.CONFIG
-
-
-NUMBER_ENTITY_DESCRIPTIONS = [
-    Eq3NumberEntityDescription(
-        key=ENTITY_KEY_COMFORT,
-        value_func=lambda presets: presets.comfort_temperature.value,
-        value_set_func=lambda thermostat: thermostat.async_configure_comfort_temperature,
-        translation_key=ENTITY_KEY_COMFORT,
-        native_min_value=EQ3BT_MIN_TEMP,
-        native_max_value=EQ3BT_MAX_TEMP,
-        native_step=EQ3BT_STEP,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        device_class=NumberDeviceClass.TEMPERATURE,
-    ),
-    Eq3NumberEntityDescription(
-        key=ENTITY_KEY_ECO,
-        value_func=lambda presets: presets.eco_temperature.value,
-        value_set_func=lambda thermostat: thermostat.async_configure_eco_temperature,
-        translation_key=ENTITY_KEY_ECO,
-        native_min_value=EQ3BT_MIN_TEMP,
-        native_max_value=EQ3BT_MAX_TEMP,
-        native_step=EQ3BT_STEP,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        device_class=NumberDeviceClass.TEMPERATURE,
-    ),
-    Eq3NumberEntityDescription(
-        key=ENTITY_KEY_WINDOW_OPEN_TEMPERATURE,
-        value_func=lambda presets: presets.window_open_temperature.value,
-        value_set_func=lambda thermostat: thermostat.async_configure_window_open_temperature,
-        translation_key=ENTITY_KEY_WINDOW_OPEN_TEMPERATURE,
-        native_min_value=EQ3BT_MIN_TEMP,
-        native_max_value=EQ3BT_MAX_TEMP,
-        native_step=EQ3BT_STEP,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        device_class=NumberDeviceClass.TEMPERATURE,
-    ),
-    Eq3NumberEntityDescription(
-        key=ENTITY_KEY_OFFSET,
-        value_func=lambda presets: presets.offset_temperature.value,
-        value_set_func=lambda thermostat: thermostat.async_configure_temperature_offset,
-        translation_key=ENTITY_KEY_OFFSET,
-        native_min_value=EQ3BT_MIN_OFFSET,
-        native_max_value=EQ3BT_MAX_OFFSET,
-        native_step=EQ3BT_STEP,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        device_class=NumberDeviceClass.TEMPERATURE,
-    ),
-    Eq3NumberEntityDescription(
-        key=ENTITY_KEY_WINDOW_OPEN_TIMEOUT,
-        value_set_func=lambda thermostat: thermostat.async_configure_window_open_duration,
-        value_func=lambda presets: presets.window_open_time.value.total_seconds() / 60,
-        translation_key=ENTITY_KEY_WINDOW_OPEN_TIMEOUT,
-        native_min_value=0,
-        native_max_value=60,
-        native_step=5,
-        native_unit_of_measurement=UnitOfTime.MINUTES,
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the entry."""
-
-    async_add_entities(
-        Eq3NumberEntity(entry, entity_description)
-        for entity_description in NUMBER_ENTITY_DESCRIPTIONS
-    )
-
-
-class Eq3NumberEntity(Eq3Entity, NumberEntity):
-    """Base class for all eq3 number entities."""
-
-    entity_description: Eq3NumberEntityDescription
-
-    def __init__(
-        self, entry: Eq3ConfigEntry, entity_description: Eq3NumberEntityDescription
-    ) -> None:
-        """Initialize the entity."""
-
-        super().__init__(entry, entity_description.key)
-        self.entity_description = entity_description
-
-    @property
-    def native_value(self) -> float:
-        """Return the state of the entity."""
-
-        if TYPE_CHECKING:
-            assert self._thermostat.status is not None
-            assert self._thermostat.status.presets is not None
-
-        return self.entity_description.value_func(self._thermostat.status.presets)
-
-    async def async_set_native_value(self, value: float) -> None:
-        """Set the state of the entity."""
-
-        await self.entity_description.value_set_func(self._thermostat)(value)
-
-    @property
-    def available(self) -> bool:
-        """Return whether the entity is available."""
-
-        return (
-            self._thermostat.status is not None
-            and self._thermostat.status.presets is not None
-            and self._attr_available
-        )
diff --git a/homeassistant/components/eq3btsmart/strings.json b/homeassistant/components/eq3btsmart/strings.json
index acfd5082f45..5108baa1bcf 100644
--- a/homeassistant/components/eq3btsmart/strings.json
+++ b/homeassistant/components/eq3btsmart/strings.json
@@ -18,40 +18,5 @@
     "error": {
       "invalid_mac_address": "Invalid MAC address"
     }
-  },
-  "entity": {
-    "binary_sensor": {
-      "dst": {
-        "name": "Daylight saving time"
-      }
-    },
-    "number": {
-      "comfort": {
-        "name": "Comfort temperature"
-      },
-      "eco": {
-        "name": "Eco temperature"
-      },
-      "offset": {
-        "name": "Offset temperature"
-      },
-      "window_open_temperature": {
-        "name": "Window open temperature"
-      },
-      "window_open_timeout": {
-        "name": "Window open timeout"
-      }
-    },
-    "switch": {
-      "lock": {
-        "name": "Lock"
-      },
-      "boost": {
-        "name": "Boost"
-      },
-      "away": {
-        "name": "Away"
-      }
-    }
   }
 }
diff --git a/homeassistant/components/eq3btsmart/switch.py b/homeassistant/components/eq3btsmart/switch.py
deleted file mode 100644
index 7525d8ca494..00000000000
--- a/homeassistant/components/eq3btsmart/switch.py
+++ /dev/null
@@ -1,94 +0,0 @@
-"""Platform for eq3 switch entities."""
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
-
-from eq3btsmart import Thermostat
-from eq3btsmart.models import Status
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import Eq3ConfigEntry
-from .const import ENTITY_KEY_AWAY, ENTITY_KEY_BOOST, ENTITY_KEY_LOCK
-from .entity import Eq3Entity
-
-
-@dataclass(frozen=True, kw_only=True)
-class Eq3SwitchEntityDescription(SwitchEntityDescription):
-    """Entity description for eq3 switch entities."""
-
-    toggle_func: Callable[[Thermostat], Callable[[bool], Awaitable[None]]]
-    value_func: Callable[[Status], bool]
-
-
-SWITCH_ENTITY_DESCRIPTIONS = [
-    Eq3SwitchEntityDescription(
-        key=ENTITY_KEY_LOCK,
-        translation_key=ENTITY_KEY_LOCK,
-        toggle_func=lambda thermostat: thermostat.async_set_locked,
-        value_func=lambda status: status.is_locked,
-    ),
-    Eq3SwitchEntityDescription(
-        key=ENTITY_KEY_BOOST,
-        translation_key=ENTITY_KEY_BOOST,
-        toggle_func=lambda thermostat: thermostat.async_set_boost,
-        value_func=lambda status: status.is_boost,
-    ),
-    Eq3SwitchEntityDescription(
-        key=ENTITY_KEY_AWAY,
-        translation_key=ENTITY_KEY_AWAY,
-        toggle_func=lambda thermostat: thermostat.async_set_away,
-        value_func=lambda status: status.is_away,
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: Eq3ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the entry."""
-
-    async_add_entities(
-        Eq3SwitchEntity(entry, entity_description)
-        for entity_description in SWITCH_ENTITY_DESCRIPTIONS
-    )
-
-
-class Eq3SwitchEntity(Eq3Entity, SwitchEntity):
-    """Base class for eq3 switch entities."""
-
-    entity_description: Eq3SwitchEntityDescription
-
-    def __init__(
-        self,
-        entry: Eq3ConfigEntry,
-        entity_description: Eq3SwitchEntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-
-        super().__init__(entry, entity_description.key)
-        self.entity_description = entity_description
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the switch."""
-
-        await self.entity_description.toggle_func(self._thermostat)(True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the switch."""
-
-        await self.entity_description.toggle_func(self._thermostat)(False)
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the switch."""
-
-        if TYPE_CHECKING:
-            assert self._thermostat.status is not None
-
-        return self.entity_description.value_func(self._thermostat.status)
diff --git a/homeassistant/components/esphome/alarm_control_panel.py b/homeassistant/components/esphome/alarm_control_panel.py
index 8f1b5ae8b1a..64a0210f0f7 100644
--- a/homeassistant/components/esphome/alarm_control_panel.py
+++ b/homeassistant/components/esphome/alarm_control_panel.py
@@ -6,9 +6,9 @@ from functools import partial
 
 from aioesphomeapi import (
     AlarmControlPanelCommand,
-    AlarmControlPanelEntityState as ESPHomeAlarmControlPanelEntityState,
+    AlarmControlPanelEntityState,
     AlarmControlPanelInfo,
-    AlarmControlPanelState as ESPHomeAlarmControlPanelState,
+    AlarmControlPanelState,
     APIIntEnum,
     EntityInfo,
 )
@@ -16,9 +16,20 @@ from aioesphomeapi import (
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
+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 callback
 
 from .entity import (
@@ -29,21 +40,21 @@ from .entity import (
 )
 from .enum_mapper import EsphomeEnumMapper
 
-_ESPHOME_ACP_STATE_TO_HASS_STATE: EsphomeEnumMapper[
-    ESPHomeAlarmControlPanelState, AlarmControlPanelState
-] = EsphomeEnumMapper(
-    {
-        ESPHomeAlarmControlPanelState.DISARMED: AlarmControlPanelState.DISARMED,
-        ESPHomeAlarmControlPanelState.ARMED_HOME: AlarmControlPanelState.ARMED_HOME,
-        ESPHomeAlarmControlPanelState.ARMED_AWAY: AlarmControlPanelState.ARMED_AWAY,
-        ESPHomeAlarmControlPanelState.ARMED_NIGHT: AlarmControlPanelState.ARMED_NIGHT,
-        ESPHomeAlarmControlPanelState.ARMED_VACATION: AlarmControlPanelState.ARMED_VACATION,
-        ESPHomeAlarmControlPanelState.ARMED_CUSTOM_BYPASS: AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ESPHomeAlarmControlPanelState.PENDING: AlarmControlPanelState.PENDING,
-        ESPHomeAlarmControlPanelState.ARMING: AlarmControlPanelState.ARMING,
-        ESPHomeAlarmControlPanelState.DISARMING: AlarmControlPanelState.DISARMING,
-        ESPHomeAlarmControlPanelState.TRIGGERED: AlarmControlPanelState.TRIGGERED,
-    }
+_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,
+        }
+    )
 )
 
 
@@ -59,7 +70,7 @@ class EspHomeACPFeatures(APIIntEnum):
 
 
 class EsphomeAlarmControlPanel(
-    EsphomeEntity[AlarmControlPanelInfo, ESPHomeAlarmControlPanelEntityState],
+    EsphomeEntity[AlarmControlPanelInfo, AlarmControlPanelEntityState],
     AlarmControlPanelEntity,
 ):
     """An Alarm Control Panel implementation for ESPHome."""
@@ -90,7 +101,7 @@ class EsphomeAlarmControlPanel(
 
     @property
     @esphome_state_property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         return _ESPHOME_ACP_STATE_TO_HASS_STATE.from_esphome(self._state.state)
 
@@ -148,5 +159,5 @@ async_setup_entry = partial(
     platform_async_setup_entry,
     info_type=AlarmControlPanelInfo,
     entity_type=EsphomeAlarmControlPanel,
-    state_type=ESPHomeAlarmControlPanelEntityState,
+    state_type=AlarmControlPanelEntityState,
 )
diff --git a/homeassistant/components/esphome/assist_satellite.py b/homeassistant/components/esphome/assist_satellite.py
index dc513a03e02..019cf3e47ac 100644
--- a/homeassistant/components/esphome/assist_satellite.py
+++ b/homeassistant/components/esphome/assist_satellite.py
@@ -36,7 +36,7 @@ from homeassistant.components.intent import (
 )
 from homeassistant.components.media_player import async_process_play_media_url
 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 import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -108,7 +108,9 @@ class EsphomeAssistSatellite(
     """Satellite running ESPHome."""
 
     entity_description = assist_satellite.AssistSatelliteEntityDescription(
-        key="assist_satellite", translation_key="assist_satellite"
+        key="assist_satellite",
+        translation_key="assist_satellite",
+        entity_category=EntityCategory.CONFIG,
     )
 
     def __init__(
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index cb892b314cd..937cad040ea 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -21,6 +21,7 @@ import aiohttp
 import voluptuous as vol
 
 from homeassistant.components import dhcp, zeroconf
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import (
     SOURCE_REAUTH,
     ConfigEntry,
@@ -31,7 +32,6 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.helpers.service_info.mqtt import MqttServiceInfo
 from homeassistant.util.json import json_loads_object
 
@@ -257,9 +257,6 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         self, discovery_info: MqttServiceInfo
     ) -> ConfigFlowResult:
         """Handle MQTT discovery."""
-        if not discovery_info.payload:
-            return self.async_abort(reason="mqtt_missing_payload")
-
         device_info = json_loads_object(discovery_info.payload)
         if "mac" not in device_info:
             return self.async_abort(reason="mqtt_missing_mac")
@@ -485,12 +482,16 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/esphome/coordinator.py b/homeassistant/components/esphome/coordinator.py
index b31a74dcf3f..284e17fd183 100644
--- a/homeassistant/components/esphome/coordinator.py
+++ b/homeassistant/components/esphome/coordinator.py
@@ -31,7 +31,6 @@ class ESPHomeDashboardCoordinator(DataUpdateCoordinator[dict[str, ConfiguredDevi
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=None,
             name="ESPHome Dashboard",
             update_interval=timedelta(minutes=5),
             always_update=False,
diff --git a/homeassistant/components/esphome/ffmpeg_proxy.py b/homeassistant/components/esphome/ffmpeg_proxy.py
index cefe87f49ba..1003a0083e9 100644
--- a/homeassistant/components/esphome/ffmpeg_proxy.py
+++ b/homeassistant/components/esphome/ffmpeg_proxy.py
@@ -1,12 +1,10 @@
 """HTTP view that converts audio from a URL to a preferred format."""
 
 import asyncio
-from collections import defaultdict
 from dataclasses import dataclass, field
 from http import HTTPStatus
 import logging
 import secrets
-from typing import Final
 
 from aiohttp import web
 from aiohttp.abc import AbstractStreamWriter, BaseRequest
@@ -19,8 +17,6 @@ from .const import DATA_FFMPEG_PROXY
 
 _LOGGER = logging.getLogger(__name__)
 
-_MAX_CONVERSIONS_PER_DEVICE: Final[int] = 2
-
 
 def async_create_proxy_url(
     hass: HomeAssistant,
@@ -63,18 +59,13 @@ class FFmpegConversionInfo:
     proc: asyncio.subprocess.Process | None = None
     """Subprocess doing ffmpeg conversion."""
 
-    is_finished: bool = False
-    """True if conversion has finished."""
-
 
 @dataclass
 class FFmpegProxyData:
     """Data for ffmpeg proxy conversion."""
 
-    # device_id -> [info]
-    conversions: dict[str, list[FFmpegConversionInfo]] = field(
-        default_factory=lambda: defaultdict(list)
-    )
+    # device_id -> info
+    conversions: dict[str, FFmpegConversionInfo] = field(default_factory=dict)
 
     def async_create_proxy_url(
         self,
@@ -86,15 +77,8 @@ class FFmpegProxyData:
         width: int | None,
     ) -> str:
         """Create a one-time use proxy URL that automatically converts the media."""
-
-        # Remove completed conversions
-        device_conversions = [
-            info for info in self.conversions[device_id] if not info.is_finished
-        ]
-
-        while len(device_conversions) >= _MAX_CONVERSIONS_PER_DEVICE:
-            # Stop oldest conversion before adding a new one
-            convert_info = device_conversions[0]
+        if (convert_info := self.conversions.pop(device_id, None)) is not None:
+            # Stop existing conversion before overwriting info
             if (convert_info.proc is not None) and (
                 convert_info.proc.returncode is None
             ):
@@ -103,18 +87,12 @@ class FFmpegProxyData:
                 )
                 convert_info.proc.kill()
 
-            device_conversions = device_conversions[1:]
-
         convert_id = secrets.token_urlsafe(16)
-        device_conversions.append(
-            FFmpegConversionInfo(
-                convert_id, media_url, media_format, rate, channels, width
-            )
+        self.conversions[device_id] = FFmpegConversionInfo(
+            convert_id, media_url, media_format, rate, channels, width
         )
         _LOGGER.debug("Media URL allowed by proxy: %s", media_url)
 
-        self.conversions[device_id] = device_conversions
-
         return f"/api/esphome/ffmpeg_proxy/{device_id}/{convert_id}.{media_format}"
 
 
@@ -153,10 +131,11 @@ class FFmpegConvertResponse(web.StreamResponse):
         self.proxy_data = proxy_data
         self.chunk_size = chunk_size
 
-    async def transcode(
-        self, request: BaseRequest, writer: AbstractStreamWriter
-    ) -> None:
+    async def prepare(self, request: BaseRequest) -> AbstractStreamWriter | None:
         """Stream url through ffmpeg conversion and out to HTTP client."""
+        writer = await super().prepare(request)
+        assert writer is not None
+
         command_args = [
             "-i",
             self.convert_info.media_url,
@@ -188,24 +167,11 @@ class FFmpegConvertResponse(web.StreamResponse):
             *command_args,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
-            close_fds=False,  # use posix_spawn in CPython < 3.13
         )
 
         # Only one conversion process per device is allowed
         self.convert_info.proc = proc
 
-        # Create background task which will be cancelled when home assistant shuts down
-        write_task = self.hass.async_create_background_task(
-            self._write_ffmpeg_data(request, writer, proc), "ESPHome media proxy"
-        )
-        await write_task
-
-    async def _write_ffmpeg_data(
-        self,
-        request: BaseRequest,
-        writer: AbstractStreamWriter,
-        proc: asyncio.subprocess.Process,
-    ) -> None:
         assert proc.stdout is not None
         assert proc.stderr is not None
 
@@ -215,15 +181,12 @@ class FFmpegConvertResponse(web.StreamResponse):
                 self.hass.is_running
                 and (request.transport is not None)
                 and (not request.transport.is_closing())
+                and (proc.returncode is None)
                 and (chunk := await proc.stdout.read(self.chunk_size))
             ):
-                await self.write(chunk)
+                await writer.write(chunk)
+                await writer.drain()
         except asyncio.CancelledError:
-            _LOGGER.debug("ffmpeg transcoding cancelled")
-            # Abort the transport, we don't wait for ESPHome to drain the write buffer;
-            # it may need a very long time or never finish if the player is paused.
-            if request.transport:
-                request.transport.abort()
             raise  # don't log error
         except:
             _LOGGER.exception("Unexpected error during ffmpeg conversion")
@@ -236,16 +199,14 @@ class FFmpegConvertResponse(web.StreamResponse):
 
             raise
         finally:
-            # Allow conversion info to be removed
-            self.convert_info.is_finished = True
-
             # Terminate hangs, so kill is used
             if proc.returncode is None:
                 proc.kill()
 
-            # Close connection by writing EOF unless already closing
-            if request.transport and not request.transport.is_closing():
-                await writer.write_eof()
+            # Close connection
+            await writer.write_eof()
+
+        return writer
 
 
 class FFmpegProxyView(HomeAssistantView):
@@ -264,8 +225,7 @@ class FFmpegProxyView(HomeAssistantView):
         self, request: web.Request, device_id: str, filename: str
     ) -> web.StreamResponse:
         """Start a get request."""
-        device_conversions = self.proxy_data.conversions[device_id]
-        if not device_conversions:
+        if (convert_info := self.proxy_data.conversions.get(device_id)) is None:
             return web.Response(
                 body="No proxy URL for device", status=HTTPStatus.NOT_FOUND
             )
@@ -273,16 +233,9 @@ class FFmpegProxyView(HomeAssistantView):
         # {id}.mp3 -> id, mp3
         convert_id, media_format = filename.rsplit(".")
 
-        # Look up conversion info
-        convert_info: FFmpegConversionInfo | None = None
-        for maybe_convert_info in device_conversions:
-            if (maybe_convert_info.convert_id == convert_id) and (
-                maybe_convert_info.media_format == media_format
-            ):
-                convert_info = maybe_convert_info
-                break
-
-        if convert_info is None:
+        if (convert_info.convert_id != convert_id) or (
+            convert_info.media_format != media_format
+        ):
             return web.Response(body="Invalid proxy URL", status=HTTPStatus.BAD_REQUEST)
 
         # Stop previous process if the URL is being reused.
@@ -293,10 +246,6 @@ class FFmpegProxyView(HomeAssistantView):
             convert_info.proc = None
 
         # Stream converted audio back to client
-        resp = FFmpegConvertResponse(
+        return FFmpegConvertResponse(
             self.manager, convert_info, device_id, self.proxy_data
         )
-        writer = await resp.prepare(request)
-        assert writer is not None
-        await resp.transcode(request, writer)
-        return resp
diff --git a/homeassistant/components/esphome/manager.py b/homeassistant/components/esphome/manager.py
index 007b4e791e1..c36a55d1f55 100644
--- a/homeassistant/components/esphome/manager.py
+++ b/homeassistant/components/esphome/manager.py
@@ -570,11 +570,7 @@ def _async_setup_device_registry(
     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))
-        and dashboard.data
-        and dashboard.data.get(device_info.name)
-    ):
+    elif dashboard := async_get_dashboard(hass):
         configuration_url = f"homeassistant://hassio/ingress/{dashboard.addon_slug}"
 
     manufacturer = "espressif"
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index b9b6a98dcd1..410c826c5a0 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==27.0.1",
+    "aioesphomeapi==27.0.0",
     "esphome-dashboard-api==1.2.3",
     "bleak-esphome==1.1.0"
   ],
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index 18a54772e30..ec7e6f674b3 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -8,8 +8,7 @@
       "service_received": "Action received",
       "mqtt_missing_mac": "Missing MAC address in MQTT properties.",
       "mqtt_missing_api": "Missing API port in MQTT properties.",
-      "mqtt_missing_ip": "Missing IP address in MQTT properties.",
-      "mqtt_missing_payload": "Missing MQTT Payload."
+      "mqtt_missing_ip": "Missing IP address in MQTT properties."
     },
     "error": {
       "resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address",
diff --git a/homeassistant/components/esphome/update.py b/homeassistant/components/esphome/update.py
index 5e571399ecb..b7905fb4fdb 100644
--- a/homeassistant/components/esphome/update.py
+++ b/homeassistant/components/esphome/update.py
@@ -230,8 +230,10 @@ class ESPHomeUpdateEntity(EsphomeEntity[UpdateInfo, UpdateState], UpdateEntity):
 
     @property
     @esphome_state_property
-    def in_progress(self) -> bool:
+    def in_progress(self) -> bool | int | None:
         """Return if the update is in progress."""
+        if self._state.has_progress:
+            return int(self._state.progress)
         return self._state.in_progress
 
     @property
@@ -258,14 +260,6 @@ class ESPHomeUpdateEntity(EsphomeEntity[UpdateInfo, UpdateState], UpdateEntity):
         """Return the title of the update."""
         return self._state.title
 
-    @property
-    @esphome_state_property
-    def update_percentage(self) -> int | None:
-        """Return if the update is in progress."""
-        if self._state.has_progress:
-            return int(self._state.progress)
-        return None
-
     @convert_api_error_ha_error
     async def async_update(self) -> None:
         """Command device to check for update."""
diff --git a/homeassistant/components/evohome/__init__.py b/homeassistant/components/evohome/__init__.py
index 612131919d4..58e0e16e059 100644
--- a/homeassistant/components/evohome/__init__.py
+++ b/homeassistant/components/evohome/__init__.py
@@ -176,7 +176,7 @@ class EvoSession:
         ):
             app_storage[ACCESS_TOKEN_EXPIRES] = dt_aware_to_naive(expires)
 
-        user_data: dict[str, str] = app_storage.pop(USER_DATA, {}) or {}
+        user_data: dict[str, str] = app_storage.pop(USER_DATA, {})
 
         self.session_id = user_data.get(SZ_SESSION_ID)
         self._tokens = app_storage
@@ -223,7 +223,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             config[DOMAIN][CONF_PASSWORD],
         )
 
-    except (evo.AuthenticationFailed, evo.RequestFailed) as err:
+    except evo.AuthenticationFailed as err:
         handle_evo_exception(err)
         return False
 
@@ -240,7 +240,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=None,
         name=f"{DOMAIN}_coordinator",
         update_interval=config[DOMAIN][CONF_SCAN_INTERVAL],
         update_method=broker.async_update,
diff --git a/homeassistant/components/evohome/climate.py b/homeassistant/components/evohome/climate.py
index 1388585bc17..5aa99bca60e 100644
--- a/homeassistant/components/evohome/climate.py
+++ b/homeassistant/components/evohome/climate.py
@@ -66,6 +66,8 @@ _LOGGER = logging.getLogger(__name__)
 PRESET_RESET = "Reset"  # reset all child zones to EVO_FOLLOW
 PRESET_CUSTOM = "Custom"
 
+HA_HVAC_TO_TCS = {HVACMode.OFF: EVO_HEATOFF, HVACMode.HEAT: EVO_AUTO}
+
 TCS_PRESET_TO_HA = {
     EVO_AWAY: PRESET_AWAY,
     EVO_CUSTOM: PRESET_CUSTOM,
@@ -148,10 +150,14 @@ async def async_setup_platform(
 class EvoClimateEntity(EvoDevice, ClimateEntity):
     """Base for any evohome-compatible climate entity (controller, zone)."""
 
-    _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _enable_turn_on_off_backwards_compatibility = False
 
+    @property
+    def hvac_modes(self) -> list[HVACMode]:
+        """Return a list of available hvac operation modes."""
+        return list(HA_HVAC_TO_TCS)
+
 
 class EvoZone(EvoChild, EvoClimateEntity):
     """Base for any evohome-compatible heating zone."""
@@ -359,9 +365,9 @@ class EvoController(EvoClimateEntity):
         self._attr_unique_id = evo_device.systemId
         self._attr_name = evo_device.location.name
 
-        self._evo_modes = [m[SZ_SYSTEM_MODE] for m in evo_device.allowedSystemModes]
+        modes = [m[SZ_SYSTEM_MODE] for m in evo_broker.tcs.allowedSystemModes]
         self._attr_preset_modes = [
-            TCS_PRESET_TO_HA[m] for m in self._evo_modes if m in list(TCS_PRESET_TO_HA)
+            TCS_PRESET_TO_HA[m] for m in modes if m in list(TCS_PRESET_TO_HA)
         ]
         if self._attr_preset_modes:
             self._attr_supported_features = ClimateEntityFeature.PRESET_MODE
@@ -395,14 +401,14 @@ class EvoController(EvoClimateEntity):
         """Set a Controller to any of its native EVO_* operating modes."""
         until = dt_util.as_utc(until) if until else None
         await self._evo_broker.call_client_api(
-            self._evo_device.set_mode(mode, until=until)  # type: ignore[arg-type]
+            self._evo_tcs.set_mode(mode, until=until)  # type: ignore[arg-type]
         )
 
     @property
     def hvac_mode(self) -> HVACMode:
         """Return the current operating mode of a Controller."""
-        evo_mode = self._evo_device.system_mode
-        return HVACMode.OFF if evo_mode in (EVO_HEATOFF, "Off") else HVACMode.HEAT
+        tcs_mode = self._evo_tcs.system_mode
+        return HVACMode.OFF if tcs_mode == EVO_HEATOFF else HVACMode.HEAT
 
     @property
     def current_temperature(self) -> float | None:
@@ -412,7 +418,7 @@ class EvoController(EvoClimateEntity):
         """
         temps = [
             z.temperature
-            for z in self._evo_device.zones.values()
+            for z in self._evo_tcs.zones.values()
             if z.temperature is not None
         ]
         return round(sum(temps) / len(temps), 1) if temps else None
@@ -420,9 +426,9 @@ class EvoController(EvoClimateEntity):
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode, e.g., home, away, temp."""
-        if not self._evo_device.system_mode:
+        if not self._evo_tcs.system_mode:
             return None
-        return TCS_PRESET_TO_HA.get(self._evo_device.system_mode)
+        return TCS_PRESET_TO_HA.get(self._evo_tcs.system_mode)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Raise exception as Controllers don't have a target temperature."""
@@ -430,13 +436,9 @@ class EvoController(EvoClimateEntity):
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set an operating mode for a Controller."""
-        if hvac_mode == HVACMode.HEAT:
-            evo_mode = EVO_AUTO if EVO_AUTO in self._evo_modes else "Heat"
-        elif hvac_mode == HVACMode.OFF:
-            evo_mode = EVO_HEATOFF if EVO_HEATOFF in self._evo_modes else "Off"
-        else:
+        if not (tcs_mode := HA_HVAC_TO_TCS.get(hvac_mode)):
             raise HomeAssistantError(f"Invalid hvac_mode: {hvac_mode}")
-        await self._set_tcs_mode(evo_mode)
+        await self._set_tcs_mode(tcs_mode)
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set the preset mode; if None, then revert to 'Auto' mode."""
@@ -449,6 +451,6 @@ class EvoController(EvoClimateEntity):
         attrs = self._device_state_attrs
         for attr in STATE_ATTRS_TCS:
             if attr == SZ_ACTIVE_FAULTS:
-                attrs["activeSystemFaults"] = getattr(self._evo_device, attr)
+                attrs["activeSystemFaults"] = getattr(self._evo_tcs, attr)
             else:
-                attrs[attr] = getattr(self._evo_device, attr)
+                attrs[attr] = getattr(self._evo_tcs, attr)
diff --git a/homeassistant/components/evohome/entity.py b/homeassistant/components/evohome/entity.py
index b5842c1073a..5da9df247cd 100644
--- a/homeassistant/components/evohome/entity.py
+++ b/homeassistant/components/evohome/entity.py
@@ -42,6 +42,7 @@ class EvoDevice(Entity):
         """Initialize an evohome-compatible entity (TCS, DHW, zone)."""
         self._evo_device = evo_device
         self._evo_broker = evo_broker
+        self._evo_tcs = evo_broker.tcs
 
         self._device_state_attrs: dict[str, Any] = {}
 
@@ -100,8 +101,6 @@ class EvoChild(EvoDevice):
         """Initialize an evohome-compatible child entity (DHW, zone)."""
         super().__init__(evo_broker, evo_device)
 
-        self._evo_tcs = evo_device.tcs
-
         self._schedule: dict[str, Any] = {}
         self._setpoints: dict[str, Any] = {}
 
diff --git a/homeassistant/components/ezviz/alarm_control_panel.py b/homeassistant/components/ezviz/alarm_control_panel.py
index f30a7852b4e..21e9f2d0422 100644
--- a/homeassistant/components/ezviz/alarm_control_panel.py
+++ b/homeassistant/components/ezviz/alarm_control_panel.py
@@ -13,9 +13,13 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityDescription,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -41,9 +45,9 @@ ALARM_TYPE = EzvizAlarmControlPanelEntityDescription(
     key="ezviz_alarm",
     ezviz_alarm_states=[
         None,
-        AlarmControlPanelState.DISARMED,
-        AlarmControlPanelState.ARMED_AWAY,
-        AlarmControlPanelState.ARMED_HOME,
+        STATE_ALARM_DISARMED,
+        STATE_ALARM_ARMED_AWAY,
+        STATE_ALARM_ARMED_HOME,
     ],
 )
 
@@ -92,7 +96,7 @@ class EzvizAlarm(AlarmControlPanelEntity):
         self._attr_device_info = device_info
         self.entity_description = entity_description
         self.coordinator = coordinator
-        self._attr_alarm_state = None
+        self._attr_state = None
 
     async def async_added_to_hass(self) -> None:
         """Entity added to hass."""
@@ -104,7 +108,7 @@ class EzvizAlarm(AlarmControlPanelEntity):
             if self.coordinator.ezviz_client.api_set_defence_mode(
                 DefenseModeType.HOME_MODE.value
             ):
-                self._attr_alarm_state = AlarmControlPanelState.DISARMED
+                self._attr_state = STATE_ALARM_DISARMED
 
         except PyEzvizError as err:
             raise HomeAssistantError("Cannot disarm EZVIZ alarm") from err
@@ -115,7 +119,7 @@ class EzvizAlarm(AlarmControlPanelEntity):
             if self.coordinator.ezviz_client.api_set_defence_mode(
                 DefenseModeType.AWAY_MODE.value
             ):
-                self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+                self._attr_state = STATE_ALARM_ARMED_AWAY
 
         except PyEzvizError as err:
             raise HomeAssistantError("Cannot arm EZVIZ alarm") from err
@@ -126,7 +130,7 @@ class EzvizAlarm(AlarmControlPanelEntity):
             if self.coordinator.ezviz_client.api_set_defence_mode(
                 DefenseModeType.SLEEP_MODE.value
             ):
-                self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+                self._attr_state = STATE_ALARM_ARMED_HOME
 
         except PyEzvizError as err:
             raise HomeAssistantError("Cannot arm EZVIZ alarm") from err
@@ -141,7 +145,7 @@ class EzvizAlarm(AlarmControlPanelEntity):
             _LOGGER.debug(
                 "Updating EZVIZ alarm with response %s", ezviz_alarm_state_number
             )
-            self._attr_alarm_state = self.entity_description.ezviz_alarm_states[
+            self._attr_state = self.entity_description.ezviz_alarm_states[
                 int(ezviz_alarm_state_number)
             ]
 
diff --git a/homeassistant/components/ezviz/config_flow.py b/homeassistant/components/ezviz/config_flow.py
index a7551737c10..aa998cc6f60 100644
--- a/homeassistant/components/ezviz/config_flow.py
+++ b/homeassistant/components/ezviz/config_flow.py
@@ -150,7 +150,7 @@ class EzvizConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> EzvizOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return EzvizOptionsFlowHandler()
+        return EzvizOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -391,6 +391,10 @@ class EzvizConfigFlow(ConfigFlow, domain=DOMAIN):
 class EzvizOptionsFlowHandler(OptionsFlow):
     """Handle EZVIZ client options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/ezviz/update.py b/homeassistant/components/ezviz/update.py
index 25a506a0052..05735d152cf 100644
--- a/homeassistant/components/ezviz/update.py
+++ b/homeassistant/components/ezviz/update.py
@@ -73,9 +73,11 @@ class EzvizUpdateEntity(EzvizEntity, UpdateEntity):
         return self.data["version"]
 
     @property
-    def in_progress(self) -> bool:
+    def in_progress(self) -> bool | int | None:
         """Update installation progress."""
-        return bool(self.data["upgrade_in_progress"])
+        if self.data["upgrade_in_progress"]:
+            return self.data["upgrade_percent"]
+        return False
 
     @property
     def latest_version(self) -> str | None:
@@ -91,13 +93,6 @@ class EzvizUpdateEntity(EzvizEntity, UpdateEntity):
             return self.data["latest_firmware_info"].get("desc")
         return None
 
-    @property
-    def update_percentage(self) -> int | None:
-        """Update installation progress."""
-        if self.data["upgrade_in_progress"]:
-            return self.data["upgrade_percent"]
-        return None
-
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
     ) -> None:
diff --git a/homeassistant/components/feedreader/config_flow.py b/homeassistant/components/feedreader/config_flow.py
index b902d48a1c8..2a73e24a3e5 100644
--- a/homeassistant/components/feedreader/config_flow.py
+++ b/homeassistant/components/feedreader/config_flow.py
@@ -15,6 +15,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant, callback
@@ -45,11 +46,9 @@ class FeedReaderConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> OptionsFlow:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return FeedReaderOptionsFlowHandler()
+        return FeedReaderOptionsFlowHandler(config_entry)
 
     def show_user_form(
         self,
@@ -148,7 +147,7 @@ class FeedReaderConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_abort(reason="reconfigure_successful")
 
 
-class FeedReaderOptionsFlowHandler(OptionsFlow):
+class FeedReaderOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle an options flow."""
 
     async def async_step_init(
@@ -163,9 +162,7 @@ class FeedReaderOptionsFlowHandler(OptionsFlow):
             {
                 vol.Optional(
                     CONF_MAX_ENTRIES,
-                    default=self.config_entry.options.get(
-                        CONF_MAX_ENTRIES, DEFAULT_MAX_ENTRIES
-                    ),
+                    default=self.options.get(CONF_MAX_ENTRIES, DEFAULT_MAX_ENTRIES),
                 ): cv.positive_int,
             }
         )
diff --git a/homeassistant/components/ffmpeg/manifest.json b/homeassistant/components/ffmpeg/manifest.json
index 085db6791b3..e5f4f8b93a8 100644
--- a/homeassistant/components/ffmpeg/manifest.json
+++ b/homeassistant/components/ffmpeg/manifest.json
@@ -4,5 +4,5 @@
   "codeowners": [],
   "documentation": "https://www.home-assistant.io/integrations/ffmpeg",
   "integration_type": "system",
-  "requirements": ["ha-ffmpeg==3.2.2"]
+  "requirements": ["ha-ffmpeg==3.2.1"]
 }
diff --git a/homeassistant/components/fibaro/config_flow.py b/homeassistant/components/fibaro/config_flow.py
index 0ffd9aaa48f..95f3c374e9a 100644
--- a/homeassistant/components/fibaro/config_flow.py
+++ b/homeassistant/components/fibaro/config_flow.py
@@ -10,7 +10,7 @@ from slugify import slugify
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_URL, CONF_USERNAME
+from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
 from . import FibaroAuthFailed, FibaroConnectFailed, init_controller
@@ -117,8 +117,5 @@ class FibaroConfigFlow(ConfigFlow, domain=DOMAIN):
             step_id="reauth_confirm",
             data_schema=vol.Schema({vol.Required(CONF_PASSWORD): str}),
             errors=errors,
-            description_placeholders={
-                CONF_USERNAME: reauth_entry.data[CONF_USERNAME],
-                CONF_NAME: reauth_entry.title,
-            },
+            description_placeholders={CONF_USERNAME: reauth_entry.data[CONF_USERNAME]},
         )
diff --git a/homeassistant/components/fibaro/cover.py b/homeassistant/components/fibaro/cover.py
index c787ca70272..fc28e57af70 100644
--- a/homeassistant/components/fibaro/cover.py
+++ b/homeassistant/components/fibaro/cover.py
@@ -79,28 +79,6 @@ class FibaroCover(FibaroEntity, CoverEntity):
         """Return the current tilt position for venetian blinds."""
         return self.bound(self.level2)
 
-    @property
-    def is_opening(self) -> bool | None:
-        """Return if the cover is opening or not.
-
-        Be aware that this property is only available for some modern devices.
-        For example the Fibaro Roller Shutter 4 reports this correctly.
-        """
-        if self.fibaro_device.state.has_value:
-            return self.fibaro_device.state.str_value().lower() == "opening"
-        return None
-
-    @property
-    def is_closing(self) -> bool | None:
-        """Return if the cover is closing or not.
-
-        Be aware that this property is only available for some modern devices.
-        For example the Fibaro Roller Shutter 4 reports this correctly.
-        """
-        if self.fibaro_device.state.has_value:
-            return self.fibaro_device.state.str_value().lower() == "closing"
-        return None
-
     def set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
         self.set_level(cast(int, kwargs.get(ATTR_POSITION)))
diff --git a/homeassistant/components/fibaro/manifest.json b/homeassistant/components/fibaro/manifest.json
index d2a1186b05b..39850672d06 100644
--- a/homeassistant/components/fibaro/manifest.json
+++ b/homeassistant/components/fibaro/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["pyfibaro"],
-  "requirements": ["pyfibaro==0.8.0"]
+  "requirements": ["pyfibaro==0.7.8"]
 }
diff --git a/homeassistant/components/file/__init__.py b/homeassistant/components/file/__init__.py
index 7bc206057c8..0c9cfee5f4d 100644
--- a/homeassistant/components/file/__init__.py
+++ b/homeassistant/components/file/__init__.py
@@ -3,16 +3,88 @@
 from copy import deepcopy
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_FILE_PATH, CONF_NAME, CONF_PLATFORM, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.components.notify import migrate_notify_issue
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.const import (
+    CONF_FILE_PATH,
+    CONF_NAME,
+    CONF_PLATFORM,
+    CONF_SCAN_INTERVAL,
+    Platform,
+)
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import (
+    config_validation as cv,
+    discovery,
+    issue_registry as ir,
+)
+from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
+from .notify import PLATFORM_SCHEMA as NOTIFY_PLATFORM_SCHEMA
+from .sensor import PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA
+
+IMPORT_SCHEMA = {
+    Platform.SENSOR: SENSOR_PLATFORM_SCHEMA,
+    Platform.NOTIFY: NOTIFY_PLATFORM_SCHEMA,
+}
+
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 PLATFORMS = [Platform.NOTIFY, Platform.SENSOR]
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the file integration."""
+
+    hass.data[DOMAIN] = config
+    if hass.config_entries.async_entries(DOMAIN):
+        # We skip import in case we already have config entries
+        return True
+    # The use of the legacy notify service was deprecated with HA Core 2024.6.0
+    # and will be removed with HA Core 2024.12
+    migrate_notify_issue(hass, DOMAIN, "File", "2024.12.0")
+    # The YAML config was imported with HA Core 2024.6.0 and will be removed with
+    # HA Core 2024.12
+    ir.async_create_issue(
+        hass,
+        HOMEASSISTANT_DOMAIN,
+        f"deprecated_yaml_{DOMAIN}",
+        breaks_in_ha_version="2024.12.0",
+        is_fixable=False,
+        issue_domain=DOMAIN,
+        learn_more_url="https://www.home-assistant.io/integrations/file/",
+        severity=ir.IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+        translation_placeholders={
+            "domain": DOMAIN,
+            "integration_title": "File",
+        },
+    )
+
+    # Import the YAML config into separate config entries
+    platforms_config: dict[Platform, list[ConfigType]] = {
+        domain: config[domain] for domain in PLATFORMS if domain in config
+    }
+    for domain, items in platforms_config.items():
+        for item in items:
+            if item[CONF_PLATFORM] == DOMAIN:
+                file_config_item = IMPORT_SCHEMA[domain](item)
+                file_config_item[CONF_PLATFORM] = domain
+                if CONF_SCAN_INTERVAL in file_config_item:
+                    del file_config_item[CONF_SCAN_INTERVAL]
+                hass.async_create_task(
+                    hass.config_entries.flow.async_init(
+                        DOMAIN,
+                        context={"source": SOURCE_IMPORT},
+                        data=file_config_item,
+                    )
+                )
+
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a file component entry."""
     config = {**entry.data, **entry.options}
@@ -30,6 +102,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         entry, [Platform(entry.data[CONF_PLATFORM])]
     )
     entry.async_on_unload(entry.add_update_listener(update_listener))
+    if entry.data[CONF_PLATFORM] == Platform.NOTIFY and CONF_NAME in entry.data:
+        # New notify entities are being setup through the config entry,
+        # but during the deprecation period we want to keep the legacy notify platform,
+        # so we forward the setup config through discovery.
+        # Only the entities from yaml will still be available as legacy service.
+        hass.async_create_task(
+            discovery.async_load_platform(
+                hass,
+                Platform.NOTIFY,
+                DOMAIN,
+                config,
+                hass.data[DOMAIN],
+            )
+        )
 
     return True
 
diff --git a/homeassistant/components/file/config_flow.py b/homeassistant/components/file/config_flow.py
index 992635d05fd..d74e36ce935 100644
--- a/homeassistant/components/file/config_flow.py
+++ b/homeassistant/components/file/config_flow.py
@@ -1,8 +1,7 @@
 """Config flow for file integration."""
 
-from __future__ import annotations
-
 from copy import deepcopy
+import os
 from typing import Any
 
 import voluptuous as vol
@@ -12,9 +11,11 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_FILE_PATH,
+    CONF_FILENAME,
     CONF_NAME,
     CONF_PLATFORM,
     CONF_UNIT_OF_MEASUREMENT,
@@ -73,11 +74,9 @@ class FileConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> FileOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return FileOptionsFlowHandler()
+        return FileOptionsFlowHandler(config_entry)
 
     async def validate_file_path(self, file_path: str) -> bool:
         """Ensure the file path is valid."""
@@ -130,8 +129,29 @@ class FileConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         """Handle file sensor config flow."""
         return await self._async_handle_step(Platform.SENSOR.value, user_input)
 
+    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+        """Import `file`` config from configuration.yaml."""
+        self._async_abort_entries_match(import_data)
+        platform = import_data[CONF_PLATFORM]
+        name: str = import_data.get(CONF_NAME, DEFAULT_NAME)
+        file_name: str
+        if platform == Platform.NOTIFY:
+            file_name = import_data.pop(CONF_FILENAME)
+            file_path: str = os.path.join(self.hass.config.config_dir, file_name)
+            import_data[CONF_FILE_PATH] = file_path
+        else:
+            file_path = import_data[CONF_FILE_PATH]
+        title = f"{name} [{file_path}]"
+        data = deepcopy(import_data)
+        options = {}
+        for key, value in import_data.items():
+            if key not in (CONF_FILE_PATH, CONF_PLATFORM, CONF_NAME):
+                data.pop(key)
+                options[key] = value
+        return self.async_create_entry(title=title, data=data, options=options)
 
-class FileOptionsFlowHandler(OptionsFlow):
+
+class FileOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle File options."""
 
     async def async_step_init(
diff --git a/homeassistant/components/file/notify.py b/homeassistant/components/file/notify.py
index 10e3d4a4ac6..9411b7cf1a8 100644
--- a/homeassistant/components/file/notify.py
+++ b/homeassistant/components/file/notify.py
@@ -2,23 +2,104 @@
 
 from __future__ import annotations
 
+from functools import partial
+import logging
 import os
 from typing import Any, TextIO
 
+import voluptuous as vol
+
 from homeassistant.components.notify import (
+    ATTR_TITLE,
     ATTR_TITLE_DEFAULT,
+    PLATFORM_SCHEMA as NOTIFY_PLATFORM_SCHEMA,
+    BaseNotificationService,
     NotifyEntity,
     NotifyEntityFeature,
+    migrate_notify_issue,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_FILE_PATH, CONF_NAME
+from homeassistant.const import CONF_FILE_PATH, CONF_FILENAME, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 import homeassistant.util.dt as dt_util
 
 from .const import CONF_TIMESTAMP, DEFAULT_NAME, DOMAIN, FILE_ICON
 
+_LOGGER = logging.getLogger(__name__)
+
+# The legacy platform schema uses a filename, after import
+# The full file path is stored in the config entry
+PLATFORM_SCHEMA = NOTIFY_PLATFORM_SCHEMA.extend(
+    {
+        vol.Required(CONF_FILENAME): cv.string,
+        vol.Optional(CONF_TIMESTAMP, default=False): cv.boolean,
+    }
+)
+
+
+async def async_get_service(
+    hass: HomeAssistant,
+    config: ConfigType,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> FileNotificationService | None:
+    """Get the file notification service."""
+    if discovery_info is None:
+        # We only set up through discovery
+        return None
+    file_path: str = discovery_info[CONF_FILE_PATH]
+    timestamp: bool = discovery_info[CONF_TIMESTAMP]
+
+    return FileNotificationService(file_path, timestamp)
+
+
+class FileNotificationService(BaseNotificationService):
+    """Implement the notification service for the File service."""
+
+    def __init__(self, file_path: str, add_timestamp: bool) -> None:
+        """Initialize the service."""
+        self._file_path = file_path
+        self.add_timestamp = add_timestamp
+
+    async def async_send_message(self, message: str = "", **kwargs: Any) -> None:
+        """Send a message to a file."""
+        # The use of the legacy notify service was deprecated with HA Core 2024.6.0
+        # and will be removed with HA Core 2024.12
+        migrate_notify_issue(
+            self.hass, DOMAIN, "File", "2024.12.0", service_name=self._service_name
+        )
+        await self.hass.async_add_executor_job(
+            partial(self.send_message, message, **kwargs)
+        )
+
+    def send_message(self, message: str = "", **kwargs: Any) -> None:
+        """Send a message to a file."""
+        file: TextIO
+        filepath = self._file_path
+        try:
+            with open(filepath, "a", encoding="utf8") as file:
+                if os.stat(filepath).st_size == 0:
+                    title = (
+                        f"{kwargs.get(ATTR_TITLE, ATTR_TITLE_DEFAULT)} notifications (Log"
+                        f" started: {dt_util.utcnow().isoformat()})\n{'-' * 80}\n"
+                    )
+                    file.write(title)
+
+                if self.add_timestamp:
+                    text = f"{dt_util.utcnow().isoformat()} {message}\n"
+                else:
+                    text = f"{message}\n"
+                file.write(text)
+        except OSError as exc:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="write_access_failed",
+                translation_placeholders={"filename": filepath, "exc": f"{exc!r}"},
+            ) from exc
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/file/sensor.py b/homeassistant/components/file/sensor.py
index 879c06e29f3..e37a3df86a6 100644
--- a/homeassistant/components/file/sensor.py
+++ b/homeassistant/components/file/sensor.py
@@ -6,8 +6,12 @@ import logging
 import os
 
 from file_read_backwards import FileReadBackwards
+import voluptuous as vol
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import (
+    PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
+    SensorEntity,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_FILE_PATH,
@@ -16,13 +20,38 @@ from homeassistant.const import (
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import 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 .const import DEFAULT_NAME, FILE_ICON
 
 _LOGGER = logging.getLogger(__name__)
 
+PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
+    {
+        vol.Required(CONF_FILE_PATH): cv.isfile,
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_VALUE_TEMPLATE): cv.string,
+        vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
+    }
+)
+
+
+async def async_setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the file sensor from YAML.
+
+    The YAML platform config is automatically
+    imported to a config entry, this method can be removed
+    when YAML support is removed.
+    """
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/file/strings.json b/homeassistant/components/file/strings.json
index 8806c67cd96..60ebf451f78 100644
--- a/homeassistant/components/file/strings.json
+++ b/homeassistant/components/file/strings.json
@@ -18,7 +18,7 @@
         },
         "data_description": {
           "file_path": "The local file path to retrieve the sensor value from",
-          "value_template": "A template to render the sensors value based on the file content",
+          "value_template": "A template to render the the sensors value based on the file content",
           "unit_of_measurement": "Unit of measurement for the sensor"
         }
       },
diff --git a/homeassistant/components/filter/strings.json b/homeassistant/components/filter/strings.json
index 461eed9aefa..2a83a05bb96 100644
--- a/homeassistant/components/filter/strings.json
+++ b/homeassistant/components/filter/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Filter",
   "services": {
     "reload": {
       "name": "[%key:common::action::reload%]",
diff --git a/homeassistant/components/fireservicerota/__init__.py b/homeassistant/components/fireservicerota/__init__.py
index aa303a08795..9173a2b3392 100644
--- a/homeassistant/components/fireservicerota/__init__.py
+++ b/homeassistant/components/fireservicerota/__init__.py
@@ -46,7 +46,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="duty binary sensor",
         update_method=async_update_data,
         update_interval=MIN_TIME_BETWEEN_UPDATES,
diff --git a/homeassistant/components/flux_led/config_flow.py b/homeassistant/components/flux_led/config_flow.py
index 9a02120f33a..d78fc699579 100644
--- a/homeassistant/components/flux_led/config_flow.py
+++ b/homeassistant/components/flux_led/config_flow.py
@@ -71,11 +71,9 @@ class FluxLedConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> FluxLedOptionsFlow:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for the Flux LED component."""
-        return FluxLedOptionsFlow()
+        return FluxLedOptionsFlow(config_entry)
 
     async def async_step_dhcp(
         self, discovery_info: dhcp.DhcpServiceInfo
@@ -322,6 +320,10 @@ class FluxLedConfigFlow(ConfigFlow, domain=DOMAIN):
 class FluxLedOptionsFlow(OptionsFlow):
     """Handle flux_led options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize the flux_led options flow."""
+        self._config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -330,7 +332,7 @@ class FluxLedOptionsFlow(OptionsFlow):
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)
 
-        options = self.config_entry.options
+        options = self._config_entry.options
         options_schema = vol.Schema(
             {
                 vol.Optional(
diff --git a/homeassistant/components/forecast_solar/config_flow.py b/homeassistant/components/forecast_solar/config_flow.py
index 9a64ce6e1fb..982f32eb07b 100644
--- a/homeassistant/components/forecast_solar/config_flow.py
+++ b/homeassistant/components/forecast_solar/config_flow.py
@@ -41,7 +41,7 @@ class ForecastSolarFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> ForecastSolarOptionFlowHandler:
         """Get the options flow for this handler."""
-        return ForecastSolarOptionFlowHandler()
+        return ForecastSolarOptionFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -91,6 +91,10 @@ class ForecastSolarFlowHandler(ConfigFlow, domain=DOMAIN):
 class ForecastSolarOptionFlowHandler(OptionsFlow):
     """Handle options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/forked_daapd/config_flow.py b/homeassistant/components/forked_daapd/config_flow.py
index 5fb9f08f1c0..5f061aa4be1 100644
--- a/homeassistant/components/forked_daapd/config_flow.py
+++ b/homeassistant/components/forked_daapd/config_flow.py
@@ -52,6 +52,10 @@ TEST_CONNECTION_ERROR_DICT = {
 class ForkedDaapdOptionsFlowHandler(OptionsFlow):
     """Handle a forked-daapd options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -118,7 +122,7 @@ class ForkedDaapdFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> ForkedDaapdOptionsFlowHandler:
         """Return options flow handler."""
-        return ForkedDaapdOptionsFlowHandler()
+        return ForkedDaapdOptionsFlowHandler(config_entry)
 
     async def validate_input(self, user_input):
         """Validate the user input."""
diff --git a/homeassistant/components/freebox/alarm_control_panel.py b/homeassistant/components/freebox/alarm_control_panel.py
index 9d8e85a14ca..891180785b0 100644
--- a/homeassistant/components/freebox/alarm_control_panel.py
+++ b/homeassistant/components/freebox/alarm_control_panel.py
@@ -5,9 +5,15 @@ from typing import Any
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -16,14 +22,14 @@ from .entity import FreeboxHomeEntity
 from .router import FreeboxRouter
 
 FREEBOX_TO_STATUS = {
-    "alarm1_arming": AlarmControlPanelState.ARMING,
-    "alarm2_arming": AlarmControlPanelState.ARMING,
-    "alarm1_armed": AlarmControlPanelState.ARMED_AWAY,
-    "alarm2_armed": AlarmControlPanelState.ARMED_HOME,
-    "alarm1_alert_timer": AlarmControlPanelState.TRIGGERED,
-    "alarm2_alert_timer": AlarmControlPanelState.TRIGGERED,
-    "alert": AlarmControlPanelState.TRIGGERED,
-    "idle": AlarmControlPanelState.DISARMED,
+    "alarm1_arming": STATE_ALARM_ARMING,
+    "alarm2_arming": STATE_ALARM_ARMING,
+    "alarm1_armed": STATE_ALARM_ARMED_AWAY,
+    "alarm2_armed": STATE_ALARM_ARMED_HOME,
+    "alarm1_alert_timer": STATE_ALARM_TRIGGERED,
+    "alarm2_alert_timer": STATE_ALARM_TRIGGERED,
+    "alert": STATE_ALARM_TRIGGERED,
+    "idle": STATE_ALARM_DISARMED,
 }
 
 
@@ -97,6 +103,6 @@ class FreeboxAlarm(FreeboxHomeEntity, AlarmControlPanelEntity):
         """Update state."""
         state: str | None = await self.get_home_endpoint_value(self._command_state)
         if state:
-            self._attr_alarm_state = FREEBOX_TO_STATUS.get(state)
+            self._attr_state = FREEBOX_TO_STATUS.get(state)
         else:
-            self._attr_alarm_state = None
+            self._attr_state = None
diff --git a/homeassistant/components/fritz/config_flow.py b/homeassistant/components/fritz/config_flow.py
index 920ecda1c52..0d27894c8ab 100644
--- a/homeassistant/components/fritz/config_flow.py
+++ b/homeassistant/components/fritz/config_flow.py
@@ -23,6 +23,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_HOST,
@@ -57,18 +58,15 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    _host: str
-
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> FritzBoxToolsOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return FritzBoxToolsOptionsFlowHandler()
+        return FritzBoxToolsOptionsFlowHandler(config_entry)
 
     def __init__(self) -> None:
         """Initialize FRITZ!Box Tools flow."""
+        self._host: str | None = None
         self._name: str = ""
         self._password: str = ""
         self._use_tls: bool = False
@@ -113,6 +111,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
 
     async def async_check_configured_entry(self) -> ConfigEntry | None:
         """Check if entry is configured."""
+        assert self._host
         current_host = await self.hass.async_add_executor_job(
             socket.gethostbyname, self._host
         )
@@ -154,17 +153,15 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle a flow initialized by discovery."""
         ssdp_location: ParseResult = urlparse(discovery_info.ssdp_location or "")
-        host = ssdp_location.hostname
-        if not host or ipaddress.ip_address(host).is_link_local:
-            return self.async_abort(reason="ignore_ip6_link_local")
-
-        self._host = host
+        self._host = ssdp_location.hostname
         self._name = (
             discovery_info.upnp.get(ssdp.ATTR_UPNP_FRIENDLY_NAME)
             or discovery_info.upnp[ssdp.ATTR_UPNP_MODEL_NAME]
         )
 
-        uuid: str | None
+        if not self._host or ipaddress.ip_address(self._host).is_link_local:
+            return self.async_abort(reason="ignore_ip6_link_local")
+
         if uuid := discovery_info.upnp.get(ssdp.ATTR_UPNP_UDN):
             if uuid.startswith("uuid:"):
                 uuid = uuid[5:]
@@ -396,7 +393,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
         )
 
 
-class FritzBoxToolsOptionsFlowHandler(OptionsFlow):
+class FritzBoxToolsOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle an options flow."""
 
     async def async_step_init(
@@ -407,18 +404,19 @@ class FritzBoxToolsOptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)
 
-        options = self.config_entry.options
         data_schema = vol.Schema(
             {
                 vol.Optional(
                     CONF_CONSIDER_HOME,
-                    default=options.get(
+                    default=self.options.get(
                         CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME.total_seconds()
                     ),
                 ): vol.All(vol.Coerce(int), vol.Clamp(min=0, max=900)),
                 vol.Optional(
                     CONF_OLD_DISCOVERY,
-                    default=options.get(CONF_OLD_DISCOVERY, DEFAULT_CONF_OLD_DISCOVERY),
+                    default=self.options.get(
+                        CONF_OLD_DISCOVERY, DEFAULT_CONF_OLD_DISCOVERY
+                    ),
                 ): bool,
             }
         )
diff --git a/homeassistant/components/fritz/coordinator.py b/homeassistant/components/fritz/coordinator.py
index 31d8ff81491..4134f0af026 100644
--- a/homeassistant/components/fritz/coordinator.py
+++ b/homeassistant/components/fritz/coordinator.py
@@ -606,9 +606,6 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
                 dev_info: Device = hosts[dev_mac]
 
                 for link in interf["node_links"]:
-                    if link.get("state") != "CONNECTED":
-                        continue  # ignore orphan node links
-
                     intf = mesh_intf.get(link["node_interface_1_uid"])
                     if intf is not None:
                         if intf["op_mode"] == "AP_GUEST":
diff --git a/homeassistant/components/fritz/manifest.json b/homeassistant/components/fritz/manifest.json
index 27aa42d9b2c..35250d9d34d 100644
--- a/homeassistant/components/fritz/manifest.json
+++ b/homeassistant/components/fritz/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "fritz",
   "name": "AVM FRITZ!Box Tools",
-  "codeowners": ["@AaronDavidSchneider", "@chemelli74", "@mib1185"],
+  "codeowners": ["@mammuth", "@AaronDavidSchneider", "@chemelli74", "@mib1185"],
   "config_flow": true,
   "dependencies": ["network"],
   "documentation": "https://www.home-assistant.io/integrations/fritz",
diff --git a/homeassistant/components/fritzbox/config_flow.py b/homeassistant/components/fritzbox/config_flow.py
index ffec4a9ea29..76754fc5082 100644
--- a/homeassistant/components/fritzbox/config_flow.py
+++ b/homeassistant/components/fritzbox/config_flow.py
@@ -43,11 +43,10 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    _name: str
-
     def __init__(self) -> None:
         """Initialize flow."""
         self._host: str | None = None
+        self._name: str | None = None
         self._password: str | None = None
         self._username: str | None = None
 
@@ -159,6 +158,7 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
             result = await self.async_try_connect()
 
             if result == RESULT_SUCCESS:
+                assert self._name is not None
                 return self._get_entry(self._name)
             if result != RESULT_INVALID_AUTH:
                 return self.async_abort(reason=result)
diff --git a/homeassistant/components/fritzbox_callmonitor/config_flow.py b/homeassistant/components/fritzbox_callmonitor/config_flow.py
index 7bd0eacb66a..69efceae281 100644
--- a/homeassistant/components/fritzbox_callmonitor/config_flow.py
+++ b/homeassistant/components/fritzbox_callmonitor/config_flow.py
@@ -141,7 +141,7 @@ class FritzBoxCallMonitorConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> FritzBoxCallMonitorOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return FritzBoxCallMonitorOptionsFlowHandler()
+        return FritzBoxCallMonitorOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -278,6 +278,10 @@ class FritzBoxCallMonitorConfigFlow(ConfigFlow, domain=DOMAIN):
 class FritzBoxCallMonitorOptionsFlowHandler(OptionsFlow):
     """Handle a fritzbox_callmonitor options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.config_entry = config_entry
+
     @classmethod
     def _are_prefixes_valid(cls, prefixes: str | None) -> bool:
         """Check if prefixes are valid."""
diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 4dc5a2b0ae4..80119002be5 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==20241106.2"]
+  "requirements": ["home-assistant-frontend==20241002.3"]
 }
diff --git a/homeassistant/components/fujitsu_fglair/manifest.json b/homeassistant/components/fujitsu_fglair/manifest.json
index f7f3af8d037..1c7b9b0b469 100644
--- a/homeassistant/components/fujitsu_fglair/manifest.json
+++ b/homeassistant/components/fujitsu_fglair/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/fujitsu_fglair",
   "iot_class": "cloud_polling",
-  "requirements": ["ayla-iot-unofficial==1.4.3"]
+  "requirements": ["ayla-iot-unofficial==1.4.2"]
 }
diff --git a/homeassistant/components/fyta/coordinator.py b/homeassistant/components/fyta/coordinator.py
index c4aa9bfe589..df607de76b0 100644
--- a/homeassistant/components/fyta/coordinator.py
+++ b/homeassistant/components/fyta/coordinator.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
 from datetime import datetime, timedelta
 import logging
 from typing import TYPE_CHECKING
@@ -19,10 +18,9 @@ from fyta_cli.fyta_models import Plant
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_EXPIRATION, DOMAIN
+from .const import CONF_EXPIRATION
 
 if TYPE_CHECKING:
     from . import FytaConfigEntry
@@ -44,8 +42,6 @@ class FytaCoordinator(DataUpdateCoordinator[dict[int, Plant]]):
             update_interval=timedelta(minutes=4),
         )
         self.fyta = fyta
-        self._plants_last_update: set[int] = set()
-        self.new_device_callbacks: list[Callable[[int], None]] = []
 
     async def _async_update_data(
         self,
@@ -59,62 +55,9 @@ class FytaCoordinator(DataUpdateCoordinator[dict[int, Plant]]):
             await self.renew_authentication()
 
         try:
-            data = await self.fyta.update_all_plants()
+            return await self.fyta.update_all_plants()
         except (FytaConnectionError, FytaPlantError) as err:
             raise UpdateFailed(err) from err
-        _LOGGER.debug("Data successfully updated")
-
-        # data must be assigned before _async_add_remove_devices, as it is uses to set-up possible new devices
-        self.data = data
-        self._async_add_remove_devices()
-
-        return data
-
-    def _async_add_remove_devices(self) -> None:
-        """Add new devices, remove non-existing devices."""
-        if not self._plants_last_update:
-            self._plants_last_update = set(self.fyta.plant_list.keys())
-
-        if (
-            current_plants := set(self.fyta.plant_list.keys())
-        ) == self._plants_last_update:
-            return
-
-        _LOGGER.debug(
-            "Check for new and removed plant(s): old plants: %s; new plants: %s",
-            ", ".join(map(str, self._plants_last_update)),
-            ", ".join(map(str, current_plants)),
-        )
-
-        # remove old plants
-        if removed_plants := self._plants_last_update - current_plants:
-            _LOGGER.debug("Removed plant(s): %s", ", ".join(map(str, removed_plants)))
-
-            device_registry = dr.async_get(self.hass)
-            for plant_id in removed_plants:
-                if device := device_registry.async_get_device(
-                    identifiers={
-                        (
-                            DOMAIN,
-                            f"{self.config_entry.entry_id}-{plant_id}",
-                        )
-                    }
-                ):
-                    device_registry.async_update_device(
-                        device_id=device.id,
-                        remove_config_entry_id=self.config_entry.entry_id,
-                    )
-                    _LOGGER.debug("Device removed from device registry: %s", device.id)
-
-        # add new devices
-        if new_plants := current_plants - self._plants_last_update:
-            _LOGGER.debug("New plant(s) found: %s", ", ".join(map(str, new_plants)))
-            for plant_id in new_plants:
-                for callback in self.new_device_callbacks:
-                    callback(plant_id)
-                    _LOGGER.debug("Device added: %s", plant_id)
-
-        self._plants_last_update = current_plants
 
     async def renew_authentication(self) -> bool:
         """Renew access token for FYTA API."""
diff --git a/homeassistant/components/fyta/manifest.json b/homeassistant/components/fyta/manifest.json
index 17fe5199eee..73f6b42f53b 100644
--- a/homeassistant/components/fyta/manifest.json
+++ b/homeassistant/components/fyta/manifest.json
@@ -6,7 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/fyta",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
-  "loggers": ["fyta_cli"],
   "quality_scale": "platinum",
-  "requirements": ["fyta_cli==0.6.10"]
+  "requirements": ["fyta_cli==0.6.7"]
 }
diff --git a/homeassistant/components/fyta/sensor.py b/homeassistant/components/fyta/sensor.py
index 89ee22265cf..f324b9b3afe 100644
--- a/homeassistant/components/fyta/sensor.py
+++ b/homeassistant/components/fyta/sensor.py
@@ -150,15 +150,6 @@ async def async_setup_entry(
 
     async_add_entities(plant_entities)
 
-    def _async_add_new_device(plant_id: int) -> None:
-        async_add_entities(
-            FytaPlantSensor(coordinator, entry, sensor, plant_id)
-            for sensor in SENSORS
-            if sensor.key in dir(coordinator.data.get(plant_id))
-        )
-
-    coordinator.new_device_callbacks.append(_async_add_new_device)
-
 
 class FytaPlantSensor(FytaPlantEntity, SensorEntity):
     """Represents a Fyta sensor."""
diff --git a/homeassistant/components/gardena_bluetooth/__init__.py b/homeassistant/components/gardena_bluetooth/__init__.py
index 7aae629974c..b6a26456168 100644
--- a/homeassistant/components/gardena_bluetooth/__init__.py
+++ b/homeassistant/components/gardena_bluetooth/__init__.py
@@ -32,8 +32,6 @@ LOGGER = logging.getLogger(__name__)
 TIMEOUT = 20.0
 DISCONNECT_DELAY = 5
 
-type GardenaBluetoothConfigEntry = ConfigEntry[GardenaBluetoothCoordinator]
-
 
 def get_connection(hass: HomeAssistant, address: str) -> CachedConnection:
     """Set up a cached client that keeps connection after last use."""
@@ -49,9 +47,7 @@ def get_connection(hass: HomeAssistant, address: str) -> CachedConnection:
     return CachedConnection(DISCONNECT_DELAY, _device_lookup)
 
 
-async def async_setup_entry(
-    hass: HomeAssistant, entry: GardenaBluetoothConfigEntry
-) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Gardena Bluetooth from a config entry."""
 
     address = entry.data[CONF_ADDRESS]
@@ -83,18 +79,17 @@ async def async_setup_entry(
         hass, LOGGER, client, uuids, device, address
     )
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     await coordinator.async_refresh()
 
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, entry: GardenaBluetoothConfigEntry
-) -> 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):
-        await entry.runtime_data.async_shutdown()
+        coordinator: GardenaBluetoothCoordinator = hass.data[DOMAIN].pop(entry.entry_id)
+        await coordinator.async_shutdown()
 
     return unload_ok
diff --git a/homeassistant/components/gardena_bluetooth/binary_sensor.py b/homeassistant/components/gardena_bluetooth/binary_sensor.py
index d3ae096e291..be6d8bbeede 100644
--- a/homeassistant/components/gardena_bluetooth/binary_sensor.py
+++ b/homeassistant/components/gardena_bluetooth/binary_sensor.py
@@ -12,11 +12,13 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
+from .const import DOMAIN
+from .coordinator import GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothDescriptorEntity
 
 
@@ -51,12 +53,10 @@ DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up binary sensor based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator: GardenaBluetoothCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities = [
         GardenaBluetoothBinarySensor(coordinator, description, description.context)
         for description in DESCRIPTIONS
diff --git a/homeassistant/components/gardena_bluetooth/button.py b/homeassistant/components/gardena_bluetooth/button.py
index 9d87cba2446..67377dc684e 100644
--- a/homeassistant/components/gardena_bluetooth/button.py
+++ b/homeassistant/components/gardena_bluetooth/button.py
@@ -8,11 +8,13 @@ from gardena_bluetooth.const import Reset
 from gardena_bluetooth.parse import CharacteristicBool
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
+from .const import DOMAIN
+from .coordinator import GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothDescriptorEntity
 
 
@@ -40,12 +42,10 @@ DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up button based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator: GardenaBluetoothCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities = [
         GardenaBluetoothButton(coordinator, description, description.context)
         for description in DESCRIPTIONS
diff --git a/homeassistant/components/gardena_bluetooth/manifest.json b/homeassistant/components/gardena_bluetooth/manifest.json
index da5c08c38c5..6d7566b3edf 100644
--- a/homeassistant/components/gardena_bluetooth/manifest.json
+++ b/homeassistant/components/gardena_bluetooth/manifest.json
@@ -14,5 +14,5 @@
   "documentation": "https://www.home-assistant.io/integrations/gardena_bluetooth",
   "iot_class": "local_polling",
   "loggers": ["bleak", "bleak_esphome", "gardena_bluetooth"],
-  "requirements": ["gardena-bluetooth==1.4.4"]
+  "requirements": ["gardena-bluetooth==1.4.3"]
 }
diff --git a/homeassistant/components/gardena_bluetooth/number.py b/homeassistant/components/gardena_bluetooth/number.py
index b55630fa797..d3c178ee637 100644
--- a/homeassistant/components/gardena_bluetooth/number.py
+++ b/homeassistant/components/gardena_bluetooth/number.py
@@ -17,11 +17,12 @@ from homeassistant.components.number import (
     NumberEntityDescription,
     NumberMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
+from .const import DOMAIN
 from .coordinator import GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothDescriptorEntity, GardenaBluetoothEntity
 
@@ -104,12 +105,10 @@ DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up entity based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator: GardenaBluetoothCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities: list[NumberEntity] = [
         GardenaBluetoothNumber(coordinator, description, description.context)
         for description in DESCRIPTIONS
diff --git a/homeassistant/components/gardena_bluetooth/sensor.py b/homeassistant/components/gardena_bluetooth/sensor.py
index ee8a2663218..19fefefa9aa 100644
--- a/homeassistant/components/gardena_bluetooth/sensor.py
+++ b/homeassistant/components/gardena_bluetooth/sensor.py
@@ -14,12 +14,13 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 import homeassistant.util.dt as dt_util
 
-from . import GardenaBluetoothConfigEntry
+from .const import DOMAIN
 from .coordinator import GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothDescriptorEntity, GardenaBluetoothEntity
 
@@ -94,12 +95,10 @@ DESCRIPTIONS = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up Gardena Bluetooth sensor based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator: GardenaBluetoothCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities: list[GardenaBluetoothEntity] = [
         GardenaBluetoothSensor(coordinator, description, description.context)
         for description in DESCRIPTIONS
diff --git a/homeassistant/components/gardena_bluetooth/switch.py b/homeassistant/components/gardena_bluetooth/switch.py
index f82c39025a5..58b4b2e4e51 100644
--- a/homeassistant/components/gardena_bluetooth/switch.py
+++ b/homeassistant/components/gardena_bluetooth/switch.py
@@ -7,22 +7,21 @@ from typing import Any
 from gardena_bluetooth.const import Valve
 
 from homeassistant.components.switch import SwitchEntity
+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 GardenaBluetoothConfigEntry
+from .const import DOMAIN
 from .coordinator import GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothEntity
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up switch based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator: GardenaBluetoothCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities = []
     if GardenaBluetoothValveSwitch.characteristics.issubset(
         coordinator.characteristics
diff --git a/homeassistant/components/gardena_bluetooth/valve.py b/homeassistant/components/gardena_bluetooth/valve.py
index ae6bf56a7ff..877cc5b505e 100644
--- a/homeassistant/components/gardena_bluetooth/valve.py
+++ b/homeassistant/components/gardena_bluetooth/valve.py
@@ -7,10 +7,11 @@ from typing import Any
 from gardena_bluetooth.const import Valve
 
 from homeassistant.components.valve import ValveEntity, ValveEntityFeature
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import GardenaBluetoothConfigEntry
+from .const import DOMAIN
 from .coordinator import GardenaBluetoothCoordinator
 from .entity import GardenaBluetoothEntity
 
@@ -18,12 +19,10 @@ FALLBACK_WATERING_TIME_IN_SECONDS = 60 * 60
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: GardenaBluetoothConfigEntry,
-    async_add_entities: AddEntitiesCallback,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up switch based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator: GardenaBluetoothCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities = []
     if GardenaBluetoothValve.characteristics.issubset(coordinator.characteristics):
         entities.append(GardenaBluetoothValve(coordinator))
diff --git a/homeassistant/components/generic/config_flow.py b/homeassistant/components/generic/config_flow.py
index 8bd238fd0e6..7b10cdfb64b 100644
--- a/homeassistant/components/generic/config_flow.py
+++ b/homeassistant/components/generic/config_flow.py
@@ -324,7 +324,7 @@ class GenericIPCamConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> GenericOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return GenericOptionsFlowHandler()
+        return GenericOptionsFlowHandler(config_entry)
 
     def check_for_existing(self, options: dict[str, Any]) -> bool:
         """Check whether an existing entry is using the same URLs."""
@@ -409,8 +409,9 @@ class GenericIPCamConfigFlow(ConfigFlow, domain=DOMAIN):
 class GenericOptionsFlowHandler(OptionsFlow):
     """Handle Generic IP Camera options."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize Generic IP Camera options flow."""
+        self.config_entry = config_entry
         self.preview_cam: dict[str, Any] = {}
         self.user_input: dict[str, Any] = {}
 
diff --git a/homeassistant/components/generic/manifest.json b/homeassistant/components/generic/manifest.json
index c1fbc16d9be..b19d6d6293e 100644
--- a/homeassistant/components/generic/manifest.json
+++ b/homeassistant/components/generic/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/generic",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["av==13.1.0", "Pillow==11.0.0"]
+  "requirements": ["ha-av==10.1.1", "Pillow==10.4.0"]
 }
diff --git a/homeassistant/components/generic_hygrostat/strings.json b/homeassistant/components/generic_hygrostat/strings.json
index 2be3955eff1..a21ab68c628 100644
--- a/homeassistant/components/generic_hygrostat/strings.json
+++ b/homeassistant/components/generic_hygrostat/strings.json
@@ -4,7 +4,7 @@
     "step": {
       "user": {
         "title": "Add generic hygrostat",
-        "description": "Create a humidifier entity that control the humidity via a switch and sensor.",
+        "description": "Create a entity that control the humidity via a switch and sensor.",
         "data": {
           "device_class": "Device class",
           "dry_tolerance": "Dry tolerance",
diff --git a/homeassistant/components/generic_thermostat/config_flow.py b/homeassistant/components/generic_thermostat/config_flow.py
index 5b0eae8ff66..e9079a9f41a 100644
--- a/homeassistant/components/generic_thermostat/config_flow.py
+++ b/homeassistant/components/generic_thermostat/config_flow.py
@@ -62,7 +62,7 @@ OPTIONS_SCHEMA = {
 PRESETS_SCHEMA = {
     vol.Optional(v): selector.NumberSelector(
         selector.NumberSelectorConfig(
-            mode=selector.NumberSelectorMode.BOX, unit_of_measurement=DEGREE, step=0.1
+            mode=selector.NumberSelectorMode.BOX, unit_of_measurement=DEGREE
         )
     )
     for v in CONF_PRESETS.values()
diff --git a/homeassistant/components/generic_thermostat/strings.json b/homeassistant/components/generic_thermostat/strings.json
index 51549dc844e..1ddd41de734 100644
--- a/homeassistant/components/generic_thermostat/strings.json
+++ b/homeassistant/components/generic_thermostat/strings.json
@@ -3,7 +3,7 @@
   "config": {
     "step": {
       "user": {
-        "title": "Add generic thermostat",
+        "title": "Add generic thermostat helper",
         "description": "Create a climate entity that controls the temperature via a switch and sensor.",
         "data": {
           "ac_mode": "Cooling mode",
@@ -17,8 +17,8 @@
         "data_description": {
           "ac_mode": "Set the actuator specified to be treated as a cooling device instead of a heating device.",
           "heater": "Switch entity used to cool or heat depending on A/C mode.",
-          "target_sensor": "Temperature sensor that reflects the current temperature.",
-          "min_cycle_duration": "Set a minimum amount of time that the switch specified must be in its current state prior to being switched either off or on.",
+          "target_sensor": "Temperature sensor that reflect the current temperature.",
+          "min_cycle_duration": "Set a minimum amount of time that the switch specified must be in its current state prior to being switched either off or on. This option will be ignored if the keep alive option is set.",
           "cold_tolerance": "Minimum amount of difference between the temperature read by the temperature sensor the target temperature that must change prior to being switched on. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will start when the sensor equals or goes below 24.5.",
           "hot_tolerance": "Minimum amount of difference between the temperature read by the temperature sensor the target temperature that must change prior to being switched off. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will stop when the sensor equals or goes above 25.5."
         }
diff --git a/homeassistant/components/geniushub/__init__.py b/homeassistant/components/geniushub/__init__.py
index 9ca6ecfcfe0..18580f331d2 100644
--- a/homeassistant/components/geniushub/__init__.py
+++ b/homeassistant/components/geniushub/__init__.py
@@ -9,6 +9,7 @@ import aiohttp
 from geniushubclient import GeniusHub
 import voluptuous as vol
 
+from homeassistant import config_entries
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -20,12 +21,20 @@ from homeassistant.const import (
     CONF_USERNAME,
     Platform,
 )
-from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    DOMAIN as HOMEASSISTANT_DOMAIN,
+    HomeAssistant,
+    ServiceCall,
+    callback,
+)
+from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.service import verify_domain_control
+from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
 
@@ -36,6 +45,27 @@ SCAN_INTERVAL = timedelta(seconds=60)
 
 MAC_ADDRESS_REGEXP = r"^([0-9A-F]{2}:){5}([0-9A-F]{2})$"
 
+CLOUD_API_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_TOKEN): cv.string,
+        vol.Required(CONF_MAC): vol.Match(MAC_ADDRESS_REGEXP),
+    }
+)
+
+
+LOCAL_API_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_MAC): vol.Match(MAC_ADDRESS_REGEXP),
+    }
+)
+
+CONFIG_SCHEMA = vol.Schema(
+    {DOMAIN: vol.Any(LOCAL_API_SCHEMA, CLOUD_API_SCHEMA)}, extra=vol.ALLOW_EXTRA
+)
+
 ATTR_ZONE_MODE = "mode"
 ATTR_DURATION = "duration"
 
@@ -70,6 +100,56 @@ PLATFORMS = [
 ]
 
 
+async def _async_import(hass: HomeAssistant, base_config: ConfigType) -> None:
+    """Import a config entry from configuration.yaml."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_IMPORT},
+        data=base_config[DOMAIN],
+    )
+    if (
+        result["type"] is FlowResultType.CREATE_ENTRY
+        or result["reason"] == "already_configured"
+    ):
+        async_create_issue(
+            hass,
+            HOMEASSISTANT_DOMAIN,
+            f"deprecated_yaml_{DOMAIN}",
+            breaks_in_ha_version="2024.12.0",
+            is_fixable=False,
+            issue_domain=DOMAIN,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_yaml",
+            translation_placeholders={
+                "domain": DOMAIN,
+                "integration_title": "Genius Hub",
+            },
+        )
+        return
+    async_create_issue(
+        hass,
+        DOMAIN,
+        f"deprecated_yaml_import_issue_{result['reason']}",
+        breaks_in_ha_version="2024.12.0",
+        is_fixable=False,
+        issue_domain=DOMAIN,
+        severity=IssueSeverity.WARNING,
+        translation_key=f"deprecated_yaml_import_issue_{result['reason']}",
+        translation_placeholders={
+            "domain": DOMAIN,
+            "integration_title": "Genius Hub",
+        },
+    )
+
+
+async def async_setup(hass: HomeAssistant, base_config: ConfigType) -> bool:
+    """Set up a Genius Hub system."""
+    if DOMAIN in base_config:
+        hass.async_create_task(_async_import(hass, base_config))
+    return True
+
+
 type GeniusHubConfigEntry = ConfigEntry[GeniusBroker]
 
 
@@ -90,6 +170,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: GeniusHubConfigEntry) ->
                 )
 
     session = async_get_clientsession(hass)
+    unique_id: str
     if CONF_HOST in entry.data:
         client = GeniusHub(
             entry.data[CONF_HOST],
@@ -97,10 +178,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: GeniusHubConfigEntry) ->
             password=entry.data[CONF_PASSWORD],
             session=session,
         )
+        unique_id = entry.data[CONF_MAC]
     else:
         client = GeniusHub(entry.data[CONF_TOKEN], session=session)
-
-    unique_id = entry.unique_id or entry.entry_id
+        unique_id = entry.entry_id
 
     broker = entry.runtime_data = GeniusBroker(hass, client, unique_id)
 
diff --git a/homeassistant/components/geniushub/config_flow.py b/homeassistant/components/geniushub/config_flow.py
index b106f9907bb..601eac6c2f2 100644
--- a/homeassistant/components/geniushub/config_flow.py
+++ b/homeassistant/components/geniushub/config_flow.py
@@ -13,6 +13,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
+from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
@@ -122,3 +123,14 @@ class GeniusHubConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_show_form(
             step_id="cloud_api", errors=errors, data_schema=CLOUD_API_SCHEMA
         )
+
+    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+        """Import the yaml config."""
+        if CONF_HOST in import_data:
+            result = await self.async_step_local_api(import_data)
+        else:
+            result = await self.async_step_cloud_api(import_data)
+        if result["type"] is FlowResultType.FORM:
+            assert result["errors"]
+            return self.async_abort(reason=result["errors"]["base"])
+        return result
diff --git a/homeassistant/components/github/config_flow.py b/homeassistant/components/github/config_flow.py
index 9977f9d84cc..25d8782618f 100644
--- a/homeassistant/components/github/config_flow.py
+++ b/homeassistant/components/github/config_flow.py
@@ -211,12 +211,16 @@ class GitHubConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for GitHub."""
 
+    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,
diff --git a/homeassistant/components/go2rtc/__init__.py b/homeassistant/components/go2rtc/__init__.py
index f1f6e44abc1..27ec140076b 100644
--- a/homeassistant/components/go2rtc/__init__.py
+++ b/homeassistant/components/go2rtc/__init__.py
@@ -1,59 +1,20 @@
 """The go2rtc component."""
 
-import logging
-import shutil
+from go2rtc_client import Go2RtcClient, WebRTCSdpOffer
 
-from aiohttp.client_exceptions import ClientConnectionError, ServerConnectionError
-from awesomeversion import AwesomeVersion
-from go2rtc_client import Go2RtcRestClient
-from go2rtc_client.exceptions import Go2RtcClientError, Go2RtcVersionError
-from go2rtc_client.ws import (
-    Go2RtcWsClient,
-    ReceiveMessages,
-    WebRTCAnswer,
-    WebRTCCandidate,
-    WebRTCOffer,
-    WsError,
-)
-import voluptuous as vol
-from webrtc_models import RTCIceCandidate
-
-from homeassistant.components.camera import (
-    Camera,
+from homeassistant.components.camera import Camera
+from homeassistant.components.camera.webrtc import (
     CameraWebRTCProvider,
-    WebRTCAnswer as HAWebRTCAnswer,
-    WebRTCCandidate as HAWebRTCCandidate,
-    WebRTCError,
-    WebRTCMessage,
-    WebRTCSendMessage,
     async_register_webrtc_provider,
 )
-from homeassistant.components.default_config import DOMAIN as DEFAULT_CONFIG_DOMAIN
-from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry
-from homeassistant.const import CONF_URL, EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import Event, HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import (
-    config_validation as cv,
-    discovery_flow,
-    issue_registry as ir,
-)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.typing import ConfigType
-from homeassistant.util.hass_dict import HassKey
-from homeassistant.util.package import is_docker_env
 
-from .const import (
-    CONF_DEBUG_UI,
-    DEBUG_UI_URL_MESSAGE,
-    DOMAIN,
-    HA_MANAGED_URL,
-    RECOMMENDED_VERSION,
-)
+from .const import CONF_BINARY
 from .server import Server
 
-_LOGGER = logging.getLogger(__name__)
-
 _SUPPORTED_STREAMS = frozenset(
     (
         "bubble",
@@ -84,210 +45,50 @@ _SUPPORTED_STREAMS = frozenset(
     )
 )
 
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.Schema(
-            {
-                vol.Exclusive(CONF_URL, DOMAIN, DEBUG_UI_URL_MESSAGE): cv.url,
-                vol.Exclusive(CONF_DEBUG_UI, DOMAIN, DEBUG_UI_URL_MESSAGE): cv.boolean,
-            }
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-_DATA_GO2RTC: HassKey[str] = HassKey(DOMAIN)
-_RETRYABLE_ERRORS = (ClientConnectionError, ServerConnectionError)
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up WebRTC."""
-    url: str | None = None
-    if DOMAIN not in config and DEFAULT_CONFIG_DOMAIN not in config:
-        await _remove_go2rtc_entries(hass)
-        return True
-
-    if not (configured_by_user := DOMAIN in config) or not (
-        url := config[DOMAIN].get(CONF_URL)
-    ):
-        if not is_docker_env():
-            if not configured_by_user:
-                # Remove config entry if it exists
-                await _remove_go2rtc_entries(hass)
-                return True
-            _LOGGER.warning("Go2rtc URL required in non-docker installs")
-            return False
-        if not (binary := await _get_binary(hass)):
-            _LOGGER.error("Could not find go2rtc docker binary")
-            return False
-
-        # HA will manage the binary
-        server = Server(
-            hass, binary, enable_ui=config.get(DOMAIN, {}).get(CONF_DEBUG_UI, False)
-        )
-        try:
-            await server.start()
-        except Exception:  # noqa: BLE001
-            _LOGGER.warning("Could not start go2rtc server", exc_info=True)
-            return False
-
-        async def on_stop(event: Event) -> None:
-            await server.stop()
-
-        hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, on_stop)
-
-        url = HA_MANAGED_URL
-
-    hass.data[_DATA_GO2RTC] = url
-    discovery_flow.async_create_flow(
-        hass, DOMAIN, context={"source": SOURCE_SYSTEM}, data={}
-    )
-    return True
-
-
-async def _remove_go2rtc_entries(hass: HomeAssistant) -> None:
-    """Remove go2rtc config entries, if any."""
-    for entry in hass.config_entries.async_entries(DOMAIN):
-        await hass.config_entries.async_remove(entry.entry_id)
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up go2rtc from a config entry."""
-    url = hass.data[_DATA_GO2RTC]
+    """Set up WebRTC from a config entry."""
+    if binary := entry.data.get(CONF_BINARY):
+        # HA will manage the binary
+        server = Server(hass, binary)
 
-    # Validate the server URL
-    try:
-        client = Go2RtcRestClient(async_get_clientsession(hass), url)
-        version = await client.validate_server_version()
-        if version < AwesomeVersion(RECOMMENDED_VERSION):
-            ir.async_create_issue(
-                hass,
-                DOMAIN,
-                "recommended_version",
-                is_fixable=False,
-                is_persistent=False,
-                severity=ir.IssueSeverity.WARNING,
-                translation_key="recommended_version",
-                translation_placeholders={
-                    "recommended_version": RECOMMENDED_VERSION,
-                    "current_version": str(version),
-                },
-            )
-    except Go2RtcClientError as err:
-        if isinstance(err.__cause__, _RETRYABLE_ERRORS):
-            raise ConfigEntryNotReady(
-                f"Could not connect to go2rtc instance on {url}"
-            ) from err
-        _LOGGER.warning("Could not connect to go2rtc instance on %s (%s)", url, err)
-        return False
-    except Go2RtcVersionError as err:
-        raise ConfigEntryNotReady(
-            f"The go2rtc server version is not supported, {err}"
-        ) from err
-    except Exception as err:  # noqa: BLE001
-        _LOGGER.warning("Could not connect to go2rtc instance on %s (%s)", url, err)
-        return False
+        entry.async_on_unload(server.stop)
+        await server.start()
 
-    provider = WebRTCProvider(hass, url)
-    async_register_webrtc_provider(hass, provider)
+    client = Go2RtcClient(async_get_clientsession(hass), entry.data[CONF_URL])
+
+    provider = WebRTCProvider(client)
+    entry.async_on_unload(async_register_webrtc_provider(hass, provider))
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a go2rtc config entry."""
-    return True
-
-
-async def _get_binary(hass: HomeAssistant) -> str | None:
-    """Return the binary path if found."""
-    return await hass.async_add_executor_job(shutil.which, "go2rtc")
-
-
 class WebRTCProvider(CameraWebRTCProvider):
     """WebRTC provider."""
 
-    def __init__(self, hass: HomeAssistant, url: str) -> None:
+    def __init__(self, client: Go2RtcClient) -> None:
         """Initialize the WebRTC provider."""
-        self._hass = hass
-        self._url = url
-        self._session = async_get_clientsession(hass)
-        self._rest_client = Go2RtcRestClient(self._session, url)
-        self._sessions: dict[str, Go2RtcWsClient] = {}
+        self._client = client
 
-    @property
-    def domain(self) -> str:
-        """Return the integration domain of the provider."""
-        return DOMAIN
-
-    @callback
-    def async_is_supported(self, stream_source: str) -> bool:
+    async def async_is_supported(self, stream_source: str) -> bool:
         """Return if this provider is supports the Camera as source."""
         return stream_source.partition(":")[0] in _SUPPORTED_STREAMS
 
-    async def async_handle_async_webrtc_offer(
-        self,
-        camera: Camera,
-        offer_sdp: str,
-        session_id: str,
-        send_message: WebRTCSendMessage,
-    ) -> None:
-        """Handle the WebRTC offer and return the answer via the provided callback."""
-        self._sessions[session_id] = ws_client = Go2RtcWsClient(
-            self._session, self._url, source=camera.entity_id
+    async def async_handle_web_rtc_offer(
+        self, camera: Camera, offer_sdp: str
+    ) -> str | None:
+        """Handle the WebRTC offer and return an answer."""
+        streams = await self._client.streams.list()
+        if camera.entity_id not in streams:
+            if not (stream_source := await camera.stream_source()):
+                return None
+            await self._client.streams.add(camera.entity_id, stream_source)
+
+        answer = await self._client.webrtc.forward_whep_sdp_offer(
+            camera.entity_id, WebRTCSdpOffer(offer_sdp)
         )
+        return answer.sdp
 
-        if not (stream_source := await camera.stream_source()):
-            send_message(
-                WebRTCError("go2rtc_webrtc_offer_failed", "Camera has no stream source")
-            )
-            return
 
-        streams = await self._rest_client.streams.list()
-
-        if (stream := streams.get(camera.entity_id)) is None or not any(
-            stream_source == producer.url for producer in stream.producers
-        ):
-            await self._rest_client.streams.add(
-                camera.entity_id,
-                [
-                    stream_source,
-                    # We are setting any ffmpeg rtsp related logs to debug
-                    # Connection problems to the camera will be logged by the first stream
-                    # Therefore setting it to debug will not hide any important logs
-                    f"ffmpeg:{camera.entity_id}#audio=opus#query=log_level=debug",
-                ],
-            )
-
-        @callback
-        def on_messages(message: ReceiveMessages) -> None:
-            """Handle messages."""
-            value: WebRTCMessage
-            match message:
-                case WebRTCCandidate():
-                    value = HAWebRTCCandidate(RTCIceCandidate(message.candidate))
-                case WebRTCAnswer():
-                    value = HAWebRTCAnswer(message.sdp)
-                case WsError():
-                    value = WebRTCError("go2rtc_webrtc_offer_failed", message.error)
-
-            send_message(value)
-
-        ws_client.subscribe(on_messages)
-        config = camera.async_get_webrtc_client_configuration()
-        await ws_client.send(WebRTCOffer(offer_sdp, config.configuration.ice_servers))
-
-    async def async_on_webrtc_candidate(
-        self, session_id: str, candidate: RTCIceCandidate
-    ) -> None:
-        """Handle the WebRTC candidate."""
-
-        if ws_client := self._sessions.get(session_id):
-            await ws_client.send(WebRTCCandidate(candidate.candidate))
-        else:
-            _LOGGER.debug("Unknown session %s. Ignoring candidate", session_id)
-
-    @callback
-    def async_close_session(self, session_id: str) -> None:
-        """Close the session."""
-        ws_client = self._sessions.pop(session_id)
-        self._hass.async_create_task(ws_client.close())
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return True
diff --git a/homeassistant/components/go2rtc/config_flow.py b/homeassistant/components/go2rtc/config_flow.py
index 02fdfb656a6..0b1f3780346 100644
--- a/homeassistant/components/go2rtc/config_flow.py
+++ b/homeassistant/components/go2rtc/config_flow.py
@@ -1,21 +1,90 @@
-"""Config flow for the go2rtc integration."""
+"""Config flow for WebRTC."""
 
 from __future__ import annotations
 
+import shutil
 from typing import Any
+from urllib.parse import urlparse
+
+from go2rtc_client import Go2RtcClient
+import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import selector
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.util.package import is_docker_env
 
-from .const import DOMAIN
+from .const import CONF_BINARY, DOMAIN
+
+_VALID_URL_SCHEMA = {"http", "https"}
 
 
-class CloudConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for the go2rtc integration."""
+async def _validate_url(
+    hass: HomeAssistant,
+    value: str,
+) -> str | None:
+    """Validate the URL and return error or None if it's valid."""
+    if urlparse(value).scheme not in _VALID_URL_SCHEMA:
+        return "invalid_url_schema"
+    try:
+        vol.Schema(vol.Url())(value)
+    except vol.Invalid:
+        return "invalid_url"
 
-    VERSION = 1
+    try:
+        client = Go2RtcClient(async_get_clientsession(hass), value)
+        await client.streams.list()
+    except Exception:  # noqa: BLE001
+        return "cannot_connect"
+    return None
 
-    async def async_step_system(
+
+class Go2RTCConfigFlow(ConfigFlow, domain=DOMAIN):
+    """go2rtc config flow."""
+
+    def _get_binary(self) -> str | None:
+        """Return the binary path if found."""
+        return shutil.which(DOMAIN)
+
+    async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the system step."""
-        return self.async_create_entry(title="go2rtc", data={})
+        """Init step."""
+        if is_docker_env() and (binary := self._get_binary()):
+            return self.async_create_entry(
+                title=DOMAIN,
+                data={CONF_BINARY: binary, CONF_URL: "http://localhost:1984/"},
+            )
+
+        return await self.async_step_url()
+
+    async def async_step_url(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Step to use selfhosted go2rtc server."""
+        errors = {}
+        if user_input is not None:
+            if error := await _validate_url(self.hass, user_input[CONF_URL]):
+                errors[CONF_URL] = error
+            else:
+                return self.async_create_entry(title=DOMAIN, data=user_input)
+
+        return self.async_show_form(
+            step_id="url",
+            data_schema=self.add_suggested_values_to_schema(
+                data_schema=vol.Schema(
+                    {
+                        vol.Required(CONF_URL): selector.TextSelector(
+                            selector.TextSelectorConfig(
+                                type=selector.TextSelectorType.URL
+                            )
+                        ),
+                    }
+                ),
+                suggested_values=user_input,
+            ),
+            errors=errors,
+            last_step=True,
+        )
diff --git a/homeassistant/components/go2rtc/const.py b/homeassistant/components/go2rtc/const.py
index 3c1c84c42b5..af8266e0d72 100644
--- a/homeassistant/components/go2rtc/const.py
+++ b/homeassistant/components/go2rtc/const.py
@@ -2,8 +2,4 @@
 
 DOMAIN = "go2rtc"
 
-CONF_DEBUG_UI = "debug_ui"
-DEBUG_UI_URL_MESSAGE = "Url and debug_ui cannot be set at the same time."
-HA_MANAGED_API_PORT = 11984
-HA_MANAGED_URL = f"http://localhost:{HA_MANAGED_API_PORT}/"
-RECOMMENDED_VERSION = "1.9.7"
+CONF_BINARY = "binary"
diff --git a/homeassistant/components/go2rtc/manifest.json b/homeassistant/components/go2rtc/manifest.json
index 201b7168847..faf6c991ac1 100644
--- a/homeassistant/components/go2rtc/manifest.json
+++ b/homeassistant/components/go2rtc/manifest.json
@@ -2,11 +2,10 @@
   "domain": "go2rtc",
   "name": "go2rtc",
   "codeowners": ["@home-assistant/core"],
-  "config_flow": false,
+  "config_flow": true,
   "dependencies": ["camera"],
   "documentation": "https://www.home-assistant.io/integrations/go2rtc",
-  "integration_type": "system",
   "iot_class": "local_polling",
-  "requirements": ["go2rtc-client==0.1.1"],
+  "requirements": ["go2rtc-client==0.0.1b0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/go2rtc/server.py b/homeassistant/components/go2rtc/server.py
index 6699ee4d8a2..a0afb2f8c93 100644
--- a/homeassistant/components/go2rtc/server.py
+++ b/homeassistant/components/go2rtc/server.py
@@ -1,252 +1,70 @@
 """Go2rtc server."""
 
 import asyncio
-from collections import deque
-from contextlib import suppress
 import logging
 from tempfile import NamedTemporaryFile
 
-from go2rtc_client import Go2RtcRestClient
-
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .const import HA_MANAGED_API_PORT, HA_MANAGED_URL
 
 _LOGGER = logging.getLogger(__name__)
 _TERMINATE_TIMEOUT = 5
-_SETUP_TIMEOUT = 30
-_SUCCESSFUL_BOOT_MESSAGE = "INF [api] listen addr="
-_LOCALHOST_IP = "127.0.0.1"
-_LOG_BUFFER_SIZE = 512
-_RESPAWN_COOLDOWN = 1
-
-# Default configuration for HA
-# - Api is listening only on localhost
-# - Enable rtsp for localhost only as ffmpeg needs it
-# - Clear default ice servers
-_GO2RTC_CONFIG_FORMAT = r"""# This file is managed by Home Assistant
-# Do not edit it manually
-
-api:
-  listen: "{api_ip}:{api_port}"
-
-rtsp:
-  listen: "127.0.0.1:18554"
-
-webrtc:
-  listen: ":18555/tcp"
-  ice_servers: []
-"""
-
-_LOG_LEVEL_MAP = {
-    "TRC": logging.DEBUG,
-    "DBG": logging.DEBUG,
-    "INF": logging.DEBUG,
-    "WRN": logging.WARNING,
-    "ERR": logging.WARNING,
-    "FTL": logging.ERROR,
-    "PNC": logging.ERROR,
-}
 
 
-class Go2RTCServerStartError(HomeAssistantError):
-    """Raised when server does not start."""
-
-    _message = "Go2rtc server didn't start correctly"
-
-
-class Go2RTCWatchdogError(HomeAssistantError):
-    """Raised on watchdog error."""
-
-
-def _create_temp_file(api_ip: str) -> str:
+def _create_temp_file() -> str:
     """Create temporary config file."""
     # Set delete=False to prevent the file from being deleted when the file is closed
     # Linux is clearing tmp folder on reboot, so no need to delete it manually
-    with NamedTemporaryFile(prefix="go2rtc_", suffix=".yaml", delete=False) as file:
-        file.write(
-            _GO2RTC_CONFIG_FORMAT.format(
-                api_ip=api_ip, api_port=HA_MANAGED_API_PORT
-            ).encode()
-        )
+    with NamedTemporaryFile(prefix="go2rtc", suffix=".yaml", delete=False) as file:
         return file.name
 
 
+async def _log_output(process: asyncio.subprocess.Process) -> None:
+    """Log the output of the process."""
+    assert process.stdout is not None
+
+    async for line in process.stdout:
+        _LOGGER.debug(line[:-1].decode().strip())
+
+
 class Server:
     """Go2rtc server."""
 
-    def __init__(
-        self, hass: HomeAssistant, binary: str, *, enable_ui: bool = False
-    ) -> None:
+    def __init__(self, hass: HomeAssistant, binary: str) -> None:
         """Initialize the server."""
         self._hass = hass
         self._binary = binary
-        self._log_buffer: deque[str] = deque(maxlen=_LOG_BUFFER_SIZE)
         self._process: asyncio.subprocess.Process | None = None
-        self._startup_complete = asyncio.Event()
-        self._api_ip = _LOCALHOST_IP
-        if enable_ui:
-            # Listen on all interfaces for allowing access from all ips
-            self._api_ip = ""
-        self._watchdog_task: asyncio.Task | None = None
-        self._watchdog_tasks: list[asyncio.Task] = []
 
     async def start(self) -> None:
-        """Start the server."""
-        await self._start()
-        self._watchdog_task = asyncio.create_task(
-            self._watchdog(), name="Go2rtc respawn"
-        )
-
-    async def _start(self) -> None:
         """Start the server."""
         _LOGGER.debug("Starting go2rtc server")
-        config_file = await self._hass.async_add_executor_job(
-            _create_temp_file, self._api_ip
-        )
-
-        self._startup_complete.clear()
+        config_file = await self._hass.async_add_executor_job(_create_temp_file)
 
         self._process = await asyncio.create_subprocess_exec(
             self._binary,
             "-c",
+            "webrtc.ice_servers=[]",
+            "-c",
             config_file,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.STDOUT,
-            close_fds=False,  # required for posix_spawn on CPython < 3.13
         )
 
         self._hass.async_create_background_task(
-            self._log_output(self._process), "Go2rtc log output"
+            _log_output(self._process), "Go2rtc log output"
         )
 
-        try:
-            async with asyncio.timeout(_SETUP_TIMEOUT):
-                await self._startup_complete.wait()
-        except TimeoutError as err:
-            msg = "Go2rtc server didn't start correctly"
-            _LOGGER.exception(msg)
-            self._log_server_output(logging.WARNING)
-            await self._stop()
-            raise Go2RTCServerStartError from err
-
-        # Check the server version
-        client = Go2RtcRestClient(async_get_clientsession(self._hass), HA_MANAGED_URL)
-        await client.validate_server_version()
-
-    async def _log_output(self, process: asyncio.subprocess.Process) -> None:
-        """Log the output of the process."""
-        assert process.stdout is not None
-
-        async for line in process.stdout:
-            msg = line[:-1].decode().strip()
-            self._log_buffer.append(msg)
-            loglevel = logging.WARNING
-            if len(split_msg := msg.split(" ", 2)) == 3:
-                loglevel = _LOG_LEVEL_MAP.get(split_msg[1], loglevel)
-            _LOGGER.log(loglevel, msg)
-            if not self._startup_complete.is_set() and _SUCCESSFUL_BOOT_MESSAGE in msg:
-                self._startup_complete.set()
-
-    def _log_server_output(self, loglevel: int) -> None:
-        """Log captured process output, then clear the log buffer."""
-        for line in list(self._log_buffer):  # Copy the deque to avoid mutation error
-            _LOGGER.log(loglevel, line)
-        self._log_buffer.clear()
-
-    async def _watchdog(self) -> None:
-        """Keep respawning go2rtc servers.
-
-        A new go2rtc server is spawned if the process terminates or the API
-        stops responding.
-        """
-        while True:
-            try:
-                monitor_process_task = asyncio.create_task(self._monitor_process())
-                self._watchdog_tasks.append(monitor_process_task)
-                monitor_process_task.add_done_callback(self._watchdog_tasks.remove)
-                monitor_api_task = asyncio.create_task(self._monitor_api())
-                self._watchdog_tasks.append(monitor_api_task)
-                monitor_api_task.add_done_callback(self._watchdog_tasks.remove)
-                try:
-                    await asyncio.gather(monitor_process_task, monitor_api_task)
-                except Go2RTCWatchdogError:
-                    _LOGGER.debug("Caught Go2RTCWatchdogError")
-                    for task in self._watchdog_tasks:
-                        if task.done():
-                            if not task.cancelled():
-                                task.exception()
-                            continue
-                        task.cancel()
-                    await asyncio.sleep(_RESPAWN_COOLDOWN)
-                    try:
-                        await self._stop()
-                        _LOGGER.warning("Go2rtc unexpectedly stopped, server log:")
-                        self._log_server_output(logging.WARNING)
-                        _LOGGER.debug("Spawning new go2rtc server")
-                        with suppress(Go2RTCServerStartError):
-                            await self._start()
-                    except Exception:
-                        _LOGGER.exception(
-                            "Unexpected error when restarting go2rtc server"
-                        )
-            except Exception:
-                _LOGGER.exception("Unexpected error in go2rtc server watchdog")
-
-    async def _monitor_process(self) -> None:
-        """Raise if the go2rtc process terminates."""
-        _LOGGER.debug("Monitoring go2rtc server process")
-        if self._process:
-            await self._process.wait()
-        _LOGGER.debug("go2rtc server terminated")
-        raise Go2RTCWatchdogError("Process ended")
-
-    async def _monitor_api(self) -> None:
-        """Raise if the go2rtc process terminates."""
-        client = Go2RtcRestClient(async_get_clientsession(self._hass), HA_MANAGED_URL)
-
-        _LOGGER.debug("Monitoring go2rtc API")
-        try:
-            while True:
-                await client.validate_server_version()
-                await asyncio.sleep(10)
-        except Exception as err:
-            _LOGGER.debug("go2rtc API did not reply", exc_info=True)
-            raise Go2RTCWatchdogError("API error") from err
-
-    async def _stop_watchdog(self) -> None:
-        """Handle watchdog stop request."""
-        tasks: list[asyncio.Task] = []
-        if watchdog_task := self._watchdog_task:
-            self._watchdog_task = None
-            tasks.append(watchdog_task)
-            watchdog_task.cancel()
-        for task in self._watchdog_tasks:
-            tasks.append(task)
-            task.cancel()
-        await asyncio.gather(*tasks, return_exceptions=True)
-
     async def stop(self) -> None:
-        """Stop the server and abort the watchdog task."""
-        _LOGGER.debug("Server stop requested")
-        await self._stop_watchdog()
-        await self._stop()
-
-    async def _stop(self) -> None:
         """Stop the server."""
         if self._process:
             _LOGGER.debug("Stopping go2rtc server")
             process = self._process
             self._process = None
-            with suppress(ProcessLookupError):
-                process.terminate()
+            process.terminate()
             try:
                 await asyncio.wait_for(process.wait(), timeout=_TERMINATE_TIMEOUT)
             except TimeoutError:
                 _LOGGER.warning("Go2rtc server didn't terminate gracefully. Killing it")
-                with suppress(ProcessLookupError):
-                    process.kill()
+                process.kill()
             else:
                 _LOGGER.debug("Go2rtc server has been stopped")
diff --git a/homeassistant/components/go2rtc/strings.json b/homeassistant/components/go2rtc/strings.json
index e350c19af96..0258dcac69e 100644
--- a/homeassistant/components/go2rtc/strings.json
+++ b/homeassistant/components/go2rtc/strings.json
@@ -1,8 +1,19 @@
 {
-  "issues": {
-    "recommended_version": {
-      "title": "Outdated go2rtc server detected",
-      "description": "We detected that you are using an outdated go2rtc server version. For the best experience, we recommend updating the go2rtc server to version `{recommended_version}`.\nCurrently you are using version `{current_version}`."
+  "config": {
+    "step": {
+      "url": {
+        "data": {
+          "url": "[%key:common::config_flow::data::url%]"
+        },
+        "data_description": {
+          "url": "The URL of your go2rtc instance."
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_url": "Invalid URL",
+      "invalid_url_schema": "Invalid URL scheme.\nThe URL should start with `http://` or `https://`."
     }
   }
 }
diff --git a/homeassistant/components/google/calendar.py b/homeassistant/components/google/calendar.py
index 5ac5dae616c..dea286237d3 100644
--- a/homeassistant/components/google/calendar.py
+++ b/homeassistant/components/google/calendar.py
@@ -10,14 +10,7 @@ from typing import Any, cast
 
 from gcal_sync.api import Range, SyncEventsRequest
 from gcal_sync.exceptions import ApiException
-from gcal_sync.model import (
-    AccessRole,
-    Calendar,
-    DateOrDatetime,
-    Event,
-    EventTypeEnum,
-    ResponseStatus,
-)
+from gcal_sync.model import AccessRole, Calendar, DateOrDatetime, Event, EventTypeEnum
 from gcal_sync.store import ScopedCalendarStore
 from gcal_sync.sync import CalendarEventSyncManager
 
@@ -374,14 +367,7 @@ class GoogleCalendarEntity(
         return event
 
     def _event_filter(self, event: Event) -> bool:
-        """Return True if the event is visible and not declined."""
-
-        if any(
-            attendee.is_self and attendee.response_status == ResponseStatus.DECLINED
-            for attendee in event.attendees
-        ):
-            return False
-
+        """Return True if the event is visible."""
         if event.event_type == EventTypeEnum.WORKING_LOCATION:
             return self.entity_description.working_location
         if self._ignore_availability:
diff --git a/homeassistant/components/google/config_flow.py b/homeassistant/components/google/config_flow.py
index 8ae09b58957..39b3c2d5666 100644
--- a/homeassistant/components/google/config_flow.py
+++ b/homeassistant/components/google/config_flow.py
@@ -238,12 +238,16 @@ class OAuth2FlowHandler(
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Create an options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Google Calendar options flow."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/google/manifest.json b/homeassistant/components/google/manifest.json
index 85c4714432b..c0afb4f9726 100644
--- a/homeassistant/components/google/manifest.json
+++ b/homeassistant/components/google/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google",
   "iot_class": "cloud_polling",
   "loggers": ["googleapiclient"],
-  "requirements": ["gcal-sync==6.2.0", "oauth2client==4.1.3", "ical==8.2.0"]
+  "requirements": ["gcal-sync==6.1.6", "oauth2client==4.1.3", "ical==8.2.0"]
 }
diff --git a/homeassistant/components/google/strings.json b/homeassistant/components/google/strings.json
index 2ea45239a53..c029b46051e 100644
--- a/homeassistant/components/google/strings.json
+++ b/homeassistant/components/google/strings.json
@@ -87,8 +87,8 @@
       }
     },
     "create_event": {
-      "name": "Create event",
-      "description": "Adds a new calendar event.",
+      "name": "Creates event",
+      "description": "Add a new calendar event.",
       "fields": {
         "summary": {
           "name": "Summary",
diff --git a/homeassistant/components/google_assistant/const.py b/homeassistant/components/google_assistant/const.py
index 8132ecaae2c..04c85639e07 100644
--- a/homeassistant/components/google_assistant/const.py
+++ b/homeassistant/components/google_assistant/const.py
@@ -78,7 +78,6 @@ TYPE_AWNING = f"{PREFIX_TYPES}AWNING"
 TYPE_BLINDS = f"{PREFIX_TYPES}BLINDS"
 TYPE_CAMERA = f"{PREFIX_TYPES}CAMERA"
 TYPE_CURTAIN = f"{PREFIX_TYPES}CURTAIN"
-TYPE_CARBON_MONOXIDE_DETECTOR = f"{PREFIX_TYPES}CARBON_MONOXIDE_DETECTOR"
 TYPE_DEHUMIDIFIER = f"{PREFIX_TYPES}DEHUMIDIFIER"
 TYPE_DOOR = f"{PREFIX_TYPES}DOOR"
 TYPE_DOORBELL = f"{PREFIX_TYPES}DOORBELL"
@@ -94,7 +93,6 @@ TYPE_SCENE = f"{PREFIX_TYPES}SCENE"
 TYPE_SENSOR = f"{PREFIX_TYPES}SENSOR"
 TYPE_SETTOP = f"{PREFIX_TYPES}SETTOP"
 TYPE_SHUTTER = f"{PREFIX_TYPES}SHUTTER"
-TYPE_SMOKE_DETECTOR = f"{PREFIX_TYPES}SMOKE_DETECTOR"
 TYPE_SPEAKER = f"{PREFIX_TYPES}SPEAKER"
 TYPE_SWITCH = f"{PREFIX_TYPES}SWITCH"
 TYPE_THERMOSTAT = f"{PREFIX_TYPES}THERMOSTAT"
@@ -138,7 +136,6 @@ EVENT_SYNC_RECEIVED = "google_assistant_sync"
 
 DOMAIN_TO_GOOGLE_TYPES = {
     alarm_control_panel.DOMAIN: TYPE_ALARM,
-    binary_sensor.DOMAIN: TYPE_SENSOR,
     button.DOMAIN: TYPE_SCENE,
     camera.DOMAIN: TYPE_CAMERA,
     climate.DOMAIN: TYPE_THERMOSTAT,
@@ -171,14 +168,6 @@ DEVICE_CLASS_TO_GOOGLE_TYPES = {
         binary_sensor.DOMAIN,
         binary_sensor.BinarySensorDeviceClass.GARAGE_DOOR,
     ): TYPE_GARAGE,
-    (
-        binary_sensor.DOMAIN,
-        binary_sensor.BinarySensorDeviceClass.SMOKE,
-    ): TYPE_SMOKE_DETECTOR,
-    (
-        binary_sensor.DOMAIN,
-        binary_sensor.BinarySensorDeviceClass.CO,
-    ): TYPE_CARBON_MONOXIDE_DETECTOR,
     (cover.DOMAIN, cover.CoverDeviceClass.AWNING): TYPE_AWNING,
     (cover.DOMAIN, cover.CoverDeviceClass.CURTAIN): TYPE_CURTAIN,
     (cover.DOMAIN, cover.CoverDeviceClass.DOOR): TYPE_DOOR,
diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py
index f99f1574038..9d3e1054a88 100644
--- a/homeassistant/components/google_assistant/trait.py
+++ b/homeassistant/components/google_assistant/trait.py
@@ -33,10 +33,7 @@ from homeassistant.components import (
     valve,
     water_heater,
 )
-from homeassistant.components.alarm_control_panel import (
-    AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import AlarmControlPanelEntityFeature
 from homeassistant.components.camera import CameraEntityFeature
 from homeassistant.components.climate import ClimateEntityFeature
 from homeassistant.components.cover import CoverEntityFeature
@@ -66,6 +63,13 @@ from homeassistant.const import (
     SERVICE_ALARM_TRIGGER,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
     STATE_IDLE,
     STATE_OFF,
     STATE_ON,
@@ -1553,19 +1557,19 @@ class ArmDisArmTrait(_Trait):
     commands = [COMMAND_ARM_DISARM]
 
     state_to_service = {
-        AlarmControlPanelState.ARMED_HOME: SERVICE_ALARM_ARM_HOME,
-        AlarmControlPanelState.ARMED_NIGHT: SERVICE_ALARM_ARM_NIGHT,
-        AlarmControlPanelState.ARMED_AWAY: SERVICE_ALARM_ARM_AWAY,
-        AlarmControlPanelState.ARMED_CUSTOM_BYPASS: SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-        AlarmControlPanelState.TRIGGERED: SERVICE_ALARM_TRIGGER,
+        STATE_ALARM_ARMED_HOME: SERVICE_ALARM_ARM_HOME,
+        STATE_ALARM_ARMED_NIGHT: SERVICE_ALARM_ARM_NIGHT,
+        STATE_ALARM_ARMED_AWAY: SERVICE_ALARM_ARM_AWAY,
+        STATE_ALARM_ARMED_CUSTOM_BYPASS: SERVICE_ALARM_ARM_CUSTOM_BYPASS,
+        STATE_ALARM_TRIGGERED: SERVICE_ALARM_TRIGGER,
     }
 
     state_to_support = {
-        AlarmControlPanelState.ARMED_HOME: AlarmControlPanelEntityFeature.ARM_HOME,
-        AlarmControlPanelState.ARMED_NIGHT: AlarmControlPanelEntityFeature.ARM_NIGHT,
-        AlarmControlPanelState.ARMED_AWAY: AlarmControlPanelEntityFeature.ARM_AWAY,
-        AlarmControlPanelState.ARMED_CUSTOM_BYPASS: AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS,
-        AlarmControlPanelState.TRIGGERED: AlarmControlPanelEntityFeature.TRIGGER,
+        STATE_ALARM_ARMED_HOME: AlarmControlPanelEntityFeature.ARM_HOME,
+        STATE_ALARM_ARMED_NIGHT: AlarmControlPanelEntityFeature.ARM_NIGHT,
+        STATE_ALARM_ARMED_AWAY: AlarmControlPanelEntityFeature.ARM_AWAY,
+        STATE_ALARM_ARMED_CUSTOM_BYPASS: AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS,
+        STATE_ALARM_TRIGGERED: AlarmControlPanelEntityFeature.TRIGGER,
     }
     """The list of states to support in increasing security state."""
 
@@ -1591,8 +1595,8 @@ class ArmDisArmTrait(_Trait):
     def _default_arm_state(self):
         states = self._supported_states()
 
-        if AlarmControlPanelState.TRIGGERED in states:
-            states.remove(AlarmControlPanelState.TRIGGERED)
+        if STATE_ALARM_TRIGGERED in states:
+            states.remove(STATE_ALARM_TRIGGERED)
 
         if not states:
             raise SmartHomeError(ERR_NOT_SUPPORTED, "ArmLevel missing")
@@ -1607,7 +1611,7 @@ class ArmDisArmTrait(_Trait):
             # level synonyms are generated from state names
             # 'armed_away' becomes 'armed away' or 'away'
             level_synonym = [state.replace("_", " ")]
-            if state != AlarmControlPanelState.TRIGGERED:
+            if state != STATE_ALARM_TRIGGERED:
                 level_synonym.append(state.split("_")[1])
 
             level = {
@@ -1648,11 +1652,11 @@ class ArmDisArmTrait(_Trait):
         elif (
             params["arm"]
             and params.get("cancel")
-            and self.state.state == AlarmControlPanelState.PENDING
+            and self.state.state == STATE_ALARM_PENDING
         ):
             service = SERVICE_ALARM_DISARM
         else:
-            if self.state.state == AlarmControlPanelState.DISARMED:
+            if self.state.state == STATE_ALARM_DISARMED:
                 raise SmartHomeError(ERR_ALREADY_DISARMED, "System is already disarmed")
             _verify_pin_challenge(data, self.state, challenge)
             service = SERVICE_ALARM_DISARM
@@ -2706,21 +2710,6 @@ class SensorStateTrait(_Trait):
         ),
     }
 
-    binary_sensor_types = {
-        binary_sensor.BinarySensorDeviceClass.CO: (
-            "CarbonMonoxideLevel",
-            ["carbon monoxide detected", "no carbon monoxide detected", "unknown"],
-        ),
-        binary_sensor.BinarySensorDeviceClass.SMOKE: (
-            "SmokeLevel",
-            ["smoke detected", "no smoke detected", "unknown"],
-        ),
-        binary_sensor.BinarySensorDeviceClass.MOISTURE: (
-            "WaterLeak",
-            ["leak", "no leak", "unknown"],
-        ),
-    }
-
     name = TRAIT_SENSOR_STATE
     commands: list[str] = []
 
@@ -2743,37 +2732,24 @@ class SensorStateTrait(_Trait):
     @classmethod
     def supported(cls, domain, features, device_class, _):
         """Test if state is supported."""
-        return (domain == sensor.DOMAIN and device_class in cls.sensor_types) or (
-            domain == binary_sensor.DOMAIN and device_class in cls.binary_sensor_types
-        )
+        return domain == sensor.DOMAIN and device_class in cls.sensor_types
 
     def sync_attributes(self) -> dict[str, Any]:
         """Return attributes for a sync request."""
         device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
+        data = self.sensor_types.get(device_class)
 
-        def create_sensor_state(
-            name: str,
-            raw_value_unit: str | None = None,
-            available_states: list[str] | None = None,
-        ) -> dict[str, Any]:
-            sensor_state: dict[str, Any] = {
-                "name": name,
-            }
-            if raw_value_unit:
-                sensor_state["numericCapabilities"] = {"rawValueUnit": raw_value_unit}
-            if available_states:
-                sensor_state["descriptiveCapabilities"] = {
-                    "availableStates": available_states
-                }
-            return {"sensorStatesSupported": [sensor_state]}
+        if device_class is None or data is None:
+            return {}
 
-        if self.state.domain == sensor.DOMAIN:
-            sensor_data = self.sensor_types.get(device_class)
-            if device_class is None or sensor_data is None:
-                return {}
-            available_states: list[str] | None = None
-            if device_class == sensor.SensorDeviceClass.AQI:
-                available_states = [
+        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",
@@ -2781,53 +2757,30 @@ class SensorStateTrait(_Trait):
                     "very unhealthy",
                     "hazardous",
                     "unknown",
-                ]
-            return create_sensor_state(sensor_data[0], sensor_data[1], available_states)
-        binary_sensor_data = self.binary_sensor_types.get(device_class)
-        if device_class is None or binary_sensor_data is None:
-            return {}
-        return create_sensor_state(
-            binary_sensor_data[0], available_states=binary_sensor_data[1]
-        )
+                ],
+            }
+
+        return {"sensorStatesSupported": [sensor_state]}
 
     def query_attributes(self) -> dict[str, Any]:
         """Return the attributes of this trait for this entity."""
         device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
+        data = self.sensor_types.get(device_class)
 
-        def create_sensor_state(
-            name: str, raw_value: float | None = None, current_state: str | None = None
-        ) -> dict[str, Any]:
-            sensor_state: dict[str, Any] = {
-                "name": name,
-                "rawValue": raw_value,
-            }
-            if current_state:
-                sensor_state["currentSensorState"] = current_state
-            return {"currentSensorStateData": [sensor_state]}
-
-        if self.state.domain == sensor.DOMAIN:
-            sensor_data = self.sensor_types.get(device_class)
-            if device_class is None or sensor_data is None:
-                return {}
-            try:
-                value = float(self.state.state)
-            except ValueError:
-                value = None
-            if self.state.state == STATE_UNKNOWN:
-                value = None
-            current_state: str | None = None
-            if device_class == sensor.SensorDeviceClass.AQI:
-                current_state = self._air_quality_description_for_aqi(value)
-            return create_sensor_state(sensor_data[0], value, current_state)
-
-        binary_sensor_data = self.binary_sensor_types.get(device_class)
-        if device_class is None or binary_sensor_data is None:
+        if device_class is None or data is None:
             return {}
-        value = {
-            STATE_ON: 0,
-            STATE_OFF: 1,
-            STATE_UNKNOWN: 2,
-        }[self.state.state]
-        return create_sensor_state(
-            binary_sensor_data[0], current_state=binary_sensor_data[1][value]
-        )
+
+        try:
+            value = float(self.state.state)
+        except ValueError:
+            value = None
+        if self.state.state == STATE_UNKNOWN:
+            value = None
+        sensor_data = {"name": data[0], "rawValue": value}
+
+        if device_class == sensor.SensorDeviceClass.AQI:
+            sensor_data["currentSensorState"] = self._air_quality_description_for_aqi(
+                value
+            )
+
+        return {"currentSensorStateData": [sensor_data]}
diff --git a/homeassistant/components/google_assistant_sdk/config_flow.py b/homeassistant/components/google_assistant_sdk/config_flow.py
index cd78c90e297..ea1ebe9e24a 100644
--- a/homeassistant/components/google_assistant_sdk/config_flow.py
+++ b/homeassistant/components/google_assistant_sdk/config_flow.py
@@ -84,12 +84,16 @@ class OAuth2FlowHandler(
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Create the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Google Assistant SDK options flow."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/google_cloud/config_flow.py b/homeassistant/components/google_cloud/config_flow.py
index fa6c952022b..dec849de4e6 100644
--- a/homeassistant/components/google_cloud/config_flow.py
+++ b/homeassistant/components/google_cloud/config_flow.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.core import callback
 from homeassistant.helpers.selector import (
@@ -135,10 +135,10 @@ class GoogleCloudConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> GoogleCloudOptionsFlowHandler:
         """Create the options flow."""
-        return GoogleCloudOptionsFlowHandler()
+        return GoogleCloudOptionsFlowHandler(config_entry)
 
 
-class GoogleCloudOptionsFlowHandler(OptionsFlow):
+class GoogleCloudOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Google Cloud options flow."""
 
     async def async_step_init(
@@ -169,7 +169,7 @@ class GoogleCloudOptionsFlowHandler(OptionsFlow):
                             )
                         ),
                         **tts_options_schema(
-                            self.config_entry.options, voices, from_config_flow=True
+                            self.options, voices, from_config_flow=True
                         ).schema,
                         vol.Optional(
                             CONF_STT_MODEL,
@@ -182,6 +182,6 @@ class GoogleCloudOptionsFlowHandler(OptionsFlow):
                         ),
                     }
                 ),
-                self.config_entry.options,
+                self.options,
             ),
         )
diff --git a/homeassistant/components/google_cloud/helpers.py b/homeassistant/components/google_cloud/helpers.py
index f6e89fae7fa..3c614156132 100644
--- a/homeassistant/components/google_cloud/helpers.py
+++ b/homeassistant/components/google_cloud/helpers.py
@@ -52,7 +52,7 @@ async def async_tts_voices(
 
 
 def tts_options_schema(
-    config_options: Mapping[str, Any],
+    config_options: dict[str, Any],
     voices: dict[str, list[str]],
     from_config_flow: bool = False,
 ) -> vol.Schema:
diff --git a/homeassistant/components/google_generative_ai_conversation/config_flow.py b/homeassistant/components/google_generative_ai_conversation/config_flow.py
index 83eec25ed15..bccc7d1fb84 100644
--- a/homeassistant/components/google_generative_ai_conversation/config_flow.py
+++ b/homeassistant/components/google_generative_ai_conversation/config_flow.py
@@ -163,6 +163,7 @@ class GoogleGenerativeAIOptionsFlow(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self.last_rendered_recommended = config_entry.options.get(
             CONF_RECOMMENDED, False
         )
diff --git a/homeassistant/components/google_tasks/todo.py b/homeassistant/components/google_tasks/todo.py
index 5196f89728d..95c5f1c3a16 100644
--- a/homeassistant/components/google_tasks/todo.py
+++ b/homeassistant/components/google_tasks/todo.py
@@ -106,7 +106,7 @@ class GoogleTaskTodoListEntity(
         config_entry_id: str,
         task_list_id: str,
     ) -> None:
-        """Initialize GoogleTaskTodoListEntity."""
+        """Initialize LocalTodoListEntity."""
         super().__init__(coordinator)
         self._attr_name = name.capitalize()
         self._attr_unique_id = f"{config_entry_id}-{task_list_id}"
@@ -153,9 +153,9 @@ class GoogleTaskTodoListEntity(
 def _order_tasks(tasks: list[dict[str, Any]]) -> list[dict[str, Any]]:
     """Order the task items response.
 
-    All tasks have an order amongst their siblings based on position.
+    All tasks have an order amongst their sibblings based on position.
 
-    Home Assistant To-do items do not support the Google Task parent/sibling
+        Home Assistant To-do items do not support the Google Task parent/sibbling
     relationships and the desired behavior is for them to be filtered.
     """
     parents = [task for task in tasks if task.get("parent") is None]
diff --git a/homeassistant/components/google_travel_time/config_flow.py b/homeassistant/components/google_travel_time/config_flow.py
index 08de293bc7d..ee809a23aea 100644
--- a/homeassistant/components/google_travel_time/config_flow.py
+++ b/homeassistant/components/google_travel_time/config_flow.py
@@ -148,6 +148,10 @@ def default_options(hass: HomeAssistant) -> dict[str, str]:
 class GoogleOptionsFlow(OptionsFlow):
     """Handle an options flow for Google Travel Time."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize google options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(self, user_input=None) -> ConfigFlowResult:
         """Handle the initial step."""
         if user_input is not None:
@@ -209,7 +213,7 @@ class GoogleTravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> GoogleOptionsFlow:
         """Get the options flow for this handler."""
-        return GoogleOptionsFlow()
+        return GoogleOptionsFlow(config_entry)
 
     async def async_step_user(self, user_input=None) -> ConfigFlowResult:
         """Handle the initial step."""
diff --git a/homeassistant/components/govee_light_local/__init__.py b/homeassistant/components/govee_light_local/__init__.py
index 44dbc825665..088f9bae22b 100644
--- a/homeassistant/components/govee_light_local/__init__.py
+++ b/homeassistant/components/govee_light_local/__init__.py
@@ -9,21 +9,23 @@ import logging
 
 from govee_local_api.controller import LISTENING_PORT
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import DISCOVERY_TIMEOUT
-from .coordinator import GoveeLocalApiCoordinator, GoveeLocalConfigEntry
+from .const import DISCOVERY_TIMEOUT, DOMAIN
+from .coordinator import GoveeLocalApiCoordinator
 
 PLATFORMS: list[Platform] = [Platform.LIGHT]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: GoveeLocalConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Govee light local from a config entry."""
-    coordinator = GoveeLocalApiCoordinator(hass=hass)
+
+    coordinator: GoveeLocalApiCoordinator = GoveeLocalApiCoordinator(hass=hass)
 
     async def await_cleanup():
         cleanup_complete: asyncio.Event = coordinator.cleanup()
@@ -50,11 +52,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: GoveeLocalConfigEntry) -
     except TimeoutError as ex:
         raise ConfigEntryNotReady from ex
 
-    entry.runtime_data = coordinator
+    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: GoveeLocalConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+    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/govee_light_local/coordinator.py b/homeassistant/components/govee_light_local/coordinator.py
index 240313a34b8..64119f1871c 100644
--- a/homeassistant/components/govee_light_local/coordinator.py
+++ b/homeassistant/components/govee_light_local/coordinator.py
@@ -6,7 +6,6 @@ import logging
 
 from govee_local_api import GoveeController, GoveeDevice
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
@@ -20,8 +19,6 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-type GoveeLocalConfigEntry = ConfigEntry[GoveeLocalApiCoordinator]
-
 
 class GoveeLocalApiCoordinator(DataUpdateCoordinator[list[GoveeDevice]]):
     """Govee light local coordinator."""
diff --git a/homeassistant/components/govee_light_local/light.py b/homeassistant/components/govee_light_local/light.py
index cb2e24fa8a6..fb52c233436 100644
--- a/homeassistant/components/govee_light_local/light.py
+++ b/homeassistant/components/govee_light_local/light.py
@@ -15,25 +15,26 @@ from homeassistant.components.light import (
     LightEntity,
     filter_supported_color_modes,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
-from .coordinator import GoveeLocalApiCoordinator, GoveeLocalConfigEntry
+from .coordinator import GoveeLocalApiCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: GoveeLocalConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Govee light setup."""
 
-    coordinator = config_entry.runtime_data
+    coordinator: GoveeLocalApiCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
     def discovery_callback(device: GoveeDevice, is_new: bool) -> bool:
         if is_new:
diff --git a/homeassistant/components/govee_light_local/manifest.json b/homeassistant/components/govee_light_local/manifest.json
index a94d4e58e9a..b6b25f5aa09 100644
--- a/homeassistant/components/govee_light_local/manifest.json
+++ b/homeassistant/components/govee_light_local/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["network"],
   "documentation": "https://www.home-assistant.io/integrations/govee_light_local",
   "iot_class": "local_push",
-  "requirements": ["govee-local-api==1.5.3"]
+  "requirements": ["govee-local-api==1.5.2"]
 }
diff --git a/homeassistant/components/group/registry.py b/homeassistant/components/group/registry.py
index 7ac5770f171..e0a74d32f44 100644
--- a/homeassistant/components/group/registry.py
+++ b/homeassistant/components/group/registry.py
@@ -8,7 +8,6 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Protocol
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.components.climate import HVACMode
 from homeassistant.components.lock import LockState
 from homeassistant.components.vacuum import STATE_CLEANING, STATE_ERROR, STATE_RETURNING
@@ -21,6 +20,12 @@ from homeassistant.components.water_heater import (
     STATE_PERFORMANCE,
 )
 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_TRIGGERED,
     STATE_CLOSED,
     STATE_HOME,
     STATE_IDLE,
@@ -55,12 +60,12 @@ ON_OFF_STATES: dict[Platform | str, tuple[set[str], str, str]] = {
     Platform.ALARM_CONTROL_PANEL: (
         {
             STATE_ON,
-            AlarmControlPanelState.ARMED_AWAY,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_HOME,
-            AlarmControlPanelState.ARMED_NIGHT,
-            AlarmControlPanelState.ARMED_VACATION,
-            AlarmControlPanelState.TRIGGERED,
+            STATE_ALARM_ARMED_AWAY,
+            STATE_ALARM_ARMED_CUSTOM_BYPASS,
+            STATE_ALARM_ARMED_HOME,
+            STATE_ALARM_ARMED_NIGHT,
+            STATE_ALARM_ARMED_VACATION,
+            STATE_ALARM_TRIGGERED,
         },
         STATE_ON,
         STATE_OFF,
diff --git a/homeassistant/components/group/sensor.py b/homeassistant/components/group/sensor.py
index 4a3e191e511..32744bebc33 100644
--- a/homeassistant/components/group/sensor.py
+++ b/homeassistant/components/group/sensor.py
@@ -36,7 +36,14 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import HomeAssistant, State, callback
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+)
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity import (
@@ -45,6 +52,7 @@ from homeassistant.helpers.entity import (
     get_unit_of_measurement,
 )
 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,
@@ -172,17 +180,6 @@ def async_create_preview_sensor(
     )
 
 
-def _has_numeric_state(hass: HomeAssistant, entity_id: str) -> bool:
-    """Test if state is numeric."""
-    if not (state := hass.states.get(entity_id)):
-        return False
-    try:
-        float(state.state)
-    except ValueError:
-        return False
-    return True
-
-
 def calc_min(
     sensor_values: list[tuple[str, float, State]],
 ) -> tuple[dict[str, str | None], float | None]:
@@ -335,11 +332,12 @@ class SensorGroup(GroupEntity, SensorEntity):
         self.hass = hass
         self._entity_ids = entity_ids
         self._sensor_type = sensor_type
-        self._configured_state_class = state_class
-        self._configured_device_class = device_class
-        self._configured_unit_of_measurement = unit_of_measurement
+        self._state_class = state_class
+        self._device_class = device_class
+        self._native_unit_of_measurement = unit_of_measurement
         self._valid_units: set[str | None] = set()
         self._can_convert: bool = False
+        self.calculate_attributes_later: CALLBACK_TYPE | None = None
         self._attr_name = name
         if name == DEFAULT_NAME:
             self._attr_name = f"{DEFAULT_NAME} {sensor_type}".capitalize()
@@ -354,25 +352,39 @@ class SensorGroup(GroupEntity, SensorEntity):
         self._state_incorrect: set[str] = set()
         self._extra_state_attribute: dict[str, Any] = {}
 
-    def calculate_state_attributes(self, valid_state_entities: list[str]) -> None:
+    async def async_added_to_hass(self) -> None:
+        """When added to hass."""
+        for entity_id in self._entity_ids:
+            if self.hass.states.get(entity_id) is None:
+                self.calculate_attributes_later = async_track_state_change_event(
+                    self.hass, self._entity_ids, self.calculate_state_attributes
+                )
+                break
+        if not self.calculate_attributes_later:
+            await self.calculate_state_attributes()
+        await super().async_added_to_hass()
+
+    async def calculate_state_attributes(
+        self, event: Event[EventStateChangedData] | None = None
+    ) -> None:
         """Calculate state attributes."""
-        self._attr_state_class = self._calculate_state_class(
-            self._configured_state_class, valid_state_entities
-        )
-        self._attr_device_class = self._calculate_device_class(
-            self._configured_device_class, valid_state_entities
-        )
+        for entity_id in self._entity_ids:
+            if self.hass.states.get(entity_id) is None:
+                return
+        if self.calculate_attributes_later:
+            self.calculate_attributes_later()
+            self.calculate_attributes_later = None
+        self._attr_state_class = self._calculate_state_class(self._state_class)
+        self._attr_device_class = self._calculate_device_class(self._device_class)
         self._attr_native_unit_of_measurement = self._calculate_unit_of_measurement(
-            self._configured_unit_of_measurement, valid_state_entities
+            self._native_unit_of_measurement
         )
         self._valid_units = self._get_valid_units()
 
     @callback
     def async_update_group_state(self) -> None:
         """Query all members and determine the sensor group state."""
-        self.calculate_state_attributes(self._get_valid_entities())
         states: list[StateType] = []
-        valid_units = self._valid_units
         valid_states: list[bool] = []
         sensor_values: list[tuple[str, float, State]] = []
         for entity_id in self._entity_ids:
@@ -380,18 +392,20 @@ class SensorGroup(GroupEntity, SensorEntity):
                 states.append(state.state)
                 try:
                     numeric_state = float(state.state)
-                    uom = state.attributes.get("unit_of_measurement")
-
-                    # Convert the state to the native unit of measurement when we have valid units
-                    # and a correct device class
-                    if valid_units and uom in valid_units and self._can_convert is True:
+                    if (
+                        self._valid_units
+                        and (uom := state.attributes["unit_of_measurement"])
+                        in self._valid_units
+                        and self._can_convert is True
+                    ):
                         numeric_state = UNIT_CONVERTERS[self.device_class].convert(
                             numeric_state, uom, self.native_unit_of_measurement
                         )
-
-                    # If we have valid units and the entity's unit does not match
-                    # we raise which skips the state and log a warning once
-                    if valid_units and uom not in valid_units:
+                    if (
+                        self._valid_units
+                        and (uom := state.attributes["unit_of_measurement"])
+                        not in self._valid_units
+                    ):
                         raise HomeAssistantError("Not a valid unit")  # noqa: TRY301
 
                     sensor_values.append((entity_id, numeric_state, state))
@@ -466,9 +480,7 @@ class SensorGroup(GroupEntity, SensorEntity):
         return None
 
     def _calculate_state_class(
-        self,
-        state_class: SensorStateClass | None,
-        valid_state_entities: list[str],
+        self, state_class: SensorStateClass | None
     ) -> SensorStateClass | None:
         """Calculate state class.
 
@@ -479,18 +491,8 @@ class SensorGroup(GroupEntity, SensorEntity):
         """
         if state_class:
             return state_class
-
-        if not valid_state_entities:
-            return None
-
-        if not self._ignore_non_numeric and len(valid_state_entities) < len(
-            self._entity_ids
-        ):
-            # Only return state class if all states are valid when not ignoring non numeric
-            return None
-
         state_classes: list[SensorStateClass] = []
-        for entity_id in valid_state_entities:
+        for entity_id in self._entity_ids:
             try:
                 _state_class = get_capability(self.hass, entity_id, "state_class")
             except HomeAssistantError:
@@ -521,9 +523,7 @@ class SensorGroup(GroupEntity, SensorEntity):
         return None
 
     def _calculate_device_class(
-        self,
-        device_class: SensorDeviceClass | None,
-        valid_state_entities: list[str],
+        self, device_class: SensorDeviceClass | None
     ) -> SensorDeviceClass | None:
         """Calculate device class.
 
@@ -534,18 +534,8 @@ class SensorGroup(GroupEntity, SensorEntity):
         """
         if device_class:
             return device_class
-
-        if not valid_state_entities:
-            return None
-
-        if not self._ignore_non_numeric and len(valid_state_entities) < len(
-            self._entity_ids
-        ):
-            # Only return device class if all states are valid when not ignoring non numeric
-            return None
-
         device_classes: list[SensorDeviceClass] = []
-        for entity_id in valid_state_entities:
+        for entity_id in self._entity_ids:
             try:
                 _device_class = get_device_class(self.hass, entity_id)
             except HomeAssistantError:
@@ -578,9 +568,7 @@ class SensorGroup(GroupEntity, SensorEntity):
         return None
 
     def _calculate_unit_of_measurement(
-        self,
-        unit_of_measurement: str | None,
-        valid_state_entities: list[str],
+        self, unit_of_measurement: str | None
     ) -> str | None:
         """Calculate the unit of measurement.
 
@@ -591,17 +579,8 @@ class SensorGroup(GroupEntity, SensorEntity):
         if unit_of_measurement:
             return unit_of_measurement
 
-        if not valid_state_entities:
-            return None
-
-        if not self._ignore_non_numeric and len(valid_state_entities) < len(
-            self._entity_ids
-        ):
-            # Only return device class if all states are valid when not ignoring non numeric
-            return None
-
         unit_of_measurements: list[str] = []
-        for entity_id in valid_state_entities:
+        for entity_id in self._entity_ids:
             try:
                 _unit_of_measurement = get_unit_of_measurement(self.hass, entity_id)
             except HomeAssistantError:
@@ -686,31 +665,19 @@ class SensorGroup(GroupEntity, SensorEntity):
 
         If device class is set and compatible unit of measurements.
         If device class is not set, use one unit of measurement.
-        Only calculate valid units if there are no valid units set.
         """
-        if (valid_units := self._valid_units) and not self._ignore_non_numeric:
-            # If we have valid units already and not using ignore_non_numeric
-            # we should not recalculate.
-            return valid_units
-
-        native_uom = self.native_unit_of_measurement
-        if (device_class := self.device_class) in UNIT_CONVERTERS and native_uom:
+        if (
+            device_class := self.device_class
+        ) in UNIT_CONVERTERS and self.native_unit_of_measurement:
             self._can_convert = True
             return UNIT_CONVERTERS[device_class].VALID_UNITS
-        if device_class and (device_class) in DEVICE_CLASS_UNITS and native_uom:
+        if (
+            device_class
+            and (device_class) in DEVICE_CLASS_UNITS
+            and self.native_unit_of_measurement
+        ):
             valid_uoms: set = DEVICE_CLASS_UNITS[device_class]
             return valid_uoms
-        if device_class is None and native_uom:
-            return {native_uom}
+        if device_class is None and self.native_unit_of_measurement:
+            return {self.native_unit_of_measurement}
         return set()
-
-    def _get_valid_entities(
-        self,
-    ) -> list[str]:
-        """Return list of valid entities."""
-
-        return [
-            entity_id
-            for entity_id in self._entity_ids
-            if _has_numeric_state(self.hass, entity_id)
-        ]
diff --git a/homeassistant/components/habitica/__init__.py b/homeassistant/components/habitica/__init__.py
index 5843e14d63e..21938aa06a6 100644
--- a/homeassistant/components/habitica/__init__.py
+++ b/homeassistant/components/habitica/__init__.py
@@ -1,13 +1,17 @@
 """The habitica integration."""
 
 from http import HTTPStatus
+import logging
+from typing import Any
 
 from aiohttp import ClientResponseError
 from habitipy.aio import HabitipyAsync
+import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     APPLICATION_NAME,
+    ATTR_NAME,
     CONF_API_KEY,
     CONF_NAME,
     CONF_URL,
@@ -15,34 +19,140 @@ from homeassistant.const import (
     Platform,
     __version__,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+)
+from homeassistant.exceptions import (
+    ConfigEntryNotReady,
+    HomeAssistantError,
+    ServiceValidationError,
+)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.selector import ConfigEntrySelector
 from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_API_USER, DEVELOPER_ID, DOMAIN
+from .const import (
+    ATTR_ARGS,
+    ATTR_CONFIG_ENTRY,
+    ATTR_DATA,
+    ATTR_PATH,
+    ATTR_SKILL,
+    ATTR_TASK,
+    CONF_API_USER,
+    DEVELOPER_ID,
+    DOMAIN,
+    EVENT_API_CALL_SUCCESS,
+    SERVICE_API_CALL,
+    SERVICE_CAST_SKILL,
+)
 from .coordinator import HabiticaDataUpdateCoordinator
-from .services import async_setup_services
-from .types import HabiticaConfigEntry
 
+_LOGGER = logging.getLogger(__name__)
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
+type HabiticaConfigEntry = ConfigEntry[HabiticaDataUpdateCoordinator]
 
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.BUTTON,
-    Platform.CALENDAR,
-    Platform.SENSOR,
-    Platform.SWITCH,
-    Platform.TODO,
-]
+
+PLATFORMS = [Platform.BUTTON, Platform.SENSOR, Platform.SWITCH, Platform.TODO]
+
+
+SERVICE_API_CALL_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_NAME): str,
+        vol.Required(ATTR_PATH): vol.All(cv.ensure_list, [str]),
+        vol.Optional(ATTR_ARGS): dict,
+    }
+)
+SERVICE_CAST_SKILL_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
+        vol.Required(ATTR_SKILL): cv.string,
+        vol.Optional(ATTR_TASK): cv.string,
+    }
+)
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Habitica service."""
 
-    async_setup_services(hass)
+    async def cast_skill(call: ServiceCall) -> ServiceResponse:
+        """Skill action."""
+        entry: HabiticaConfigEntry | None
+        if not (
+            entry := hass.config_entries.async_get_entry(call.data[ATTR_CONFIG_ENTRY])
+        ):
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="entry_not_found",
+            )
+        coordinator = entry.runtime_data
+        skill = {
+            "pickpocket": {"spellId": "pickPocket", "cost": "10 MP"},
+            "backstab": {"spellId": "backStab", "cost": "15 MP"},
+            "smash": {"spellId": "smash", "cost": "10 MP"},
+            "fireball": {"spellId": "fireball", "cost": "10 MP"},
+        }
+        try:
+            task_id = next(
+                task["id"]
+                for task in coordinator.data.tasks
+                if call.data[ATTR_TASK] in (task["id"], task.get("alias"))
+                or call.data[ATTR_TASK] == task["text"]
+            )
+        except StopIteration as e:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="task_not_found",
+                translation_placeholders={"task": f"'{call.data[ATTR_TASK]}'"},
+            ) from e
+
+        try:
+            response: dict[str, Any] = await coordinator.api.user.class_.cast[
+                skill[call.data[ATTR_SKILL]]["spellId"]
+            ].post(targetId=task_id)
+        except ClientResponseError as e:
+            if e.status == HTTPStatus.TOO_MANY_REQUESTS:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="setup_rate_limit_exception",
+                ) from e
+            if e.status == HTTPStatus.UNAUTHORIZED:
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="not_enough_mana",
+                    translation_placeholders={
+                        "cost": skill[call.data[ATTR_SKILL]]["cost"],
+                        "mana": f"{int(coordinator.data.user.get("stats", {}).get("mp", 0))} MP",
+                    },
+                ) from e
+            if e.status == HTTPStatus.NOT_FOUND:
+                # could also be task not found, but the task is looked up
+                # before the request, so most likely wrong skill selected
+                # or the skill hasn't been unlocked yet.
+                raise ServiceValidationError(
+                    translation_domain=DOMAIN,
+                    translation_key="skill_not_found",
+                    translation_placeholders={"skill": call.data[ATTR_SKILL]},
+                ) from e
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="service_call_exception",
+            ) from e
+        else:
+            await coordinator.async_request_refresh()
+            return response
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_CAST_SKILL,
+        cast_skill,
+        schema=SERVICE_CAST_SKILL_SCHEMA,
+        supports_response=SupportsResponse.ONLY,
+    )
     return True
 
 
@@ -64,6 +174,33 @@ async def async_setup_entry(
             )
             return headers
 
+    async def handle_api_call(call: ServiceCall) -> None:
+        name = call.data[ATTR_NAME]
+        path = call.data[ATTR_PATH]
+        entries = hass.config_entries.async_entries(DOMAIN)
+
+        api = None
+        for entry in entries:
+            if entry.data[CONF_NAME] == name:
+                api = entry.runtime_data.api
+                break
+        if api is None:
+            _LOGGER.error("API_CALL: User '%s' not configured", name)
+            return
+        try:
+            for element in path:
+                api = api[element]
+        except KeyError:
+            _LOGGER.error(
+                "API_CALL: Path %s is invalid for API on '{%s}' element", path, element
+            )
+            return
+        kwargs = call.data.get(ATTR_ARGS, {})
+        data = await api(**kwargs)
+        hass.bus.async_fire(
+            EVENT_API_CALL_SUCCESS, {ATTR_NAME: name, ATTR_PATH: path, ATTR_DATA: data}
+        )
+
     websession = async_get_clientsession(
         hass, verify_ssl=config_entry.data.get(CONF_VERIFY_SSL, True)
     )
@@ -99,9 +236,16 @@ async def async_setup_entry(
     config_entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
+    if not hass.services.has_service(DOMAIN, SERVICE_API_CALL):
+        hass.services.async_register(
+            DOMAIN, SERVICE_API_CALL, handle_api_call, schema=SERVICE_API_CALL_SCHEMA
+        )
+
     return True
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
+    if len(hass.config_entries.async_entries(DOMAIN)) == 1:
+        hass.services.async_remove(DOMAIN, SERVICE_API_CALL)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/habitica/binary_sensor.py b/homeassistant/components/habitica/binary_sensor.py
deleted file mode 100644
index bc79370ea63..00000000000
--- a/homeassistant/components/habitica/binary_sensor.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""Binary sensor platform for Habitica integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from enum import StrEnum
-from typing import Any
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import ASSETS_URL
-from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
-
-
-@dataclass(kw_only=True, frozen=True)
-class HabiticaBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Habitica Binary Sensor Description."""
-
-    value_fn: Callable[[dict[str, Any]], bool | None]
-    entity_picture: Callable[[dict[str, Any]], str | None]
-
-
-class HabiticaBinarySensor(StrEnum):
-    """Habitica Entities."""
-
-    PENDING_QUEST = "pending_quest"
-
-
-def get_scroll_image_for_pending_quest_invitation(user: dict[str, Any]) -> str | None:
-    """Entity picture for pending quest invitation."""
-    if user["party"]["quest"].get("key") and user["party"]["quest"]["RSVPNeeded"]:
-        return f"inventory_quest_scroll_{user["party"]["quest"]["key"]}.png"
-    return None
-
-
-BINARY_SENSOR_DESCRIPTIONS: tuple[HabiticaBinarySensorEntityDescription, ...] = (
-    HabiticaBinarySensorEntityDescription(
-        key=HabiticaBinarySensor.PENDING_QUEST,
-        translation_key=HabiticaBinarySensor.PENDING_QUEST,
-        value_fn=lambda user: user["party"]["quest"]["RSVPNeeded"],
-        entity_picture=get_scroll_image_for_pending_quest_invitation,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the habitica binary sensors."""
-
-    coordinator = config_entry.runtime_data
-
-    async_add_entities(
-        HabiticaBinarySensorEntity(coordinator, description)
-        for description in BINARY_SENSOR_DESCRIPTIONS
-    )
-
-
-class HabiticaBinarySensorEntity(HabiticaBase, BinarySensorEntity):
-    """Representation of a Habitica binary sensor."""
-
-    entity_description: HabiticaBinarySensorEntityDescription
-
-    @property
-    def is_on(self) -> bool | None:
-        """If the binary sensor is on."""
-        return self.entity_description.value_fn(self.coordinator.data.user)
-
-    @property
-    def entity_picture(self) -> str | None:
-        """Return the entity picture to use in the frontend, if any."""
-        if entity_picture := self.entity_description.entity_picture(
-            self.coordinator.data.user
-        ):
-            return f"{ASSETS_URL}{entity_picture}"
-        return None
diff --git a/homeassistant/components/habitica/button.py b/homeassistant/components/habitica/button.py
index 8b41fb8c987..276aa4e7fc0 100644
--- a/homeassistant/components/habitica/button.py
+++ b/homeassistant/components/habitica/button.py
@@ -10,20 +10,15 @@ from typing import Any
 
 from aiohttp import ClientResponseError
 
-from homeassistant.components.button import (
-    DOMAIN as BUTTON_DOMAIN,
-    ButtonEntity,
-    ButtonEntityDescription,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import entity_registry as er
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import ASSETS_URL, DOMAIN, HEALER, MAGE, ROGUE, WARRIOR
+from . import HabiticaConfigEntry
+from .const import DOMAIN
 from .coordinator import HabiticaData, HabiticaDataUpdateCoordinator
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
 
 
 @dataclass(kw_only=True, frozen=True)
@@ -32,8 +27,6 @@ class HabiticaButtonEntityDescription(ButtonEntityDescription):
 
     press_fn: Callable[[HabiticaDataUpdateCoordinator], Any]
     available_fn: Callable[[HabiticaData], bool] | None = None
-    class_needed: str | None = None
-    entity_picture: str | None = None
 
 
 class HabitipyButtonEntity(StrEnum):
@@ -43,18 +36,6 @@ class HabitipyButtonEntity(StrEnum):
     BUY_HEALTH_POTION = "buy_health_potion"
     ALLOCATE_ALL_STAT_POINTS = "allocate_all_stat_points"
     REVIVE = "revive"
-    MPHEAL = "mpheal"
-    EARTH = "earth"
-    FROST = "frost"
-    DEFENSIVE_STANCE = "defensive_stance"
-    VALOROUS_PRESENCE = "valorous_presence"
-    INTIMIDATE = "intimidate"
-    TOOLS_OF_TRADE = "tools_of_trade"
-    STEALTH = "stealth"
-    HEAL = "heal"
-    PROTECT_AURA = "protect_aura"
-    BRIGHTNESS = "brightness"
-    HEAL_ALL = "heal_all"
 
 
 BUTTON_DESCRIPTIONS: tuple[HabiticaButtonEntityDescription, ...] = (
@@ -74,7 +55,6 @@ BUTTON_DESCRIPTIONS: tuple[HabiticaButtonEntityDescription, ...] = (
             lambda data: data.user["stats"]["gp"] >= 25
             and data.user["stats"]["hp"] < 50
         ),
-        entity_picture="shop_potion.png",
     ),
     HabiticaButtonEntityDescription(
         key=HabitipyButtonEntity.ALLOCATE_ALL_STAT_POINTS,
@@ -94,175 +74,6 @@ BUTTON_DESCRIPTIONS: tuple[HabiticaButtonEntityDescription, ...] = (
 )
 
 
-CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.MPHEAL,
-        translation_key=HabitipyButtonEntity.MPHEAL,
-        press_fn=lambda coordinator: coordinator.api.user.class_.cast["mpheal"].post(),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 12
-            and data.user["stats"]["mp"] >= 30
-        ),
-        class_needed=MAGE,
-        entity_picture="shop_mpheal.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.EARTH,
-        translation_key=HabitipyButtonEntity.EARTH,
-        press_fn=lambda coordinator: coordinator.api.user.class_.cast["earth"].post(),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 13
-            and data.user["stats"]["mp"] >= 35
-        ),
-        class_needed=MAGE,
-        entity_picture="shop_earth.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.FROST,
-        translation_key=HabitipyButtonEntity.FROST,
-        press_fn=lambda coordinator: coordinator.api.user.class_.cast["frost"].post(),
-        # chilling frost can only be cast once per day (streaks buff is false)
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 14
-            and data.user["stats"]["mp"] >= 40
-            and not data.user["stats"]["buffs"]["streaks"]
-        ),
-        class_needed=MAGE,
-        entity_picture="shop_frost.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.DEFENSIVE_STANCE,
-        translation_key=HabitipyButtonEntity.DEFENSIVE_STANCE,
-        press_fn=(
-            lambda coordinator: coordinator.api.user.class_.cast[
-                "defensiveStance"
-            ].post()
-        ),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 12
-            and data.user["stats"]["mp"] >= 25
-        ),
-        class_needed=WARRIOR,
-        entity_picture="shop_defensiveStance.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.VALOROUS_PRESENCE,
-        translation_key=HabitipyButtonEntity.VALOROUS_PRESENCE,
-        press_fn=(
-            lambda coordinator: coordinator.api.user.class_.cast[
-                "valorousPresence"
-            ].post()
-        ),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 13
-            and data.user["stats"]["mp"] >= 20
-        ),
-        class_needed=WARRIOR,
-        entity_picture="shop_valorousPresence.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.INTIMIDATE,
-        translation_key=HabitipyButtonEntity.INTIMIDATE,
-        press_fn=(
-            lambda coordinator: coordinator.api.user.class_.cast["intimidate"].post()
-        ),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 14
-            and data.user["stats"]["mp"] >= 15
-        ),
-        class_needed=WARRIOR,
-        entity_picture="shop_intimidate.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.TOOLS_OF_TRADE,
-        translation_key=HabitipyButtonEntity.TOOLS_OF_TRADE,
-        press_fn=(
-            lambda coordinator: coordinator.api.user.class_.cast["toolsOfTrade"].post()
-        ),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 13
-            and data.user["stats"]["mp"] >= 25
-        ),
-        class_needed=ROGUE,
-        entity_picture="shop_toolsOfTrade.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.STEALTH,
-        translation_key=HabitipyButtonEntity.STEALTH,
-        press_fn=(
-            lambda coordinator: coordinator.api.user.class_.cast["stealth"].post()
-        ),
-        # Stealth buffs stack and it can only be cast if the amount of
-        # unfinished dailies is smaller than the amount of buffs
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 14
-            and data.user["stats"]["mp"] >= 45
-            and data.user["stats"]["buffs"]["stealth"]
-            < len(
-                [
-                    r
-                    for r in data.tasks
-                    if r.get("type") == "daily"
-                    and r.get("isDue") is True
-                    and r.get("completed") is False
-                ]
-            )
-        ),
-        class_needed=ROGUE,
-        entity_picture="shop_stealth.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.HEAL,
-        translation_key=HabitipyButtonEntity.HEAL,
-        press_fn=lambda coordinator: coordinator.api.user.class_.cast["heal"].post(),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 11
-            and data.user["stats"]["mp"] >= 15
-            and data.user["stats"]["hp"] < 50
-        ),
-        class_needed=HEALER,
-        entity_picture="shop_heal.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.BRIGHTNESS,
-        translation_key=HabitipyButtonEntity.BRIGHTNESS,
-        press_fn=(
-            lambda coordinator: coordinator.api.user.class_.cast["brightness"].post()
-        ),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 12
-            and data.user["stats"]["mp"] >= 15
-        ),
-        class_needed=HEALER,
-        entity_picture="shop_brightness.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.PROTECT_AURA,
-        translation_key=HabitipyButtonEntity.PROTECT_AURA,
-        press_fn=(
-            lambda coordinator: coordinator.api.user.class_.cast["protectAura"].post()
-        ),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 13
-            and data.user["stats"]["mp"] >= 30
-        ),
-        class_needed=HEALER,
-        entity_picture="shop_protectAura.png",
-    ),
-    HabiticaButtonEntityDescription(
-        key=HabitipyButtonEntity.HEAL_ALL,
-        translation_key=HabitipyButtonEntity.HEAL_ALL,
-        press_fn=lambda coordinator: coordinator.api.user.class_.cast["healAll"].post(),
-        available_fn=(
-            lambda data: data.user["stats"]["lvl"] >= 14
-            and data.user["stats"]["mp"] >= 25
-        ),
-        class_needed=HEALER,
-        entity_picture="shop_healAll.png",
-    ),
-)
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: HabiticaConfigEntry,
@@ -271,40 +82,6 @@ async def async_setup_entry(
     """Set up buttons from a config entry."""
 
     coordinator = entry.runtime_data
-    skills_added: set[str] = set()
-
-    @callback
-    def add_entities() -> None:
-        """Add or remove a skillset based on the player's class."""
-
-        nonlocal skills_added
-        buttons = []
-        entity_registry = er.async_get(hass)
-
-        for description in CLASS_SKILLS:
-            if (
-                coordinator.data.user["stats"]["lvl"] >= 10
-                and coordinator.data.user["flags"]["classSelected"]
-                and not coordinator.data.user["preferences"]["disableClasses"]
-                and description.class_needed == coordinator.data.user["stats"]["class"]
-            ):
-                if description.key not in skills_added:
-                    buttons.append(HabiticaButton(coordinator, description))
-                    skills_added.add(description.key)
-            elif description.key in skills_added:
-                if entity_id := entity_registry.async_get_entity_id(
-                    BUTTON_DOMAIN,
-                    DOMAIN,
-                    f"{coordinator.config_entry.unique_id}_{description.key}",
-                ):
-                    entity_registry.async_remove(entity_id)
-                skills_added.remove(description.key)
-
-        if buttons:
-            async_add_entities(buttons)
-
-    coordinator.async_add_listener(add_entities)
-    add_entities()
 
     async_add_entities(
         HabiticaButton(coordinator, description) for description in BUTTON_DESCRIPTIONS
@@ -331,7 +108,7 @@ class HabiticaButton(HabiticaBase, ButtonEntity):
                     translation_domain=DOMAIN,
                     translation_key="service_call_unallowed",
                 ) from e
-            raise HomeAssistantError(
+            raise ServiceValidationError(
                 translation_domain=DOMAIN,
                 translation_key="service_call_exception",
             ) from e
@@ -346,10 +123,3 @@ class HabiticaButton(HabiticaBase, ButtonEntity):
         if self.entity_description.available_fn:
             return self.entity_description.available_fn(self.coordinator.data)
         return True
-
-    @property
-    def entity_picture(self) -> str | None:
-        """Return the entity picture to use in the frontend, if any."""
-        if entity_picture := self.entity_description.entity_picture:
-            return f"{ASSETS_URL}{entity_picture}"
-        return None
diff --git a/homeassistant/components/habitica/calendar.py b/homeassistant/components/habitica/calendar.py
deleted file mode 100644
index 5a0470c3440..00000000000
--- a/homeassistant/components/habitica/calendar.py
+++ /dev/null
@@ -1,227 +0,0 @@
-"""Calendar platform for Habitica integration."""
-
-from __future__ import annotations
-
-from datetime import date, datetime, timedelta
-from enum import StrEnum
-
-from dateutil.rrule import rrule
-
-from homeassistant.components.calendar import (
-    CalendarEntity,
-    CalendarEntityDescription,
-    CalendarEvent,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt as dt_util
-
-from . import HabiticaConfigEntry
-from .coordinator import HabiticaDataUpdateCoordinator
-from .entity import HabiticaBase
-from .types import HabiticaTaskType
-from .util import build_rrule, get_recurrence_rule
-
-
-class HabiticaCalendar(StrEnum):
-    """Habitica calendars."""
-
-    DAILIES = "dailys"
-    TODOS = "todos"
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: HabiticaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the calendar platform."""
-    coordinator = config_entry.runtime_data
-
-    async_add_entities(
-        [
-            HabiticaTodosCalendarEntity(coordinator),
-            HabiticaDailiesCalendarEntity(coordinator),
-        ]
-    )
-
-
-class HabiticaCalendarEntity(HabiticaBase, CalendarEntity):
-    """Base Habitica calendar entity."""
-
-    def __init__(
-        self,
-        coordinator: HabiticaDataUpdateCoordinator,
-    ) -> None:
-        """Initialize calendar entity."""
-        super().__init__(coordinator, self.entity_description)
-
-
-class HabiticaTodosCalendarEntity(HabiticaCalendarEntity):
-    """Habitica todos calendar entity."""
-
-    entity_description = CalendarEntityDescription(
-        key=HabiticaCalendar.TODOS,
-        translation_key=HabiticaCalendar.TODOS,
-    )
-
-    def dated_todos(
-        self, start_date: datetime, end_date: datetime | None = None
-    ) -> list[CalendarEvent]:
-        """Get all dated todos."""
-
-        events = []
-        for task in self.coordinator.data.tasks:
-            if not (
-                task["type"] == HabiticaTaskType.TODO
-                and not task["completed"]
-                and task.get("date")  # only if has due date
-            ):
-                continue
-
-            start = dt_util.start_of_local_day(datetime.fromisoformat(task["date"]))
-            end = start + timedelta(days=1)
-            # return current and upcoming events or events within the requested range
-
-            if end < start_date:
-                # Event ends before date range
-                continue
-
-            if end_date and start > end_date:
-                # Event starts after date range
-                continue
-
-            events.append(
-                CalendarEvent(
-                    start=start.date(),
-                    end=end.date(),
-                    summary=task["text"],
-                    description=task["notes"],
-                    uid=task["id"],
-                )
-            )
-        return sorted(
-            events,
-            key=lambda event: (
-                event.start,
-                self.coordinator.data.user["tasksOrder"]["todos"].index(event.uid),
-            ),
-        )
-
-    @property
-    def event(self) -> CalendarEvent | None:
-        """Return the current or next upcoming event."""
-
-        return next(iter(self.dated_todos(dt_util.now())), None)
-
-    async def async_get_events(
-        self, hass: HomeAssistant, start_date: datetime, end_date: datetime
-    ) -> list[CalendarEvent]:
-        """Return calendar events within a datetime range."""
-        return self.dated_todos(start_date, end_date)
-
-
-class HabiticaDailiesCalendarEntity(HabiticaCalendarEntity):
-    """Habitica dailies calendar entity."""
-
-    entity_description = CalendarEntityDescription(
-        key=HabiticaCalendar.DAILIES,
-        translation_key=HabiticaCalendar.DAILIES,
-    )
-
-    @property
-    def today(self) -> datetime:
-        """Habitica daystart."""
-        return dt_util.start_of_local_day(
-            datetime.fromisoformat(self.coordinator.data.user["lastCron"])
-        )
-
-    def end_date(self, recurrence: datetime, end: datetime | None = None) -> date:
-        """Calculate the end date for a yesterdaily.
-
-        The enddates of events from yesterday move forward to the end
-        of the current day (until the cron resets the dailies) to show them
-        as still active events on the calendar state entity (state: on).
-
-        Events in the calendar view will show all-day events on their due day
-        """
-        if end:
-            return recurrence.date() + timedelta(days=1)
-        return (
-            dt_util.start_of_local_day() if recurrence == self.today else recurrence
-        ).date() + timedelta(days=1)
-
-    def get_recurrence_dates(
-        self, recurrences: rrule, start_date: datetime, end_date: datetime | None = None
-    ) -> list[datetime]:
-        """Calculate recurrence dates based on start_date and end_date."""
-        if end_date:
-            return recurrences.between(
-                start_date, end_date - timedelta(days=1), inc=True
-            )
-        # if no end_date is given, return only the next recurrence
-        return [recurrences.after(self.today, inc=True)]
-
-    def due_dailies(
-        self, start_date: datetime, end_date: datetime | None = None
-    ) -> list[CalendarEvent]:
-        """Get dailies and recurrences for a given period or the next upcoming."""
-
-        # we only have dailies for today and future recurrences
-        if end_date and end_date < self.today:
-            return []
-        start_date = max(start_date, self.today)
-
-        events = []
-        for task in self.coordinator.data.tasks:
-            #  only dailies that that are not 'grey dailies'
-            if not (task["type"] == HabiticaTaskType.DAILY and task["everyX"]):
-                continue
-
-            recurrences = build_rrule(task)
-            recurrence_dates = self.get_recurrence_dates(
-                recurrences, start_date, end_date
-            )
-            for recurrence in recurrence_dates:
-                is_future_event = recurrence > self.today
-                is_current_event = recurrence <= self.today and not task["completed"]
-
-                if not (is_future_event or is_current_event):
-                    continue
-
-                events.append(
-                    CalendarEvent(
-                        start=recurrence.date(),
-                        end=self.end_date(recurrence, end_date),
-                        summary=task["text"],
-                        description=task["notes"],
-                        uid=task["id"],
-                        rrule=get_recurrence_rule(recurrences),
-                    )
-                )
-        return sorted(
-            events,
-            key=lambda event: (
-                event.start,
-                self.coordinator.data.user["tasksOrder"]["dailys"].index(event.uid),
-            ),
-        )
-
-    @property
-    def event(self) -> CalendarEvent | None:
-        """Return the next upcoming event."""
-        return next(iter(self.due_dailies(self.today)), None)
-
-    async def async_get_events(
-        self, hass: HomeAssistant, start_date: datetime, end_date: datetime
-    ) -> list[CalendarEvent]:
-        """Return calendar events within a datetime range."""
-
-        return self.due_dailies(start_date, end_date)
-
-    @property
-    def extra_state_attributes(self) -> dict[str, bool | None] | None:
-        """Return entity specific state attributes."""
-        return {
-            "yesterdaily": self.event.start < self.today.date() if self.event else None
-        }
diff --git a/homeassistant/components/habitica/const.py b/homeassistant/components/habitica/const.py
index ae98cb13dcb..ae29971d66f 100644
--- a/homeassistant/components/habitica/const.py
+++ b/homeassistant/components/habitica/const.py
@@ -25,20 +25,6 @@ UNIT_TASKS = "tasks"
 ATTR_CONFIG_ENTRY = "config_entry"
 ATTR_SKILL = "skill"
 ATTR_TASK = "task"
-ATTR_DIRECTION = "direction"
 SERVICE_CAST_SKILL = "cast_skill"
-SERVICE_START_QUEST = "start_quest"
-SERVICE_ACCEPT_QUEST = "accept_quest"
-SERVICE_CANCEL_QUEST = "cancel_quest"
-SERVICE_ABORT_QUEST = "abort_quest"
-SERVICE_REJECT_QUEST = "reject_quest"
-SERVICE_LEAVE_QUEST = "leave_quest"
-SERVICE_SCORE_HABIT = "score_habit"
-SERVICE_SCORE_REWARD = "score_reward"
-
-WARRIOR = "warrior"
-ROGUE = "rogue"
-HEALER = "healer"
-MAGE = "wizard"
 
 DEVELOPER_ID = "4c4ca53f-c059-4ffa-966e-9d29dd405daf"
diff --git a/homeassistant/components/habitica/coordinator.py b/homeassistant/components/habitica/coordinator.py
index f9ffb1b53bd..4e949b703fb 100644
--- a/homeassistant/components/habitica/coordinator.py
+++ b/homeassistant/components/habitica/coordinator.py
@@ -51,22 +51,17 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
             ),
         )
         self.api = habitipy
-        self.content: dict[str, Any] = {}
 
     async def _async_update_data(self) -> HabiticaData:
         try:
             user_response = await self.api.user.get()
             tasks_response = await self.api.tasks.user.get()
             tasks_response.extend(await self.api.tasks.user.get(type="completedTodos"))
-            if not self.content:
-                self.content = await self.api.content.get(
-                    language=user_response["preferences"]["language"]
-                )
         except ClientResponseError as error:
             if error.status == HTTPStatus.TOO_MANY_REQUESTS:
-                _LOGGER.debug("Rate limit exceeded, will try again later")
+                _LOGGER.debug("Currently rate limited, skipping update")
                 return self.data
-            raise UpdateFailed(f"Unable to connect to Habitica: {error}") from error
+            raise UpdateFailed(f"Error communicating with API: {error}") from error
 
         return HabiticaData(user=user_response, tasks=tasks_response)
 
diff --git a/homeassistant/components/habitica/icons.json b/homeassistant/components/habitica/icons.json
index d33b9c60c96..544c28e4b9d 100644
--- a/homeassistant/components/habitica/icons.json
+++ b/homeassistant/components/habitica/icons.json
@@ -20,50 +20,6 @@
       },
       "revive": {
         "default": "mdi:grave-stone"
-      },
-      "mpheal": {
-        "default": "mdi:broadcast"
-      },
-      "earth": {
-        "default": "mdi:landslide"
-      },
-      "frost": {
-        "default": "mdi:snowflake"
-      },
-      "defensive_stance": {
-        "default": "mdi:shield-sword"
-      },
-      "valorous_presence": {
-        "default": "mdi:shield-sun"
-      },
-      "intimidate": {
-        "default": "mdi:emoticon-angry"
-      },
-      "tools_of_trade": {
-        "default": "mdi:domino-mask"
-      },
-      "stealth": {
-        "default": "mdi:ninja"
-      },
-      "heal": {
-        "default": "mdi:aurora"
-      },
-      "brightness": {
-        "default": "mdi:flare"
-      },
-      "protect_aura": {
-        "default": "mdi:shimmer"
-      },
-      "heal_all": {
-        "default": "mdi:hand-heart-outline"
-      }
-    },
-    "calendar": {
-      "todos": {
-        "default": "mdi:calendar-check"
-      },
-      "dailys": {
-        "default": "mdi:calendar-multiple"
       }
     },
     "sensor": {
@@ -126,18 +82,6 @@
       },
       "rewards": {
         "default": "mdi:treasure-chest"
-      },
-      "strength": {
-        "default": "mdi:arm-flex-outline"
-      },
-      "intelligence": {
-        "default": "mdi:head-snowflake-outline"
-      },
-      "perception": {
-        "default": "mdi:eye-outline"
-      },
-      "constitution": {
-        "default": "mdi:run-fast"
       }
     },
     "switch": {
@@ -147,14 +91,6 @@
           "on": "mdi:sleep"
         }
       }
-    },
-    "binary_sensor": {
-      "pending_quest": {
-        "default": "mdi:script-outline",
-        "state": {
-          "on": "mdi:script-text-outline"
-        }
-      }
     }
   },
   "services": {
@@ -163,30 +99,6 @@
     },
     "cast_skill": {
       "service": "mdi:creation-outline"
-    },
-    "accept_quest": {
-      "service": "mdi:script-text"
-    },
-    "reject_quest": {
-      "service": "mdi:script-text"
-    },
-    "leave_quest": {
-      "service": "mdi:script-text"
-    },
-    "abort_quest": {
-      "service": "mdi:script-text-key"
-    },
-    "cancel_quest": {
-      "service": "mdi:script-text-key"
-    },
-    "start_quest": {
-      "service": "mdi:script-text-key"
-    },
-    "score_habit": {
-      "service": "mdi:counter"
-    },
-    "score_reward": {
-      "service": "mdi:sack"
     }
   }
 }
diff --git a/homeassistant/components/habitica/manifest.json b/homeassistant/components/habitica/manifest.json
index 8e3396d32cf..16a4ef959a8 100644
--- a/homeassistant/components/habitica/manifest.json
+++ b/homeassistant/components/habitica/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/habitica",
   "iot_class": "cloud_polling",
   "loggers": ["habitipy", "plumbum"],
-  "requirements": ["habitipy==0.3.3"]
+  "requirements": ["habitipy==0.3.1"]
 }
diff --git a/homeassistant/components/habitica/sensor.py b/homeassistant/components/habitica/sensor.py
index 3b2395ecc52..ccf1e998049 100644
--- a/homeassistant/components/habitica/sensor.py
+++ b/homeassistant/components/habitica/sensor.py
@@ -24,10 +24,10 @@ from homeassistant.helpers.issue_registry import (
 )
 from homeassistant.helpers.typing import StateType
 
+from . import HabiticaConfigEntry
 from .const import DOMAIN, UNIT_TASKS
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
-from .util import entity_used_in, get_attribute_points, get_attributes_total
+from .util import entity_used_in
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -36,10 +36,7 @@ _LOGGER = logging.getLogger(__name__)
 class HabitipySensorEntityDescription(SensorEntityDescription):
     """Habitipy Sensor Description."""
 
-    value_fn: Callable[[dict[str, Any], dict[str, Any]], StateType]
-    attributes_fn: (
-        Callable[[dict[str, Any], dict[str, Any]], dict[str, Any] | None] | None
-    ) = None
+    value_fn: Callable[[dict[str, Any]], StateType]
 
 
 @dataclass(kw_only=True, frozen=True)
@@ -68,80 +65,76 @@ class HabitipySensorEntity(StrEnum):
     REWARDS = "rewards"
     GEMS = "gems"
     TRINKETS = "trinkets"
-    STRENGTH = "strength"
-    INTELLIGENCE = "intelligence"
-    CONSTITUTION = "constitution"
-    PERCEPTION = "perception"
 
 
 SENSOR_DESCRIPTIONS: tuple[HabitipySensorEntityDescription, ...] = (
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.DISPLAY_NAME,
         translation_key=HabitipySensorEntity.DISPLAY_NAME,
-        value_fn=lambda user, _: user.get("profile", {}).get("name"),
+        value_fn=lambda user: user.get("profile", {}).get("name"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.HEALTH,
         translation_key=HabitipySensorEntity.HEALTH,
         native_unit_of_measurement="HP",
         suggested_display_precision=0,
-        value_fn=lambda user, _: user.get("stats", {}).get("hp"),
+        value_fn=lambda user: user.get("stats", {}).get("hp"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.HEALTH_MAX,
         translation_key=HabitipySensorEntity.HEALTH_MAX,
         native_unit_of_measurement="HP",
         entity_registry_enabled_default=False,
-        value_fn=lambda user, _: user.get("stats", {}).get("maxHealth"),
+        value_fn=lambda user: user.get("stats", {}).get("maxHealth"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.MANA,
         translation_key=HabitipySensorEntity.MANA,
         native_unit_of_measurement="MP",
         suggested_display_precision=0,
-        value_fn=lambda user, _: user.get("stats", {}).get("mp"),
+        value_fn=lambda user: user.get("stats", {}).get("mp"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.MANA_MAX,
         translation_key=HabitipySensorEntity.MANA_MAX,
         native_unit_of_measurement="MP",
-        value_fn=lambda user, _: user.get("stats", {}).get("maxMP"),
+        value_fn=lambda user: user.get("stats", {}).get("maxMP"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.EXPERIENCE,
         translation_key=HabitipySensorEntity.EXPERIENCE,
         native_unit_of_measurement="XP",
-        value_fn=lambda user, _: user.get("stats", {}).get("exp"),
+        value_fn=lambda user: user.get("stats", {}).get("exp"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.EXPERIENCE_MAX,
         translation_key=HabitipySensorEntity.EXPERIENCE_MAX,
         native_unit_of_measurement="XP",
-        value_fn=lambda user, _: user.get("stats", {}).get("toNextLevel"),
+        value_fn=lambda user: user.get("stats", {}).get("toNextLevel"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.LEVEL,
         translation_key=HabitipySensorEntity.LEVEL,
-        value_fn=lambda user, _: user.get("stats", {}).get("lvl"),
+        value_fn=lambda user: user.get("stats", {}).get("lvl"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.GOLD,
         translation_key=HabitipySensorEntity.GOLD,
         native_unit_of_measurement="GP",
         suggested_display_precision=2,
-        value_fn=lambda user, _: user.get("stats", {}).get("gp"),
+        value_fn=lambda user: user.get("stats", {}).get("gp"),
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.CLASS,
         translation_key=HabitipySensorEntity.CLASS,
-        value_fn=lambda user, _: user.get("stats", {}).get("class"),
+        value_fn=lambda user: user.get("stats", {}).get("class"),
         device_class=SensorDeviceClass.ENUM,
         options=["warrior", "healer", "wizard", "rogue"],
     ),
     HabitipySensorEntityDescription(
         key=HabitipySensorEntity.GEMS,
         translation_key=HabitipySensorEntity.GEMS,
-        value_fn=lambda user, _: user.get("balance", 0) * 4,
+        value_fn=lambda user: user.get("balance", 0) * 4,
         suggested_display_precision=0,
         native_unit_of_measurement="gems",
     ),
@@ -149,7 +142,7 @@ SENSOR_DESCRIPTIONS: tuple[HabitipySensorEntityDescription, ...] = (
         key=HabitipySensorEntity.TRINKETS,
         translation_key=HabitipySensorEntity.TRINKETS,
         value_fn=(
-            lambda user, _: user.get("purchased", {})
+            lambda user: user.get("purchased", {})
             .get("plan", {})
             .get("consecutive", {})
             .get("trinkets", 0)
@@ -157,38 +150,6 @@ SENSOR_DESCRIPTIONS: tuple[HabitipySensorEntityDescription, ...] = (
         suggested_display_precision=0,
         native_unit_of_measurement="⧖",
     ),
-    HabitipySensorEntityDescription(
-        key=HabitipySensorEntity.STRENGTH,
-        translation_key=HabitipySensorEntity.STRENGTH,
-        value_fn=lambda user, content: get_attributes_total(user, content, "str"),
-        attributes_fn=lambda user, content: get_attribute_points(user, content, "str"),
-        suggested_display_precision=0,
-        native_unit_of_measurement="STR",
-    ),
-    HabitipySensorEntityDescription(
-        key=HabitipySensorEntity.INTELLIGENCE,
-        translation_key=HabitipySensorEntity.INTELLIGENCE,
-        value_fn=lambda user, content: get_attributes_total(user, content, "int"),
-        attributes_fn=lambda user, content: get_attribute_points(user, content, "int"),
-        suggested_display_precision=0,
-        native_unit_of_measurement="INT",
-    ),
-    HabitipySensorEntityDescription(
-        key=HabitipySensorEntity.PERCEPTION,
-        translation_key=HabitipySensorEntity.PERCEPTION,
-        value_fn=lambda user, content: get_attributes_total(user, content, "per"),
-        attributes_fn=lambda user, content: get_attribute_points(user, content, "per"),
-        suggested_display_precision=0,
-        native_unit_of_measurement="PER",
-    ),
-    HabitipySensorEntityDescription(
-        key=HabitipySensorEntity.CONSTITUTION,
-        translation_key=HabitipySensorEntity.CONSTITUTION,
-        value_fn=lambda user, content: get_attributes_total(user, content, "con"),
-        attributes_fn=lambda user, content: get_attribute_points(user, content, "con"),
-        suggested_display_precision=0,
-        native_unit_of_measurement="CON",
-    ),
 )
 
 
@@ -282,16 +243,7 @@ class HabitipySensor(HabiticaBase, SensorEntity):
     def native_value(self) -> StateType:
         """Return the state of the device."""
 
-        return self.entity_description.value_fn(
-            self.coordinator.data.user, self.coordinator.content
-        )
-
-    @property
-    def extra_state_attributes(self) -> dict[str, float | None] | None:
-        """Return entity specific state attributes."""
-        if func := self.entity_description.attributes_fn:
-            return func(self.coordinator.data.user, self.coordinator.content)
-        return None
+        return self.entity_description.value_fn(self.coordinator.data.user)
 
 
 class HabitipyTaskSensor(HabiticaBase, SensorEntity):
diff --git a/homeassistant/components/habitica/services.py b/homeassistant/components/habitica/services.py
deleted file mode 100644
index a50e5f1e6e3..00000000000
--- a/homeassistant/components/habitica/services.py
+++ /dev/null
@@ -1,325 +0,0 @@
-"""Actions for the Habitica integration."""
-
-from __future__ import annotations
-
-from http import HTTPStatus
-import logging
-from typing import Any
-
-from aiohttp import ClientResponseError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_NAME, CONF_NAME
-from homeassistant.core import (
-    HomeAssistant,
-    ServiceCall,
-    ServiceResponse,
-    SupportsResponse,
-)
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.selector import ConfigEntrySelector
-
-from .const import (
-    ATTR_ARGS,
-    ATTR_CONFIG_ENTRY,
-    ATTR_DATA,
-    ATTR_DIRECTION,
-    ATTR_PATH,
-    ATTR_SKILL,
-    ATTR_TASK,
-    DOMAIN,
-    EVENT_API_CALL_SUCCESS,
-    SERVICE_ABORT_QUEST,
-    SERVICE_ACCEPT_QUEST,
-    SERVICE_API_CALL,
-    SERVICE_CANCEL_QUEST,
-    SERVICE_CAST_SKILL,
-    SERVICE_LEAVE_QUEST,
-    SERVICE_REJECT_QUEST,
-    SERVICE_SCORE_HABIT,
-    SERVICE_SCORE_REWARD,
-    SERVICE_START_QUEST,
-)
-from .types import HabiticaConfigEntry
-
-_LOGGER = logging.getLogger(__name__)
-
-
-SERVICE_API_CALL_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_NAME): str,
-        vol.Required(ATTR_PATH): vol.All(cv.ensure_list, [str]),
-        vol.Optional(ATTR_ARGS): dict,
-    }
-)
-
-SERVICE_CAST_SKILL_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
-        vol.Required(ATTR_SKILL): cv.string,
-        vol.Optional(ATTR_TASK): cv.string,
-    }
-)
-
-SERVICE_MANAGE_QUEST_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
-    }
-)
-SERVICE_SCORE_TASK_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
-        vol.Required(ATTR_TASK): cv.string,
-        vol.Optional(ATTR_DIRECTION): cv.string,
-    }
-)
-
-
-def get_config_entry(hass: HomeAssistant, entry_id: str) -> HabiticaConfigEntry:
-    """Return config entry or raise if not found or not loaded."""
-    if not (entry := hass.config_entries.async_get_entry(entry_id)):
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="entry_not_found",
-        )
-    if entry.state is not ConfigEntryState.LOADED:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="entry_not_loaded",
-        )
-    return entry
-
-
-def async_setup_services(hass: HomeAssistant) -> None:  # noqa: C901
-    """Set up services for Habitica integration."""
-
-    async def handle_api_call(call: ServiceCall) -> None:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "deprecated_api_call",
-            breaks_in_ha_version="2025.6.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="deprecated_api_call",
-        )
-        _LOGGER.warning(
-            "Deprecated action called: 'habitica.api_call' is deprecated and will be removed in Home Assistant version 2025.6.0"
-        )
-
-        name = call.data[ATTR_NAME]
-        path = call.data[ATTR_PATH]
-        entries = hass.config_entries.async_entries(DOMAIN)
-
-        api = None
-        for entry in entries:
-            if entry.data[CONF_NAME] == name:
-                api = entry.runtime_data.api
-                break
-        if api is None:
-            _LOGGER.error("API_CALL: User '%s' not configured", name)
-            return
-        try:
-            for element in path:
-                api = api[element]
-        except KeyError:
-            _LOGGER.error(
-                "API_CALL: Path %s is invalid for API on '{%s}' element", path, element
-            )
-            return
-        kwargs = call.data.get(ATTR_ARGS, {})
-        data = await api(**kwargs)
-        hass.bus.async_fire(
-            EVENT_API_CALL_SUCCESS, {ATTR_NAME: name, ATTR_PATH: path, ATTR_DATA: data}
-        )
-
-    async def cast_skill(call: ServiceCall) -> ServiceResponse:
-        """Skill action."""
-        entry = get_config_entry(hass, call.data[ATTR_CONFIG_ENTRY])
-        coordinator = entry.runtime_data
-        skill = {
-            "pickpocket": {"spellId": "pickPocket", "cost": "10 MP"},
-            "backstab": {"spellId": "backStab", "cost": "15 MP"},
-            "smash": {"spellId": "smash", "cost": "10 MP"},
-            "fireball": {"spellId": "fireball", "cost": "10 MP"},
-        }
-        try:
-            task_id = next(
-                task["id"]
-                for task in coordinator.data.tasks
-                if call.data[ATTR_TASK] in (task["id"], task.get("alias"))
-                or call.data[ATTR_TASK] == task["text"]
-            )
-        except StopIteration as e:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="task_not_found",
-                translation_placeholders={"task": f"'{call.data[ATTR_TASK]}'"},
-            ) from e
-
-        try:
-            response: dict[str, Any] = await coordinator.api.user.class_.cast[
-                skill[call.data[ATTR_SKILL]]["spellId"]
-            ].post(targetId=task_id)
-        except ClientResponseError as e:
-            if e.status == HTTPStatus.TOO_MANY_REQUESTS:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="setup_rate_limit_exception",
-                ) from e
-            if e.status == HTTPStatus.UNAUTHORIZED:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="not_enough_mana",
-                    translation_placeholders={
-                        "cost": skill[call.data[ATTR_SKILL]]["cost"],
-                        "mana": f"{int(coordinator.data.user.get("stats", {}).get("mp", 0))} MP",
-                    },
-                ) from e
-            if e.status == HTTPStatus.NOT_FOUND:
-                # could also be task not found, but the task is looked up
-                # before the request, so most likely wrong skill selected
-                # or the skill hasn't been unlocked yet.
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="skill_not_found",
-                    translation_placeholders={"skill": call.data[ATTR_SKILL]},
-                ) from e
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="service_call_exception",
-            ) from e
-        else:
-            await coordinator.async_request_refresh()
-            return response
-
-    async def manage_quests(call: ServiceCall) -> ServiceResponse:
-        """Accept, reject, start, leave or cancel quests."""
-        entry = get_config_entry(hass, call.data[ATTR_CONFIG_ENTRY])
-        coordinator = entry.runtime_data
-
-        COMMAND_MAP = {
-            SERVICE_ABORT_QUEST: "abort",
-            SERVICE_ACCEPT_QUEST: "accept",
-            SERVICE_CANCEL_QUEST: "cancel",
-            SERVICE_LEAVE_QUEST: "leave",
-            SERVICE_REJECT_QUEST: "reject",
-            SERVICE_START_QUEST: "force-start",
-        }
-        try:
-            return await coordinator.api.groups.party.quests[
-                COMMAND_MAP[call.service]
-            ].post()
-        except ClientResponseError as e:
-            if e.status == HTTPStatus.TOO_MANY_REQUESTS:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="setup_rate_limit_exception",
-                ) from e
-            if e.status == HTTPStatus.UNAUTHORIZED:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN, translation_key="quest_action_unallowed"
-                ) from e
-            if e.status == HTTPStatus.NOT_FOUND:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN, translation_key="quest_not_found"
-                ) from e
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="service_call_exception"
-            ) from e
-
-    for service in (
-        SERVICE_ABORT_QUEST,
-        SERVICE_ACCEPT_QUEST,
-        SERVICE_CANCEL_QUEST,
-        SERVICE_LEAVE_QUEST,
-        SERVICE_REJECT_QUEST,
-        SERVICE_START_QUEST,
-    ):
-        hass.services.async_register(
-            DOMAIN,
-            service,
-            manage_quests,
-            schema=SERVICE_MANAGE_QUEST_SCHEMA,
-            supports_response=SupportsResponse.ONLY,
-        )
-
-    async def score_task(call: ServiceCall) -> ServiceResponse:
-        """Score a task action."""
-        entry = get_config_entry(hass, call.data[ATTR_CONFIG_ENTRY])
-        coordinator = entry.runtime_data
-        try:
-            task_id, task_value = next(
-                (task["id"], task.get("value"))
-                for task in coordinator.data.tasks
-                if call.data[ATTR_TASK] in (task["id"], task.get("alias"))
-                or call.data[ATTR_TASK] == task["text"]
-            )
-        except StopIteration as e:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="task_not_found",
-                translation_placeholders={"task": f"'{call.data[ATTR_TASK]}'"},
-            ) from e
-
-        try:
-            response: dict[str, Any] = (
-                await coordinator.api.tasks[task_id]
-                .score[call.data.get(ATTR_DIRECTION, "up")]
-                .post()
-            )
-        except ClientResponseError as e:
-            if e.status == HTTPStatus.TOO_MANY_REQUESTS:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="setup_rate_limit_exception",
-                ) from e
-            if e.status == HTTPStatus.UNAUTHORIZED and task_value is not None:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="not_enough_gold",
-                    translation_placeholders={
-                        "gold": f"{coordinator.data.user["stats"]["gp"]:.2f} GP",
-                        "cost": f"{task_value} GP",
-                    },
-                ) from e
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="service_call_exception",
-            ) from e
-        else:
-            await coordinator.async_request_refresh()
-            return response
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_API_CALL,
-        handle_api_call,
-        schema=SERVICE_API_CALL_SCHEMA,
-    )
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_CAST_SKILL,
-        cast_skill,
-        schema=SERVICE_CAST_SKILL_SCHEMA,
-        supports_response=SupportsResponse.ONLY,
-    )
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_SCORE_HABIT,
-        score_task,
-        schema=SERVICE_SCORE_TASK_SCHEMA,
-        supports_response=SupportsResponse.ONLY,
-    )
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_SCORE_REWARD,
-        score_task,
-        schema=SERVICE_SCORE_TASK_SCHEMA,
-        supports_response=SupportsResponse.ONLY,
-    )
diff --git a/homeassistant/components/habitica/services.yaml b/homeassistant/components/habitica/services.yaml
index b539f6c65bf..546ac8c1c34 100644
--- a/homeassistant/components/habitica/services.yaml
+++ b/homeassistant/components/habitica/services.yaml
@@ -17,7 +17,7 @@ api_call:
         object:
 cast_skill:
   fields:
-    config_entry: &config_entry
+    config_entry:
       required: true
       selector:
         config_entry:
@@ -33,42 +33,7 @@ cast_skill:
             - "fireball"
           mode: dropdown
           translation_key: "skill_select"
-    task: &task
+    task:
       required: true
       selector:
         text:
-accept_quest:
-  fields:
-    config_entry: *config_entry
-reject_quest:
-  fields:
-    config_entry: *config_entry
-start_quest:
-  fields:
-    config_entry: *config_entry
-cancel_quest:
-  fields:
-    config_entry: *config_entry
-abort_quest:
-  fields:
-    config_entry: *config_entry
-leave_quest:
-  fields:
-    config_entry: *config_entry
-score_habit:
-  fields:
-    config_entry: *config_entry
-    task: *task
-    direction:
-      required: true
-      selector:
-        select:
-          options:
-            - value: up
-              label: "➕"
-            - value: down
-              label: "➖"
-score_reward:
-  fields:
-    config_entry: *config_entry
-    task: *task
diff --git a/homeassistant/components/habitica/strings.json b/homeassistant/components/habitica/strings.json
index ac1faf5fcef..824b3ab3457 100644
--- a/homeassistant/components/habitica/strings.json
+++ b/homeassistant/components/habitica/strings.json
@@ -1,9 +1,4 @@
 {
-  "common": {
-    "todos": "To-Do's",
-    "dailies": "Dailies",
-    "config_entry_name": "Select character"
-  },
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
@@ -39,11 +34,6 @@
     }
   },
   "entity": {
-    "binary_sensor": {
-      "pending_quest": {
-        "name": "Pending quest invitation"
-      }
-    },
     "button": {
       "run_cron": {
         "name": "Start my day"
@@ -56,59 +46,6 @@
       },
       "revive": {
         "name": "Revive from death"
-      },
-      "mpheal": {
-        "name": "Ethereal surge"
-      },
-      "earth": {
-        "name": "Earthquake"
-      },
-      "frost": {
-        "name": "Chilling frost"
-      },
-      "defensive_stance": {
-        "name": "Defensive stance"
-      },
-      "valorous_presence": {
-        "name": "Valorous presence"
-      },
-      "intimidate": {
-        "name": "Intimidating gaze"
-      },
-      "tools_of_trade": {
-        "name": "Tools of the trade"
-      },
-      "stealth": {
-        "name": "Stealth"
-      },
-      "heal": {
-        "name": "Healing light"
-      },
-      "brightness": {
-        "name": "Searing brightness"
-      },
-      "protect_aura": {
-        "name": "Protective aura"
-      },
-      "heal_all": {
-        "name": "Blessing"
-      }
-    },
-    "calendar": {
-      "todos": {
-        "name": "[%key:component::habitica::common::todos%]"
-      },
-      "dailys": {
-        "name": "[%key:component::habitica::common::dailies%]",
-        "state_attributes": {
-          "yesterdaily": {
-            "name": "Yester-Daily",
-            "state": {
-              "true": "[%key:common::state::yes%]",
-              "false": "[%key:common::state::no%]"
-            }
-          }
-        }
       }
     },
     "sensor": {
@@ -155,96 +92,16 @@
         }
       },
       "todos": {
-        "name": "[%key:component::habitica::common::todos%]"
+        "name": "To-Do's"
       },
       "dailys": {
-        "name": "[%key:component::habitica::common::dailies%]"
+        "name": "Dailies"
       },
       "habits": {
         "name": "Habits"
       },
       "rewards": {
         "name": "Rewards"
-      },
-      "strength": {
-        "name": "Strength",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::habitica::entity::sensor::level::name%]"
-          },
-          "equipment": {
-            "name": "Battle gear"
-          },
-          "class": {
-            "name": "Class equip bonus"
-          },
-          "allocated": {
-            "name": "Allocated attribute points"
-          },
-          "buffs": {
-            "name": "Buffs"
-          }
-        }
-      },
-      "intelligence": {
-        "name": "Intelligence",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::habitica::entity::sensor::level::name%]"
-          },
-          "equipment": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::equipment::name%]"
-          },
-          "class": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::class::name%]"
-          },
-          "allocated": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::allocated::name%]"
-          },
-          "buffs": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::buffs::name%]"
-          }
-        }
-      },
-      "perception": {
-        "name": "Perception",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::habitica::entity::sensor::level::name%]"
-          },
-          "equipment": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::equipment::name%]"
-          },
-          "class": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::class::name%]"
-          },
-          "allocated": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::allocated::name%]"
-          },
-          "buffs": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::buffs::name%]"
-          }
-        }
-      },
-      "constitution": {
-        "name": "Constitution",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::habitica::entity::sensor::level::name%]"
-          },
-          "equipment": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::equipment::name%]"
-          },
-          "class": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::class::name%]"
-          },
-          "allocated": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::allocated::name%]"
-          },
-          "buffs": {
-            "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::buffs::name%]"
-          }
-        }
       }
     },
     "switch": {
@@ -254,10 +111,10 @@
     },
     "todo": {
       "todos": {
-        "name": "[%key:component::habitica::common::todos%]"
+        "name": "To-Do's"
       },
       "dailys": {
-        "name": "[%key:component::habitica::common::dailies%]"
+        "name": "Dailies"
       }
     }
   },
@@ -290,10 +147,10 @@
       "message": "Unable to create new to-do `{name}` for Habitica, please try again"
     },
     "setup_rate_limit_exception": {
-      "message": "Rate limit exceeded, try again later"
+      "message": "Currently rate limited, try again later"
     },
     "service_call_unallowed": {
-      "message": "Unable to complete action, the required conditions are not met"
+      "message": "Unable to carry out this action, because the required conditions are not met"
     },
     "service_call_exception": {
       "message": "Unable to connect to Habitica, try again later"
@@ -301,36 +158,20 @@
     "not_enough_mana": {
       "message": "Unable to cast skill, not enough mana. Your character has {mana}, but the skill costs {cost}."
     },
-    "not_enough_gold": {
-      "message": "Unable to buy reward, not enough gold. Your character has {gold}, but the reward costs {cost}."
-    },
     "skill_not_found": {
       "message": "Unable to cast skill, your character does not have the skill or spell {skill}."
     },
     "entry_not_found": {
-      "message": "The selected character is not configured in Home Assistant."
-    },
-    "entry_not_loaded": {
-      "message": "The selected character is currently not loaded or disabled in Home Assistant."
+      "message": "The selected character is currently not configured or loaded in Home Assistant."
     },
     "task_not_found": {
-      "message": "Unable to complete action, could not find the task {task}"
-    },
-    "quest_action_unallowed": {
-      "message": "Action not allowed, only quest leader or group leader can perform this action"
-    },
-    "quest_not_found": {
-      "message": "Unable to complete action, quest or group not found"
+      "message": "Unable to cast skill, could not find the task {task}"
     }
   },
   "issues": {
     "deprecated_task_entity": {
       "title": "The Habitica {task_name} sensor is deprecated",
       "description": "The Habitica entity `{entity}` is deprecated and will be removed in a future release.\nPlease update your automations and scripts to replace the sensor entity with the newly added todo entity.\nWhen you are done migrating you can disable `{entity}`."
-    },
-    "deprecated_api_call": {
-      "title": "The Habitica action habitica.api_call is deprecated",
-      "description": "The Habitica action `habitica.api_call` is deprecated and will be removed in Home Assistant 2025.5.0.\n\nPlease update your automations and scripts to use other Habitica actions and entities."
     }
   },
   "services": {
@@ -357,7 +198,7 @@
       "description": "Use a skill or spell from your Habitica character on a specific task to affect its progress or status.",
       "fields": {
         "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
+          "name": "Select character",
           "description": "Choose the Habitica character to cast the skill."
         },
         "skill": {
@@ -369,98 +210,6 @@
           "description": "The name (or task ID) of the task you want to target with the skill or spell."
         }
       }
-    },
-    "accept_quest": {
-      "name": "Accept a quest invitation",
-      "description": "Accept a pending invitation to a quest.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "Choose the Habitica character for which to perform the action."
-        }
-      }
-    },
-    "reject_quest": {
-      "name": "Reject a quest invitation",
-      "description": "Reject a pending invitation to a quest.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
-        }
-      }
-    },
-    "leave_quest": {
-      "name": "Leave a quest",
-      "description": "Leave the current quest you are participating in.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
-        }
-      }
-    },
-    "abort_quest": {
-      "name": "Abort an active quest",
-      "description": "Terminate your party's ongoing quest. All progress will be lost and the quest roll returned to the owner's inventory. Only quest leader or group leader can perform this action.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
-        }
-      }
-    },
-    "cancel_quest": {
-      "name": "Cancel a pending quest",
-      "description": "Cancel a quest that has not yet startet. All accepted and pending invitations will be canceled and the quest roll returned to the owner's inventory. Only quest leader or group leader can perform this action.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
-        }
-      }
-    },
-    "start_quest": {
-      "name": "Force-start a pending quest",
-      "description": "Begin the quest immediately, bypassing any pending invitations that haven't been accepted or rejected. Only quest leader or group leader can perform this action.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
-        }
-      }
-    },
-    "score_habit": {
-      "name": "Track a habit",
-      "description": "Increase the positive or negative streak of a habit to track its progress.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "Select the Habitica character tracking your habit."
-        },
-        "task": {
-          "name": "Habit name",
-          "description": "The name (or task ID) of the Habitica habit."
-        },
-        "direction": {
-          "name": "Reward or loss",
-          "description": "Is it positive or negative progress you want to track for your habit."
-        }
-      }
-    },
-    "score_reward": {
-      "name": "Buy a reward",
-      "description": "Reward yourself and buy one of your custom rewards with gold earned by fulfilling tasks.",
-      "fields": {
-        "config_entry": {
-          "name": "[%key:component::habitica::common::config_entry_name%]",
-          "description": "Select the Habitica character buying the reward."
-        },
-        "task": {
-          "name": "Reward name",
-          "description": "The name (or task ID) of the custom reward."
-        }
-      }
     }
   },
   "selector": {
diff --git a/homeassistant/components/habitica/switch.py b/homeassistant/components/habitica/switch.py
index 6682911e892..c83d2332030 100644
--- a/homeassistant/components/habitica/switch.py
+++ b/homeassistant/components/habitica/switch.py
@@ -15,9 +15,9 @@ from homeassistant.components.switch import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import HabiticaConfigEntry
 from .coordinator import HabiticaData, HabiticaDataUpdateCoordinator
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
 
 
 @dataclass(kw_only=True, frozen=True)
diff --git a/homeassistant/components/habitica/todo.py b/homeassistant/components/habitica/todo.py
index 0fff7b66605..ae739d47262 100644
--- a/homeassistant/components/habitica/todo.py
+++ b/homeassistant/components/habitica/todo.py
@@ -21,10 +21,10 @@ from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
+from . import HabiticaConfigEntry
 from .const import ASSETS_URL, DOMAIN
 from .coordinator import HabiticaDataUpdateCoordinator
 from .entity import HabiticaBase
-from .types import HabiticaConfigEntry, HabiticaTaskType
 from .util import next_due_date
 
 
@@ -37,6 +37,15 @@ class HabiticaTodoList(StrEnum):
     REWARDS = "rewards"
 
 
+class HabiticaTaskType(StrEnum):
+    """Habitica Entities."""
+
+    HABIT = "habit"
+    DAILY = "daily"
+    TODO = "todo"
+    REWARD = "reward"
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: HabiticaConfigEntry,
diff --git a/homeassistant/components/habitica/types.py b/homeassistant/components/habitica/types.py
deleted file mode 100644
index 9789a65dc40..00000000000
--- a/homeassistant/components/habitica/types.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""Types for Habitica integration."""
-
-from enum import StrEnum
-
-from homeassistant.config_entries import ConfigEntry
-
-from .coordinator import HabiticaDataUpdateCoordinator
-
-type HabiticaConfigEntry = ConfigEntry[HabiticaDataUpdateCoordinator]
-
-
-class HabiticaTaskType(StrEnum):
-    """Habitica Entities."""
-
-    HABIT = "habit"
-    DAILY = "daily"
-    TODO = "todo"
-    REWARD = "reward"
diff --git a/homeassistant/components/habitica/util.py b/homeassistant/components/habitica/util.py
index 03acb08baf9..26549e29cb0 100644
--- a/homeassistant/components/habitica/util.py
+++ b/homeassistant/components/habitica/util.py
@@ -3,24 +3,8 @@
 from __future__ import annotations
 
 import datetime
-from math import floor
 from typing import TYPE_CHECKING, Any
 
-from dateutil.rrule import (
-    DAILY,
-    FR,
-    MO,
-    MONTHLY,
-    SA,
-    SU,
-    TH,
-    TU,
-    WE,
-    WEEKLY,
-    YEARLY,
-    rrule,
-)
-
 from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.script import scripts_with_entity
 from homeassistant.core import HomeAssistant
@@ -78,114 +62,3 @@ def entity_used_in(hass: HomeAssistant, entity_id: str) -> list[str]:
     used_in = automations_with_entity(hass, entity_id)
     used_in += scripts_with_entity(hass, entity_id)
     return used_in
-
-
-FREQUENCY_MAP = {"daily": DAILY, "weekly": WEEKLY, "monthly": MONTHLY, "yearly": YEARLY}
-WEEKDAY_MAP = {"m": MO, "t": TU, "w": WE, "th": TH, "f": FR, "s": SA, "su": SU}
-
-
-def build_rrule(task: dict[str, Any]) -> rrule:
-    """Build rrule string."""
-
-    rrule_frequency = FREQUENCY_MAP.get(task["frequency"], DAILY)
-    weekdays = [
-        WEEKDAY_MAP[day] for day, is_active in task["repeat"].items() if is_active
-    ]
-    bymonthday = (
-        task["daysOfMonth"]
-        if rrule_frequency == MONTHLY and task["daysOfMonth"]
-        else None
-    )
-
-    bysetpos = None
-    if rrule_frequency == MONTHLY and task["weeksOfMonth"]:
-        bysetpos = task["weeksOfMonth"]
-        weekdays = weekdays if weekdays else [MO]
-
-    return rrule(
-        freq=rrule_frequency,
-        interval=task["everyX"],
-        dtstart=dt_util.start_of_local_day(
-            datetime.datetime.fromisoformat(task["startDate"])
-        ),
-        byweekday=weekdays if rrule_frequency in [WEEKLY, MONTHLY] else None,
-        bymonthday=bymonthday,
-        bysetpos=bysetpos,
-    )
-
-
-def get_recurrence_rule(recurrence: rrule) -> str:
-    r"""Extract and return the recurrence rule portion of an RRULE.
-
-    This function takes an RRULE representing a task's recurrence pattern,
-    builds the RRULE string, and extracts the recurrence rule part.
-
-    'DTSTART:YYYYMMDDTHHMMSS\nRRULE:FREQ=YEARLY;INTERVAL=2'
-
-    Parameters
-    ----------
-    recurrence : rrule
-        An RRULE object.
-
-    Returns
-    -------
-    str
-        The recurrence rule portion of the RRULE string, starting with 'FREQ='.
-
-    Example
-    -------
-    >>> rule = get_recurrence_rule(task)
-    >>> print(rule)
-    'FREQ=YEARLY;INTERVAL=2'
-
-    """
-    return str(recurrence).split("RRULE:")[1]
-
-
-def get_attribute_points(
-    user: dict[str, Any], content: dict[str, Any], attribute: str
-) -> dict[str, float]:
-    """Get modifiers contributing to strength attribute."""
-
-    gear_set = {
-        "weapon",
-        "armor",
-        "head",
-        "shield",
-        "back",
-        "headAccessory",
-        "eyewear",
-        "body",
-    }
-
-    equipment = sum(
-        stats[attribute]
-        for gear in gear_set
-        if (equipped := user["items"]["gear"]["equipped"].get(gear))
-        and (stats := content["gear"]["flat"].get(equipped))
-    )
-
-    class_bonus = sum(
-        stats[attribute] / 2
-        for gear in gear_set
-        if (equipped := user["items"]["gear"]["equipped"].get(gear))
-        and (stats := content["gear"]["flat"].get(equipped))
-        and stats["klass"] == user["stats"]["class"]
-    )
-
-    return {
-        "level": min(round(user["stats"]["lvl"] / 2), 50),
-        "equipment": equipment,
-        "class": class_bonus,
-        "allocated": user["stats"][attribute],
-        "buffs": user["stats"]["buffs"][attribute],
-    }
-
-
-def get_attributes_total(
-    user: dict[str, Any], content: dict[str, Any], attribute: str
-) -> int:
-    """Get total attribute points."""
-    return floor(
-        sum(value for value in get_attribute_points(user, content, attribute).values())
-    )
diff --git a/homeassistant/components/hardkernel/__init__.py b/homeassistant/components/hardkernel/__init__.py
index 66d2fa9d154..5d70f6cbfe0 100644
--- a/homeassistant/components/hardkernel/__init__.py
+++ b/homeassistant/components/hardkernel/__init__.py
@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-from homeassistant.components.hassio import get_os_info
+from homeassistant.components.hassio import get_os_info, is_hassio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.hassio import is_hassio
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/homeassistant/components/harmony/config_flow.py b/homeassistant/components/harmony/config_flow.py
index b75ad617b39..87eb657a0a9 100644
--- a/homeassistant/components/harmony/config_flow.py
+++ b/homeassistant/components/harmony/config_flow.py
@@ -28,6 +28,7 @@ from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 
 from .const import DOMAIN, PREVIOUS_ACTIVE_ACTIVITY, UNIQUE_ID
+from .data import HarmonyConfigEntry
 from .util import (
     find_best_name_for_remote,
     find_unique_id_for_remote,
@@ -155,7 +156,7 @@ class HarmonyConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def _async_create_entry_from_valid_input(
         self, validated: dict[str, Any], user_input: dict[str, Any]
@@ -185,6 +186,10 @@ def _options_from_user_input(user_input: dict[str, Any]) -> dict[str, Any]:
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for Harmony."""
 
+    def __init__(self, config_entry: HarmonyConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py
index 306c9d43d72..b09258b7b81 100644
--- a/homeassistant/components/hassio/__init__.py
+++ b/homeassistant/components/hassio/__init__.py
@@ -5,13 +5,11 @@ from __future__ import annotations
 import asyncio
 from contextlib import suppress
 from datetime import datetime
-from functools import partial
 import logging
 import os
 import re
 from typing import Any, NamedTuple
 
-from aiohasupervisor import SupervisorError
 import voluptuous as vol
 
 from homeassistant.auth.const import GROUP_ID_ADMIN
@@ -39,22 +37,8 @@ from homeassistant.helpers import (
     discovery_flow,
 )
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.deprecation import (
-    DeprecatedConstant,
-    all_with_deprecated_constants,
-    check_if_deprecated_constant,
-    deprecated_function,
-    dir_with_deprecated_constants,
-)
 from homeassistant.helpers.event import async_call_later
-from homeassistant.helpers.hassio import (
-    get_supervisor_ip as _get_supervisor_ip,
-    is_hassio as _is_hassio,
-)
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.service_info.hassio import (
-    HassioServiceInfo as _HassioServiceInfo,
-)
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
@@ -112,17 +96,21 @@ from .coordinator import (
     get_supervisor_info,  # noqa: F401
     get_supervisor_stats,  # noqa: F401
 )
-from .discovery import async_setup_discovery_view  # noqa: F401
+from .discovery import HassioServiceInfo, async_setup_discovery_view  # noqa: F401
 from .handler import (  # noqa: F401
     HassIO,
     HassioAPIError,
     async_create_backup,
+    async_get_addon_discovery_info,
     async_get_green_settings,
     async_get_yellow_settings,
     async_reboot_host,
     async_set_green_settings,
     async_set_yellow_settings,
+    async_update_core,
     async_update_diagnostics,
+    async_update_os,
+    async_update_supervisor,
     get_supervisor_client,
 )
 from .http import HassIOView
@@ -132,14 +120,6 @@ from .websocket_api import async_load_websocket_api
 
 _LOGGER = logging.getLogger(__name__)
 
-get_supervisor_ip = deprecated_function(
-    "homeassistant.helpers.hassio.get_supervisor_ip", breaks_in_ha_version="2025.11"
-)(_get_supervisor_ip)
-_DEPRECATED_HassioServiceInfo = DeprecatedConstant(
-    _HassioServiceInfo,
-    "homeassistant.helpers.service_info.hassio.HassioServiceInfo",
-    "2025.11",
-)
 
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
@@ -295,16 +275,21 @@ def hostname_from_addon_slug(addon_slug: str) -> str:
 
 
 @callback
-@deprecated_function(
-    "homeassistant.helpers.hassio.is_hassio", breaks_in_ha_version="2025.11"
-)
 @bind_hass
 def is_hassio(hass: HomeAssistant) -> bool:
     """Return true if Hass.io is loaded.
 
     Async friendly.
     """
-    return _is_hassio(hass)
+    return DOMAIN in hass.config.components
+
+
+@callback
+def get_supervisor_ip() -> str | None:
+    """Return the supervisor ip address."""
+    if "SUPERVISOR" not in os.environ:
+        return None
+    return os.environ["SUPERVISOR"].partition(":")[0]
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa: C901
@@ -325,11 +310,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
     host = os.environ["SUPERVISOR"]
     websession = async_get_clientsession(hass)
     hass.data[DOMAIN] = hassio = HassIO(hass.loop, websession, host)
-    supervisor_client = get_supervisor_client(hass)
 
-    try:
-        await supervisor_client.supervisor.ping()
-    except SupervisorError:
+    if not await hassio.is_connected():
         _LOGGER.warning("Not connected with the supervisor / system too busy!")
 
     store = Store[dict[str, str]](hass, STORAGE_VERSION, STORAGE_KEY)
@@ -486,9 +468,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
     async def _async_stop(hass: HomeAssistant, restart: bool) -> None:
         """Stop or restart home assistant."""
         if restart:
-            await supervisor_client.homeassistant.restart()
+            await hassio.restart_homeassistant()
         else:
-            await supervisor_client.homeassistant.stop()
+            await hassio.stop_homeassistant()
 
     # Set a custom handler for the homeassistant.restart and homeassistant.stop services
     async_set_stop_handler(hass, _async_stop)
@@ -569,11 +551,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data.pop(ADDONS_COORDINATOR, None)
 
     return unload_ok
-
-
-# These can be removed if no deprecated constant are in this module anymore
-__getattr__ = partial(check_if_deprecated_constant, module_globals=globals())
-__dir__ = partial(
-    dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
-)
-__all__ = all_with_deprecated_constants(globals())
diff --git a/homeassistant/components/hassio/addon_manager.py b/homeassistant/components/hassio/addon_manager.py
index db81e17e48d..fb8f33bfbb6 100644
--- a/homeassistant/components/hassio/addon_manager.py
+++ b/homeassistant/components/hassio/addon_manager.py
@@ -21,7 +21,12 @@ from aiohasupervisor.models import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 
-from .handler import HassioAPIError, async_create_backup, get_supervisor_client
+from .handler import (
+    HassioAPIError,
+    async_create_backup,
+    async_get_addon_discovery_info,
+    get_supervisor_client,
+)
 
 type _FuncType[_T, **_P, _R] = Callable[Concatenate[_T, _P], Awaitable[_R]]
 type _ReturnFuncType[_T, **_P, _R] = Callable[
@@ -123,25 +128,18 @@ class AddonManager:
             )
         )
 
-    @api_error(
-        "Failed to get the {addon_name} add-on discovery info",
-        expected_error_type=SupervisorError,
-    )
+    @api_error("Failed to get the {addon_name} add-on discovery info")
     async def async_get_addon_discovery_info(self) -> dict:
         """Return add-on discovery info."""
-        discovery_info = next(
-            (
-                msg
-                for msg in await self._supervisor_client.discovery.list()
-                if msg.addon == self.addon_slug
-            ),
-            None,
+        discovery_info = await async_get_addon_discovery_info(
+            self._hass, self.addon_slug
         )
 
         if not discovery_info:
             raise AddonError(f"Failed to get {self.addon_name} add-on discovery info")
 
-        return discovery_info.config
+        discovery_info_config: dict = discovery_info["config"]
+        return discovery_info_config
 
     @api_error(
         "Failed to get the {addon_name} add-on info",
@@ -194,7 +192,7 @@ class AddonManager:
     )
     async def async_set_addon_options(self, config: dict) -> None:
         """Set manager add-on options."""
-        await self._supervisor_client.addons.set_addon_options(
+        await self._supervisor_client.addons.addon_options(
             self.addon_slug, AddonsOptions(config=config)
         )
 
diff --git a/homeassistant/components/hassio/const.py b/homeassistant/components/hassio/const.py
index 82ce74832c2..6e6c9006fca 100644
--- a/homeassistant/components/hassio/const.py
+++ b/homeassistant/components/hassio/const.py
@@ -103,7 +103,6 @@ PLACEHOLDER_KEY_ADDON_URL = "addon_url"
 PLACEHOLDER_KEY_REFERENCE = "reference"
 PLACEHOLDER_KEY_COMPONENTS = "components"
 
-ISSUE_KEY_ADDON_BOOT_FAIL = "issue_addon_boot_fail"
 ISSUE_KEY_SYSTEM_DOCKER_CONFIG = "issue_system_docker_config"
 ISSUE_KEY_ADDON_DETACHED_ADDON_MISSING = "issue_addon_detached_addon_missing"
 ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED = "issue_addon_detached_addon_removed"
@@ -137,3 +136,17 @@ class SupervisorEntityModel(StrEnum):
     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/coordinator.py b/homeassistant/components/hassio/coordinator.py
index cb1dda8aeed..b3d7b748afc 100644
--- a/homeassistant/components/hassio/coordinator.py
+++ b/homeassistant/components/hassio/coordinator.py
@@ -318,7 +318,7 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator):
         self._container_updates: defaultdict[str, dict[str, set[str]]] = defaultdict(
             lambda: defaultdict(set)
         )
-        self.supervisor_client = get_supervisor_client(hass)
+        self._supervisor_client = get_supervisor_client(hass)
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Update data via library."""
@@ -503,7 +503,7 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator):
     async def _update_addon_stats(self, slug: str) -> tuple[str, dict[str, Any] | None]:
         """Update single addon stats."""
         try:
-            stats = await self.supervisor_client.addons.addon_stats(slug)
+            stats = await self._supervisor_client.addons.addon_stats(slug)
         except SupervisorError as err:
             _LOGGER.warning("Could not fetch stats for %s: %s", slug, err)
             return (slug, None)
@@ -512,7 +512,7 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator):
     async def _update_addon_changelog(self, slug: str) -> tuple[str, str | None]:
         """Return the changelog for an add-on."""
         try:
-            changelog = await self.supervisor_client.store.addon_changelog(slug)
+            changelog = await self._supervisor_client.store.addon_changelog(slug)
         except SupervisorError as err:
             _LOGGER.warning("Could not fetch changelog for %s: %s", slug, err)
             return (slug, None)
@@ -521,7 +521,7 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator):
     async def _update_addon_info(self, slug: str) -> tuple[str, dict[str, Any] | None]:
         """Return the info for an add-on."""
         try:
-            info = await self.supervisor_client.addons.addon_info(slug)
+            info = await self._supervisor_client.addons.addon_info(slug)
         except SupervisorError as err:
             _LOGGER.warning("Could not fetch info for %s: %s", slug, err)
             return (slug, None)
@@ -563,8 +563,8 @@ class HassioDataUpdateCoordinator(DataUpdateCoordinator):
             # updates if this is not a scheduled refresh and
             # we are not doing the first refresh.
             try:
-                await self.supervisor_client.refresh_updates()
-            except SupervisorError as err:
+                await self.hassio.refresh_updates()
+            except HassioAPIError as err:
                 _LOGGER.warning("Error on Supervisor API: %s", err)
 
         await super()._async_refresh(
diff --git a/homeassistant/components/hassio/discovery.py b/homeassistant/components/hassio/discovery.py
index b51b8e5a8f2..fbdc5ec213f 100644
--- a/homeassistant/components/hassio/discovery.py
+++ b/homeassistant/components/hassio/discovery.py
@@ -3,12 +3,11 @@
 from __future__ import annotations
 
 import asyncio
+from dataclasses import dataclass
 import logging
 from typing import Any
-from uuid import UUID
 
 from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import Discovery
 from aiohttp import web
 from aiohttp.web_exceptions import HTTPServiceUnavailable
 
@@ -16,35 +15,44 @@ from homeassistant import config_entries
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.const import ATTR_SERVICE, EVENT_HOMEASSISTANT_START
 from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.data_entry_flow import BaseServiceInfo
 from homeassistant.helpers import discovery_flow
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
-from .const import ATTR_ADDON, ATTR_UUID, DOMAIN
-from .handler import HassIO, get_supervisor_client
+from .const import ATTR_ADDON, ATTR_CONFIG, ATTR_DISCOVERY, ATTR_UUID, DOMAIN
+from .handler import HassIO, HassioAPIError, get_supervisor_client
 
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass(slots=True)
+class HassioServiceInfo(BaseServiceInfo):
+    """Prepared info from hassio entries."""
+
+    config: dict[str, Any]
+    name: str
+    slug: str
+    uuid: str
+
+
 @callback
 def async_setup_discovery_view(hass: HomeAssistant, hassio: HassIO) -> None:
     """Discovery setup."""
     hassio_discovery = HassIODiscovery(hass, hassio)
-    supervisor_client = get_supervisor_client(hass)
     hass.http.register_view(hassio_discovery)
 
     # Handle exists discovery messages
     async def _async_discovery_start_handler(event: Event) -> None:
         """Process all exists discovery on startup."""
         try:
-            data = await supervisor_client.discovery.list()
-        except SupervisorError as err:
+            data = await hassio.retrieve_discovery_messages()
+        except HassioAPIError as err:
             _LOGGER.error("Can't read discover info: %s", err)
             return
 
         jobs = [
             asyncio.create_task(hassio_discovery.async_process_new(discovery))
-            for discovery in data
+            for discovery in data[ATTR_DISCOVERY]
         ]
         if jobs:
             await asyncio.wait(jobs)
@@ -87,8 +95,8 @@ class HassIODiscovery(HomeAssistantView):
         """Handle new discovery requests."""
         # Fetch discovery data and prevent injections
         try:
-            data = await self._supervisor_client.discovery.get(UUID(uuid))
-        except SupervisorError as err:
+            data = await self.hassio.get_discovery_message(uuid)
+        except HassioAPIError as err:
             _LOGGER.error("Can't read discovery data: %s", err)
             raise HTTPServiceUnavailable from None
 
@@ -105,50 +113,52 @@ class HassIODiscovery(HomeAssistantView):
     async def async_rediscover(self, uuid: str) -> None:
         """Rediscover add-on when config entry is removed."""
         try:
-            data = await self._supervisor_client.discovery.get(UUID(uuid))
-        except SupervisorError as err:
+            data = await self.hassio.get_discovery_message(uuid)
+        except HassioAPIError as err:
             _LOGGER.debug("Can't read discovery data: %s", err)
         else:
             await self.async_process_new(data)
 
-    async def async_process_new(self, data: Discovery) -> None:
+    async def async_process_new(self, data: dict[str, Any]) -> None:
         """Process add discovery entry."""
+        service: str = data[ATTR_SERVICE]
+        config_data: dict[str, Any] = data[ATTR_CONFIG]
+        slug: str = data[ATTR_ADDON]
+        uuid: str = data[ATTR_UUID]
+
         # Read additional Add-on info
         try:
-            addon_info = await self._supervisor_client.addons.addon_info(data.addon)
+            addon_info = await self._supervisor_client.addons.addon_info(slug)
         except SupervisorError as err:
             _LOGGER.error("Can't read add-on info: %s", err)
             return
 
-        data.config[ATTR_ADDON] = addon_info.name
+        config_data[ATTR_ADDON] = addon_info.name
 
         # Use config flow
         discovery_flow.async_create_flow(
             self.hass,
-            data.service,
+            service,
             context={"source": config_entries.SOURCE_HASSIO},
             data=HassioServiceInfo(
-                config=data.config,
-                name=addon_info.name,
-                slug=data.addon,
-                uuid=data.uuid.hex,
+                config=config_data, name=addon_info.name, slug=slug, uuid=uuid
             ),
             discovery_key=discovery_flow.DiscoveryKey(
                 domain=DOMAIN,
-                key=data.uuid.hex,
+                key=data[ATTR_UUID],
                 version=1,
             ),
         )
 
     async def async_process_del(self, data: dict[str, Any]) -> None:
         """Process remove discovery entry."""
-        service: str = data[ATTR_SERVICE]
-        uuid: str = data[ATTR_UUID]
+        service = data[ATTR_SERVICE]
+        uuid = data[ATTR_UUID]
 
         # Check if really deletet / prevent injections
         try:
-            await self._supervisor_client.discovery.get(UUID(uuid))
-        except SupervisorError:
+            data = await self.hassio.get_discovery_message(uuid)
+        except HassioAPIError:
             pass
         else:
             _LOGGER.warning("Retrieve wrong unload for %s", service)
diff --git a/homeassistant/components/hassio/handler.py b/homeassistant/components/hassio/handler.py
index 58f2aa8c144..f20d373b4cf 100644
--- a/homeassistant/components/hassio/handler.py
+++ b/homeassistant/components/hassio/handler.py
@@ -24,7 +24,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.singleton import singleton
 from homeassistant.loader import bind_hass
 
-from .const import ATTR_MESSAGE, ATTR_RESULT, DOMAIN, X_HASS_SOURCE
+from .const import ATTR_DISCOVERY, ATTR_MESSAGE, ATTR_RESULT, DOMAIN, X_HASS_SOURCE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -76,6 +76,15 @@ async def async_update_diagnostics(hass: HomeAssistant, diagnostics: bool) -> bo
     return await hassio.update_diagnostics(diagnostics)
 
 
+@bind_hass
+async def async_get_addon_discovery_info(hass: HomeAssistant, slug: str) -> dict | None:
+    """Return discovery data for an add-on."""
+    hassio: HassIO = hass.data[DOMAIN]
+    data = await hassio.retrieve_discovery_messages()
+    discovered_addons = data[ATTR_DISCOVERY]
+    return next((addon for addon in discovered_addons if addon["addon"] == slug), None)
+
+
 @bind_hass
 @api_data
 async def async_create_backup(
@@ -91,6 +100,61 @@ async def async_create_backup(
     return await hassio.send_command(command, payload=payload, timeout=None)
 
 
+@bind_hass
+@api_data
+async def async_update_os(hass: HomeAssistant, version: str | None = None) -> dict:
+    """Update Home Assistant Operating System.
+
+    The caller of the function should handle HassioAPIError.
+    """
+    hassio: HassIO = hass.data[DOMAIN]
+    command = "/os/update"
+    return await hassio.send_command(
+        command,
+        payload={"version": version},
+        timeout=None,
+    )
+
+
+@bind_hass
+@api_data
+async def async_update_supervisor(hass: HomeAssistant) -> dict:
+    """Update Home Assistant Supervisor.
+
+    The caller of the function should handle HassioAPIError.
+    """
+    hassio: HassIO = hass.data[DOMAIN]
+    command = "/supervisor/update"
+    return await hassio.send_command(command, timeout=None)
+
+
+@bind_hass
+@api_data
+async def async_update_core(
+    hass: HomeAssistant, version: str | None = None, backup: bool = False
+) -> dict:
+    """Update Home Assistant Core.
+
+    The caller of the function should handle HassioAPIError.
+    """
+    hassio: HassIO = hass.data[DOMAIN]
+    command = "/core/update"
+    return await hassio.send_command(
+        command,
+        payload={"version": version, "backup": backup},
+        timeout=None,
+    )
+
+
+@bind_hass
+@_api_bool
+async def async_apply_suggestion(hass: HomeAssistant, suggestion_uuid: str) -> dict:
+    """Apply a suggestion from supervisor's resolution center."""
+    hassio: HassIO = hass.data[DOMAIN]
+    command = f"/resolution/suggestion/{suggestion_uuid}"
+    return await hassio.send_command(command, timeout=None)
+
+
 @api_data
 async def async_get_green_settings(hass: HomeAssistant) -> dict[str, bool]:
     """Return settings specific to Home Assistant Green."""
@@ -164,6 +228,14 @@ class HassIO:
         """Return base url for Supervisor."""
         return self._base_url
 
+    @_api_bool
+    def is_connected(self) -> Coroutine:
+        """Return true if it connected to Hass.io supervisor.
+
+        This method returns a coroutine.
+        """
+        return self.send_command("/supervisor/ping", method="get", timeout=15)
+
     @api_data
     def get_info(self) -> Coroutine:
         """Return generic Supervisor information.
@@ -236,6 +308,66 @@ class HassIO:
         """
         return self.send_command("/ingress/panels", method="get")
 
+    @_api_bool
+    def restart_homeassistant(self) -> Coroutine:
+        """Restart Home-Assistant container.
+
+        This method returns a coroutine.
+        """
+        return self.send_command("/homeassistant/restart")
+
+    @_api_bool
+    def stop_homeassistant(self) -> Coroutine:
+        """Stop Home-Assistant container.
+
+        This method returns a coroutine.
+        """
+        return self.send_command("/homeassistant/stop")
+
+    @_api_bool
+    def refresh_updates(self) -> Coroutine:
+        """Refresh available updates.
+
+        This method returns a coroutine.
+        """
+        return self.send_command("/refresh_updates", timeout=300)
+
+    @api_data
+    def retrieve_discovery_messages(self) -> Coroutine:
+        """Return all discovery data from Hass.io API.
+
+        This method returns a coroutine.
+        """
+        return self.send_command("/discovery", method="get", timeout=60)
+
+    @api_data
+    def get_discovery_message(self, uuid: str) -> Coroutine:
+        """Return a single discovery data message.
+
+        This method returns a coroutine.
+        """
+        return self.send_command(f"/discovery/{uuid}", method="get")
+
+    @api_data
+    def get_resolution_info(self) -> Coroutine:
+        """Return data for Supervisor resolution center.
+
+        This method returns a coroutine.
+        """
+        return self.send_command("/resolution/info", method="get")
+
+    @api_data
+    def get_suggestions_for_issue(
+        self, issue_id: str
+    ) -> Coroutine[Any, Any, dict[str, Any]]:
+        """Return suggestions for issue from Supervisor resolution center.
+
+        This method returns a coroutine.
+        """
+        return self.send_command(
+            f"/resolution/issue/{issue_id}/suggestions", method="get"
+        )
+
     @_api_bool
     async def update_hass_api(
         self, http_config: dict[str, Any], refresh_token: RefreshToken
@@ -275,6 +407,14 @@ class HassIO:
             "/supervisor/options", payload={"diagnostics": diagnostics}
         )
 
+    @_api_bool
+    def apply_suggestion(self, suggestion_uuid: str) -> Coroutine:
+        """Apply a suggestion from supervisor's resolution center.
+
+        This method returns a coroutine.
+        """
+        return self.send_command(f"/resolution/suggestion/{suggestion_uuid}")
+
     async def send_command(
         self,
         command: str,
@@ -345,7 +485,7 @@ def get_supervisor_client(hass: HomeAssistant) -> SupervisorClient:
     """Return supervisor client."""
     hassio: HassIO = hass.data[DOMAIN]
     return SupervisorClient(
-        str(hassio.base_url),
+        hassio.base_url,
         os.environ.get("SUPERVISOR_TOKEN", ""),
         session=hassio.websession,
     )
diff --git a/homeassistant/components/hassio/http.py b/homeassistant/components/hassio/http.py
index 2b34a48149b..8c1fb11973e 100644
--- a/homeassistant/components/hassio/http.py
+++ b/homeassistant/components/hassio/http.py
@@ -18,7 +18,6 @@ from aiohttp.hdrs import (
     CONTENT_ENCODING,
     CONTENT_LENGTH,
     CONTENT_TYPE,
-    RANGE,
     TRANSFER_ENCODING,
 )
 from aiohttp.web_exceptions import HTTPBadGateway
@@ -42,15 +41,6 @@ NO_TIMEOUT = re.compile(
     r"|backups/.+/full"
     r"|backups/.+/partial"
     r"|backups/[^/]+/(?:upload|download)"
-    r"|audio/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|cli/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|core/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|dns/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|host/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|multicast/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|observer/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|supervisor/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|addons/[^/]+/logs/(follow|boots/-?\d+(/follow)?)"
     r")$"
 )
 
@@ -68,16 +58,15 @@ PATHS_ADMIN = re.compile(
     r"^(?:"
     r"|backups/[a-f0-9]{8}(/info|/download|/restore/full|/restore/partial)?"
     r"|backups/new/upload"
-    r"|audio/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|cli/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|core/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|dns/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|host/logs(/follow|/boots(/-?\d+(/follow)?)?)?"
-    r"|multicast/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|observer/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|supervisor/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|addons/[^/]+/(changelog|documentation)"
-    r"|addons/[^/]+/logs(/follow|/boots/-?\d+(/follow)?)?"
+    r"|audio/logs"
+    r"|cli/logs"
+    r"|core/logs"
+    r"|dns/logs"
+    r"|host/logs"
+    r"|multicast/logs"
+    r"|observer/logs"
+    r"|supervisor/logs"
+    r"|addons/[^/]+/(changelog|documentation|logs)"
     r")$"
 )
 
@@ -94,38 +83,8 @@ NO_STORE = re.compile(
     r"|app/entrypoint.js"
     r")$"
 )
-
-# Follow logs should not be compressed, to be able to get streamed by frontend
-NO_COMPRESS = re.compile(
-    r"^(?:"
-    r"|audio/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|cli/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|core/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|dns/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|host/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|multicast/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|observer/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|supervisor/logs/(follow|boots/-?\d+(/follow)?)"
-    r"|addons/[^/]+/logs/(follow|boots/-?\d+(/follow)?)"
-    r")$"
-)
-
-PATHS_LOGS = re.compile(
-    r"^(?:"
-    r"|audio/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|cli/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|core/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|dns/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|host/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|multicast/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|observer/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|supervisor/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r"|addons/[^/]+/logs(/follow|/boots/-?\d+(/follow)?)?"
-    r")$"
-)
 # fmt: on
 
-
 RESPONSE_HEADERS_FILTER = {
     TRANSFER_ENCODING,
     CONTENT_LENGTH,
@@ -202,10 +161,6 @@ class HassIOView(HomeAssistantView):
                         assert isinstance(request._stored_content_type, str)  # noqa: SLF001
                     headers[CONTENT_TYPE] = request._stored_content_type  # noqa: SLF001
 
-            # forward range headers for logs
-            if PATHS_LOGS.match(path) and request.headers.get(RANGE):
-                headers[RANGE] = request.headers[RANGE]
-
         try:
             client = await self._websession.request(
                 method=request.method,
@@ -222,7 +177,7 @@ class HassIOView(HomeAssistantView):
             )
             response.content_type = client.content_type
 
-            if should_compress(response.content_type, path):
+            if should_compress(response.content_type):
                 response.enable_compression()
             await response.prepare(request)
             # In testing iter_chunked, iter_any, and iter_chunks:
@@ -262,10 +217,8 @@ def _get_timeout(path: str) -> ClientTimeout:
     return ClientTimeout(connect=10, total=300)
 
 
-def should_compress(content_type: str, path: str | None = None) -> bool:
+def should_compress(content_type: str) -> bool:
     """Return if we should compress a response."""
-    if path is not None and NO_COMPRESS.match(path):
-        return False
     if content_type.startswith("image/"):
         return "svg" in content_type
     if content_type.startswith("application/"):
diff --git a/homeassistant/components/hassio/issues.py b/homeassistant/components/hassio/issues.py
index 16697659077..9c2152489d6 100644
--- a/homeassistant/components/hassio/issues.py
+++ b/homeassistant/components/hassio/issues.py
@@ -7,10 +7,6 @@ from dataclasses import dataclass, field
 from datetime import datetime
 import logging
 from typing import Any, NotRequired, TypedDict
-from uuid import UUID
-
-from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import ContextType, Issue as SupervisorIssue
 
 from homeassistant.core import HassJob, HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -24,8 +20,12 @@ from homeassistant.helpers.issue_registry import (
 from .const import (
     ATTR_DATA,
     ATTR_HEALTHY,
+    ATTR_ISSUES,
+    ATTR_SUGGESTIONS,
     ATTR_SUPPORTED,
+    ATTR_UNHEALTHY,
     ATTR_UNHEALTHY_REASONS,
+    ATTR_UNSUPPORTED,
     ATTR_UNSUPPORTED_REASONS,
     ATTR_UPDATE_KEY,
     ATTR_WS_EVENT,
@@ -36,7 +36,6 @@ from .const import (
     EVENT_SUPERVISOR_EVENT,
     EVENT_SUPERVISOR_UPDATE,
     EVENT_SUPPORTED_CHANGED,
-    ISSUE_KEY_ADDON_BOOT_FAIL,
     ISSUE_KEY_ADDON_DETACHED_ADDON_MISSING,
     ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED,
     ISSUE_KEY_SYSTEM_DOCKER_CONFIG,
@@ -45,9 +44,10 @@ from .const import (
     PLACEHOLDER_KEY_REFERENCE,
     REQUEST_REFRESH_DELAY,
     UPDATE_KEY_SUPERVISOR,
+    SupervisorIssueContext,
 )
 from .coordinator import get_addons_info
-from .handler import HassIO, get_supervisor_client
+from .handler import HassIO, HassioAPIError
 
 ISSUE_KEY_UNHEALTHY = "unhealthy"
 ISSUE_KEY_UNSUPPORTED = "unsupported"
@@ -94,7 +94,6 @@ UNHEALTHY_REASONS = {
 
 # Keys (type + context) of issues that when found should be made into a repair
 ISSUE_KEYS_FOR_REPAIRS = {
-    ISSUE_KEY_ADDON_BOOT_FAIL,
     "issue_mount_mount_failed",
     "issue_system_multiple_data_disks",
     "issue_system_reboot_required",
@@ -119,9 +118,9 @@ class SuggestionDataType(TypedDict):
 class Suggestion:
     """Suggestion from Supervisor which resolves an issue."""
 
-    uuid: UUID
+    uuid: str
     type: str
-    context: ContextType
+    context: SupervisorIssueContext
     reference: str | None = None
 
     @property
@@ -133,9 +132,9 @@ class Suggestion:
     def from_dict(cls, data: SuggestionDataType) -> Suggestion:
         """Convert from dictionary representation."""
         return cls(
-            uuid=UUID(data["uuid"]),
+            uuid=data["uuid"],
             type=data["type"],
-            context=ContextType(data["context"]),
+            context=SupervisorIssueContext(data["context"]),
             reference=data["reference"],
         )
 
@@ -154,9 +153,9 @@ class IssueDataType(TypedDict):
 class Issue:
     """Issue from Supervisor."""
 
-    uuid: UUID
+    uuid: str
     type: str
-    context: ContextType
+    context: SupervisorIssueContext
     reference: str | None = None
     suggestions: list[Suggestion] = field(default_factory=list, compare=False)
 
@@ -170,9 +169,9 @@ class Issue:
         """Convert from dictionary representation."""
         suggestions: list[SuggestionDataType] = data.get("suggestions", [])
         return cls(
-            uuid=UUID(data["uuid"]),
+            uuid=data["uuid"],
             type=data["type"],
-            context=ContextType(data["context"]),
+            context=SupervisorIssueContext(data["context"]),
             reference=data["reference"],
             suggestions=[
                 Suggestion.from_dict(suggestion) for suggestion in suggestions
@@ -189,8 +188,7 @@ class SupervisorIssues:
         self._client = client
         self._unsupported_reasons: set[str] = set()
         self._unhealthy_reasons: set[str] = set()
-        self._issues: dict[UUID, Issue] = {}
-        self._supervisor_client = get_supervisor_client(hass)
+        self._issues: dict[str, Issue] = {}
 
     @property
     def unhealthy_reasons(self) -> set[str]:
@@ -283,7 +281,7 @@ class SupervisorIssues:
             async_create_issue(
                 self._hass,
                 DOMAIN,
-                issue.uuid.hex,
+                issue.uuid,
                 is_fixable=bool(issue.suggestions),
                 severity=IssueSeverity.WARNING,
                 translation_key=issue.key,
@@ -292,37 +290,19 @@ class SupervisorIssues:
 
         self._issues[issue.uuid] = issue
 
-    async def add_issue_from_data(self, data: SupervisorIssue) -> 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._supervisor_client.resolution.suggestions_for_issue(
-                    data.uuid
-                )
-            )
-        except SupervisorError:
+            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.hex,
+                data["uuid"],
             )
             return
-        self.add_issue(
-            Issue(
-                uuid=data.uuid,
-                type=str(data.type),
-                context=data.context,
-                reference=data.reference,
-                suggestions=[
-                    Suggestion(
-                        uuid=suggestion.uuid,
-                        type=str(suggestion.type),
-                        context=suggestion.context,
-                        reference=suggestion.reference,
-                    )
-                    for suggestion in suggestions
-                ],
-            )
-        )
+        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."""
@@ -330,13 +310,13 @@ class SupervisorIssues:
             return
 
         if issue.key in ISSUE_KEYS_FOR_REPAIRS:
-            async_delete_issue(self._hass, DOMAIN, issue.uuid.hex)
+            async_delete_issue(self._hass, DOMAIN, issue.uuid)
 
         del self._issues[issue.uuid]
 
     def get_issue(self, issue_id: str) -> Issue | None:
         """Get issue from key."""
-        return self._issues.get(UUID(issue_id))
+        return self._issues.get(issue_id)
 
     async def setup(self) -> None:
         """Create supervisor events listener."""
@@ -349,8 +329,8 @@ class SupervisorIssues:
     async def _update(self, _: datetime | None = None) -> None:
         """Update issues from Supervisor resolution center."""
         try:
-            data = await self._supervisor_client.resolution.info()
-        except SupervisorError as err:
+            data = await self._client.get_resolution_info()
+        except HassioAPIError as err:
             _LOGGER.error("Failed to update supervisor issues: %r", err)
             async_call_later(
                 self._hass,
@@ -358,16 +338,18 @@ class SupervisorIssues:
                 HassJob(self._update, cancel_on_shutdown=True),
             )
             return
-        self.unhealthy_reasons = set(data.unhealthy)
-        self.unsupported_reasons = set(data.unsupported)
+        self.unhealthy_reasons = set(data[ATTR_UNHEALTHY])
+        self.unsupported_reasons = set(data[ATTR_UNSUPPORTED])
 
         # Remove any cached issues that weren't returned
-        for issue_id in set(self._issues) - {issue.uuid for issue in data.issues}:
+        for issue_id in set(self._issues.keys()) - {
+            issue["uuid"] for issue in data[ATTR_ISSUES]
+        }:
             self.remove_issue(self._issues[issue_id])
 
         # Add/update any issues that came back
         await asyncio.gather(
-            *[self.add_issue_from_data(issue) for issue in data.issues]
+            *[self.add_issue_from_data(issue) for issue in data[ATTR_ISSUES]]
         )
 
     @callback
diff --git a/homeassistant/components/hassio/manifest.json b/homeassistant/components/hassio/manifest.json
index 31fa27a92c4..662dc510149 100644
--- a/homeassistant/components/hassio/manifest.json
+++ b/homeassistant/components/hassio/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/hassio",
   "iot_class": "local_polling",
   "quality_scale": "internal",
-  "requirements": ["aiohasupervisor==0.2.1"],
+  "requirements": ["aiohasupervisor==0.2.0b0"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/hassio/repairs.py b/homeassistant/components/hassio/repairs.py
index 0e8122c08b9..082dbe38bee 100644
--- a/homeassistant/components/hassio/repairs.py
+++ b/homeassistant/components/hassio/repairs.py
@@ -6,8 +6,6 @@ from collections.abc import Callable, Coroutine
 from types import MethodType
 from typing import Any
 
-from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import ContextType
 import voluptuous as vol
 
 from homeassistant.components.repairs import RepairsFlow
@@ -16,14 +14,14 @@ from homeassistant.data_entry_flow import FlowResult
 
 from . import get_addons_info, get_issues_info
 from .const import (
-    ISSUE_KEY_ADDON_BOOT_FAIL,
     ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED,
     ISSUE_KEY_SYSTEM_DOCKER_CONFIG,
     PLACEHOLDER_KEY_ADDON,
     PLACEHOLDER_KEY_COMPONENTS,
     PLACEHOLDER_KEY_REFERENCE,
+    SupervisorIssueContext,
 )
-from .handler import get_supervisor_client
+from .handler import async_apply_suggestion
 from .issues import Issue, Suggestion
 
 HELP_URLS = {
@@ -52,10 +50,9 @@ class SupervisorIssueRepairFlow(RepairsFlow):
     _data: dict[str, Any] | None = None
     _issue: Issue | None = None
 
-    def __init__(self, hass: HomeAssistant, issue_id: str) -> None:
+    def __init__(self, issue_id: str) -> None:
         """Initialize repair flow."""
         self._issue_id = issue_id
-        self._supervisor_client = get_supervisor_client(hass)
         super().__init__()
 
     @property
@@ -126,12 +123,9 @@ class SupervisorIssueRepairFlow(RepairsFlow):
         if not confirmed and suggestion.key in SUGGESTION_CONFIRMATION_REQUIRED:
             return self._async_form_for_suggestion(suggestion)
 
-        try:
-            await self._supervisor_client.resolution.apply_suggestion(suggestion.uuid)
-        except SupervisorError:
-            return self.async_abort(reason="apply_suggestion_fail")
-
-        return self.async_create_entry(data={})
+        if await async_apply_suggestion(self.hass, suggestion.uuid):
+            return self.async_create_entry(data={})
+        return self.async_abort(reason="apply_suggestion_fail")
 
     @staticmethod
     def _async_step(
@@ -168,9 +162,9 @@ class DockerConfigIssueRepairFlow(SupervisorIssueRepairFlow):
                 if issue.key == self.issue.key or issue.type != self.issue.type:
                     continue
 
-                if issue.context == ContextType.CORE:
+                if issue.context == SupervisorIssueContext.CORE:
                     components.insert(0, "Home Assistant")
-                elif issue.context == ContextType.ADDON:
+                elif issue.context == SupervisorIssueContext.ADDON:
                     components.append(
                         next(
                             (
@@ -187,8 +181,8 @@ class DockerConfigIssueRepairFlow(SupervisorIssueRepairFlow):
         return placeholders
 
 
-class AddonIssueRepairFlow(SupervisorIssueRepairFlow):
-    """Handler for addon issue fixing flows."""
+class DetachedAddonIssueRepairFlow(SupervisorIssueRepairFlow):
+    """Handler for detached addon issue fixing flows."""
 
     @property
     def description_placeholders(self) -> dict[str, str] | None:
@@ -215,11 +209,8 @@ async def async_create_fix_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(hass, issue_id)
-    if issue and issue.key in {
-        ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED,
-        ISSUE_KEY_ADDON_BOOT_FAIL,
-    }:
-        return AddonIssueRepairFlow(hass, issue_id)
+        return DockerConfigIssueRepairFlow(issue_id)
+    if issue and issue.key == ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED:
+        return DetachedAddonIssueRepairFlow(issue_id)
 
-    return SupervisorIssueRepairFlow(hass, issue_id)
+    return SupervisorIssueRepairFlow(issue_id)
diff --git a/homeassistant/components/hassio/strings.json b/homeassistant/components/hassio/strings.json
index 09ed45bd5bc..8688934ee3d 100644
--- a/homeassistant/components/hassio/strings.json
+++ b/homeassistant/components/hassio/strings.json
@@ -17,23 +17,6 @@
     }
   },
   "issues": {
-    "issue_addon_boot_fail": {
-      "title": "Add-on failed to start at boot",
-      "fix_flow": {
-        "step": {
-          "fix_menu": {
-            "description": "Add-on {addon} is set to start at boot but failed to start. Usually this occurs when the configuration is incorrect or the same port is used in multiple add-ons. Check the configuration as well as logs for {addon} and Supervisor.\n\nUse Start to try again or Disable to turn off the start at boot option.",
-            "menu_options": {
-              "addon_execute_start": "Start",
-              "addon_disable_boot": "Disable"
-            }
-          }
-        },
-        "abort": {
-          "apply_suggestion_fail": "Could not apply the fix. Check the Supervisor logs for more details."
-        }
-      }
-    },
     "issue_addon_detached_addon_missing": {
       "title": "Missing repository for an installed add-on",
       "description": "Repository for add-on {addon} is missing. This means it will not get updates, and backups may not be restored correctly as the supervisor may not be able to build/download the resources required.\n\nPlease check the [add-on's documentation]({addon_url}) for installation instructions and add the repository to the store."
diff --git a/homeassistant/components/hassio/update.py b/homeassistant/components/hassio/update.py
index fbb3e191f81..c32d7d43694 100644
--- a/homeassistant/components/hassio/update.py
+++ b/homeassistant/components/hassio/update.py
@@ -5,11 +5,7 @@ from __future__ import annotations
 from typing import Any
 
 from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import (
-    HomeAssistantUpdateOptions,
-    OSUpdate,
-    StoreAddonUpdate,
-)
+from aiohasupervisor.models import StoreAddonUpdate
 from awesomeversion import AwesomeVersion, AwesomeVersionStrategy
 
 from homeassistant.components.update import (
@@ -21,6 +17,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ICON, ATTR_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import (
@@ -34,12 +31,20 @@ from .const import (
     DATA_KEY_OS,
     DATA_KEY_SUPERVISOR,
 )
+from .coordinator import HassioDataUpdateCoordinator
 from .entity import (
     HassioAddonEntity,
     HassioCoreEntity,
     HassioOSEntity,
     HassioSupervisorEntity,
 )
+from .handler import (
+    HassioAPIError,
+    async_update_core,
+    async_update_os,
+    async_update_supervisor,
+    get_supervisor_client,
+)
 
 ENTITY_DESCRIPTION = UpdateEntityDescription(
     name="Update",
@@ -95,6 +100,16 @@ class SupervisorAddonUpdateEntity(HassioAddonEntity, UpdateEntity):
         | UpdateEntityFeature.RELEASE_NOTES
     )
 
+    def __init__(
+        self,
+        coordinator: HassioDataUpdateCoordinator,
+        entity_description: EntityDescription,
+        addon: dict[str, Any],
+    ) -> None:
+        """Initialize object."""
+        super().__init__(coordinator, entity_description, addon)
+        self._supervisor_client = get_supervisor_client(self.hass)
+
     @property
     def _addon_data(self) -> dict:
         """Return the add-on data."""
@@ -164,7 +179,7 @@ class SupervisorAddonUpdateEntity(HassioAddonEntity, UpdateEntity):
     ) -> None:
         """Install an update."""
         try:
-            await self.coordinator.supervisor_client.store.update_addon(
+            await self._supervisor_client.store.update_addon(
                 self._addon_slug, StoreAddonUpdate(backup=backup)
             )
         except SupervisorError as err:
@@ -211,10 +226,8 @@ class SupervisorOSUpdateEntity(HassioOSEntity, UpdateEntity):
     ) -> None:
         """Install an update."""
         try:
-            await self.coordinator.supervisor_client.os.update(
-                OSUpdate(version=version)
-            )
-        except SupervisorError as err:
+            await async_update_os(self.hass, version)
+        except HassioAPIError as err:
             raise HomeAssistantError(
                 f"Error updating Home Assistant Operating System: {err}"
             ) from err
@@ -259,8 +272,8 @@ class SupervisorSupervisorUpdateEntity(HassioSupervisorEntity, UpdateEntity):
     ) -> None:
         """Install an update."""
         try:
-            await self.coordinator.supervisor_client.supervisor.update()
-        except SupervisorError as err:
+            await async_update_supervisor(self.hass)
+        except HassioAPIError as err:
             raise HomeAssistantError(
                 f"Error updating Home Assistant Supervisor: {err}"
             ) from err
@@ -304,10 +317,8 @@ class SupervisorCoreUpdateEntity(HassioCoreEntity, UpdateEntity):
     ) -> None:
         """Install an update."""
         try:
-            await self.coordinator.supervisor_client.homeassistant.update(
-                HomeAssistantUpdateOptions(version=version, backup=backup)
-            )
-        except SupervisorError as err:
+            await async_update_core(self.hass, version=version, backup=backup)
+        except HassioAPIError as err:
             raise HomeAssistantError(
                 f"Error updating Home Assistant Core: {err}"
             ) from err
diff --git a/homeassistant/components/heatmiser/climate.py b/homeassistant/components/heatmiser/climate.py
index 1102dbc0c74..f9f0cfacf60 100644
--- a/homeassistant/components/heatmiser/climate.py
+++ b/homeassistant/components/heatmiser/climate.py
@@ -1,11 +1,11 @@
-"""Support for the PRT Heatmiser thermostats using the V3 protocol."""
+"""Support for the PRT Heatmiser themostats using the V3 protocol."""
 
 from __future__ import annotations
 
 import logging
 from typing import Any
 
-from heatmiserv3 import connection, heatmiser
+from heatmiserV3 import connection, heatmiser
 import voluptuous as vol
 
 from homeassistant.components.climate import (
diff --git a/homeassistant/components/heatmiser/manifest.json b/homeassistant/components/heatmiser/manifest.json
index f3f33f79b04..7ae9cac1297 100644
--- a/homeassistant/components/heatmiser/manifest.json
+++ b/homeassistant/components/heatmiser/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/heatmiser",
   "iot_class": "local_polling",
   "loggers": ["heatmiserV3"],
-  "requirements": ["heatmiserV3==2.0.3"]
+  "requirements": ["heatmiserV3==1.1.18"]
 }
diff --git a/homeassistant/components/here_travel_time/config_flow.py b/homeassistant/components/here_travel_time/config_flow.py
index c2b70de148c..4376ae793c0 100644
--- a/homeassistant/components/here_travel_time/config_flow.py
+++ b/homeassistant/components/here_travel_time/config_flow.py
@@ -113,7 +113,7 @@ class HERETravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> HERETravelTimeOptionsFlow:
         """Get the options flow."""
-        return HERETravelTimeOptionsFlow()
+        return HERETravelTimeOptionsFlow(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -297,8 +297,9 @@ class HERETravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
 class HERETravelTimeOptionsFlow(OptionsFlow):
     """Handle HERE Travel Time options."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize HERE Travel Time options flow."""
+        self.config_entry = config_entry
         self._config: dict[str, Any] = {}
 
     async def async_step_init(
diff --git a/homeassistant/components/history_stats/__init__.py b/homeassistant/components/history_stats/__init__.py
index 63f32138dba..dcca10d73e9 100644
--- a/homeassistant/components/history_stats/__init__.py
+++ b/homeassistant/components/history_stats/__init__.py
@@ -41,7 +41,7 @@ async def async_setup_entry(
         Template(end, hass) if end else None,
         duration,
     )
-    coordinator = HistoryStatsUpdateCoordinator(hass, history_stats, entry, entry.title)
+    coordinator = HistoryStatsUpdateCoordinator(hass, history_stats, entry.title)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
diff --git a/homeassistant/components/history_stats/coordinator.py b/homeassistant/components/history_stats/coordinator.py
index fafbb5d3ce0..0d613d2bbc0 100644
--- a/homeassistant/components/history_stats/coordinator.py
+++ b/homeassistant/components/history_stats/coordinator.py
@@ -6,7 +6,6 @@ from datetime import timedelta
 import logging
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
@@ -34,7 +33,6 @@ class HistoryStatsUpdateCoordinator(DataUpdateCoordinator[HistoryStatsState]):
         self,
         hass: HomeAssistant,
         history_stats: HistoryStats,
-        config_entry: ConfigEntry | None,
         name: str,
     ) -> None:
         """Initialize DataUpdateCoordinator."""
@@ -45,7 +43,6 @@ class HistoryStatsUpdateCoordinator(DataUpdateCoordinator[HistoryStatsState]):
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=config_entry,
             name=name,
             update_interval=UPDATE_INTERVAL,
         )
diff --git a/homeassistant/components/history_stats/sensor.py b/homeassistant/components/history_stats/sensor.py
index e1241034aeb..4558da8722c 100644
--- a/homeassistant/components/history_stats/sensor.py
+++ b/homeassistant/components/history_stats/sensor.py
@@ -104,7 +104,7 @@ async def async_setup_platform(
     unique_id: str | None = config.get(CONF_UNIQUE_ID)
 
     history_stats = HistoryStats(hass, entity_id, entity_states, start, end, duration)
-    coordinator = HistoryStatsUpdateCoordinator(hass, history_stats, None, name)
+    coordinator = HistoryStatsUpdateCoordinator(hass, history_stats, name)
     await coordinator.async_refresh()
     if not coordinator.last_update_success:
         raise PlatformNotReady from coordinator.last_exception
diff --git a/homeassistant/components/hive/alarm_control_panel.py b/homeassistant/components/hive/alarm_control_panel.py
index 2b196ce820b..34d5d3d10c6 100644
--- a/homeassistant/components/hive/alarm_control_panel.py
+++ b/homeassistant/components/hive/alarm_control_panel.py
@@ -7,9 +7,14 @@ from datetime import timedelta
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -19,10 +24,10 @@ from .entity import HiveEntity
 PARALLEL_UPDATES = 0
 SCAN_INTERVAL = timedelta(seconds=15)
 HIVETOHA = {
-    "home": AlarmControlPanelState.DISARMED,
-    "asleep": AlarmControlPanelState.ARMED_NIGHT,
-    "away": AlarmControlPanelState.ARMED_AWAY,
-    "sos": AlarmControlPanelState.TRIGGERED,
+    "home": STATE_ALARM_DISARMED,
+    "asleep": STATE_ALARM_ARMED_NIGHT,
+    "away": STATE_ALARM_ARMED_AWAY,
+    "sos": STATE_ALARM_TRIGGERED,
 }
 
 
@@ -71,6 +76,6 @@ class HiveAlarmControlPanelEntity(HiveEntity, AlarmControlPanelEntity):
         self._attr_available = self.device["deviceData"].get("online")
         if self._attr_available:
             if self.device["status"]["state"]:
-                self._attr_alarm_state = AlarmControlPanelState.TRIGGERED
+                self._attr_state = STATE_ALARM_TRIGGERED
             else:
-                self._attr_alarm_state = HIVETOHA[self.device["status"]["mode"]]
+                self._attr_state = HIVETOHA[self.device["status"]["mode"]]
diff --git a/homeassistant/components/hive/config_flow.py b/homeassistant/components/hive/config_flow.py
index a997954f4cc..d6be2d1efab 100644
--- a/homeassistant/components/hive/config_flow.py
+++ b/homeassistant/components/hive/config_flow.py
@@ -182,6 +182,7 @@ class HiveOptionsFlowHandler(OptionsFlow):
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize Hive options flow."""
         self.hive = None
+        self.config_entry = config_entry
         self.interval = config_entry.options.get(CONF_SCAN_INTERVAL, 120)
 
     async def async_step_init(
diff --git a/homeassistant/components/holiday/manifest.json b/homeassistant/components/holiday/manifest.json
index 8c64f492d42..559f18b331a 100644
--- a/homeassistant/components/holiday/manifest.json
+++ b/homeassistant/components/holiday/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/holiday",
   "iot_class": "local_polling",
-  "requirements": ["holidays==0.60", "babel==2.15.0"]
+  "requirements": ["holidays==0.58", "babel==2.15.0"]
 }
diff --git a/homeassistant/components/home_connect/__init__.py b/homeassistant/components/home_connect/__init__.py
index c60515eb57f..53dffda7798 100644
--- a/homeassistant/components/home_connect/__init__.py
+++ b/homeassistant/components/home_connect/__init__.py
@@ -79,14 +79,7 @@ SERVICE_PROGRAM_SCHEMA = vol.Any(
 
 SERVICE_COMMAND_SCHEMA = vol.Schema({vol.Required(ATTR_DEVICE_ID): str})
 
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.LIGHT,
-    Platform.NUMBER,
-    Platform.SENSOR,
-    Platform.SWITCH,
-    Platform.TIME,
-]
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.LIGHT, Platform.SENSOR, Platform.SWITCH]
 
 
 def _get_appliance_by_device_id(
@@ -303,14 +296,3 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
 
     _LOGGER.debug("Migration to version %s successful", config_entry.version)
     return True
-
-
-def get_dict_from_home_connect_error(err: api.HomeConnectError) -> dict[str, Any]:
-    """Return a dict from a Home Connect error."""
-    return (
-        err.args[0]
-        if len(err.args) > 0 and isinstance(err.args[0], dict)
-        else {"description": err.args[0]}
-        if len(err.args) > 0 and isinstance(err.args[0], str)
-        else {}
-    )
diff --git a/homeassistant/components/home_connect/binary_sensor.py b/homeassistant/components/home_connect/binary_sensor.py
index 232b581d58b..a697adc10ab 100644
--- a/homeassistant/components/home_connect/binary_sensor.py
+++ b/homeassistant/components/home_connect/binary_sensor.py
@@ -3,22 +3,14 @@
 from dataclasses import dataclass
 import logging
 
-from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.components.script import scripts_with_entity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.issue_registry import (
-    IssueSeverity,
-    async_create_issue,
-    async_delete_issue,
-)
 
 from .api import HomeConnectDevice
 from .const import (
@@ -189,52 +181,3 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
         )
         self._attr_unique_id = f"{device.appliance.haId}-Door"
         self._attr_name = f"{device.appliance.name} Door"
-
-    async def async_added_to_hass(self) -> None:
-        """Call when entity is added to hass."""
-        await super().async_added_to_hass()
-        automations = automations_with_entity(self.hass, self.entity_id)
-        scripts = scripts_with_entity(self.hass, self.entity_id)
-        items = automations + scripts
-        if not items:
-            return
-
-        entity_reg: er.EntityRegistry = er.async_get(self.hass)
-        entity_automations = [
-            automation_entity
-            for automation_id in automations
-            if (automation_entity := entity_reg.async_get(automation_id))
-        ]
-        entity_scripts = [
-            script_entity
-            for script_id in scripts
-            if (script_entity := entity_reg.async_get(script_id))
-        ]
-
-        items_list = [
-            f"- [{item.original_name}](/config/automation/edit/{item.unique_id})"
-            for item in entity_automations
-        ] + [
-            f"- [{item.original_name}](/config/script/edit/{item.unique_id})"
-            for item in entity_scripts
-        ]
-
-        async_create_issue(
-            self.hass,
-            DOMAIN,
-            f"deprecated_binary_common_door_sensor_{self.entity_id}",
-            breaks_in_ha_version="2025.5.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="deprecated_binary_common_door_sensor",
-            translation_placeholders={
-                "entity": self.entity_id,
-                "items": "\n".join(items_list),
-            },
-        )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Call when entity will be removed from hass."""
-        async_delete_issue(
-            self.hass, DOMAIN, f"deprecated_binary_common_door_sensor_{self.entity_id}"
-        )
diff --git a/homeassistant/components/home_connect/const.py b/homeassistant/components/home_connect/const.py
index e49a56b9b97..1da9e517ad5 100644
--- a/homeassistant/components/home_connect/const.py
+++ b/homeassistant/components/home_connect/const.py
@@ -36,11 +36,6 @@ COFFEE_EVENT_BEAN_CONTAINER_EMPTY = (
 COFFEE_EVENT_WATER_TANK_EMPTY = "ConsumerProducts.CoffeeMaker.Event.WaterTankEmpty"
 COFFEE_EVENT_DRIP_TRAY_FULL = "ConsumerProducts.CoffeeMaker.Event.DripTrayFull"
 
-DISHWASHER_EVENT_SALT_NEARLY_EMPTY = "Dishcare.Dishwasher.Event.SaltNearlyEmpty"
-DISHWASHER_EVENT_RINSE_AID_NEARLY_EMPTY = (
-    "Dishcare.Dishwasher.Event.RinseAidNearlyEmpty"
-)
-
 REFRIGERATION_INTERNAL_LIGHT_POWER = "Refrigeration.Common.Setting.Light.Internal.Power"
 REFRIGERATION_INTERNAL_LIGHT_BRIGHTNESS = (
     "Refrigeration.Common.Setting.Light.Internal.Brightness"
@@ -100,25 +95,17 @@ SERVICE_SELECT_PROGRAM = "select_program"
 SERVICE_SETTING = "change_setting"
 SERVICE_START_PROGRAM = "start_program"
 
-ATTR_ALLOWED_VALUES = "allowedvalues"
 ATTR_AMBIENT = "ambient"
 ATTR_BSH_KEY = "bsh_key"
-ATTR_CONSTRAINTS = "constraints"
 ATTR_DESC = "desc"
 ATTR_DEVICE = "device"
 ATTR_KEY = "key"
 ATTR_PROGRAM = "program"
 ATTR_SENSOR_TYPE = "sensor_type"
 ATTR_SIGN = "sign"
-ATTR_STEPSIZE = "stepsize"
 ATTR_UNIT = "unit"
 ATTR_VALUE = "value"
 
-SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME = "appliance_name"
-SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID = "entity_id"
-SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY = "setting_key"
-SVE_TRANSLATION_PLACEHOLDER_VALUE = "value"
-
 OLD_NEW_UNIQUE_ID_SUFFIX_MAP = {
     "ChildLock": BSH_CHILD_LOCK_STATE,
     "Operation State": BSH_OPERATION_STATE,
diff --git a/homeassistant/components/home_connect/icons.json b/homeassistant/components/home_connect/icons.json
index 166b2fe2c34..92ed72c142f 100644
--- a/homeassistant/components/home_connect/icons.json
+++ b/homeassistant/components/home_connect/icons.json
@@ -61,14 +61,6 @@
           "aborting": "mdi:close-circle"
         }
       },
-      "door": {
-        "default": "mdi:door",
-        "state": {
-          "closed": "mdi:door-closed",
-          "locked": "mdi:door-closed-lock",
-          "open": "mdi:door-open"
-        }
-      },
       "program_progress": {
         "default": "mdi:progress-clock"
       },
diff --git a/homeassistant/components/home_connect/light.py b/homeassistant/components/home_connect/light.py
index 873e7d24f93..0308c6fcfbb 100644
--- a/homeassistant/components/home_connect/light.py
+++ b/homeassistant/components/home_connect/light.py
@@ -10,19 +10,16 @@ from homeconnect.api import HomeConnectError
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_HS_COLOR,
-    ATTR_RGB_COLOR,
     ColorMode,
     LightEntity,
     LightEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 import homeassistant.util.color as color_util
 
-from . import get_dict_from_home_connect_error
-from .api import ConfigEntryAuth, HomeConnectDevice
+from .api import HomeConnectDevice
 from .const import (
     ATTR_VALUE,
     BSH_AMBIENT_LIGHT_BRIGHTNESS,
@@ -37,7 +34,6 @@ from .const import (
     REFRIGERATION_EXTERNAL_LIGHT_POWER,
     REFRIGERATION_INTERNAL_LIGHT_BRIGHTNESS,
     REFRIGERATION_INTERNAL_LIGHT_POWER,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
 )
 from .entity import HomeConnectEntity
 
@@ -48,41 +44,20 @@ _LOGGER = logging.getLogger(__name__)
 class HomeConnectLightEntityDescription(LightEntityDescription):
     """Light entity description."""
 
-    brightness_key: str | None = None
-    color_key: str | None = None
-    enable_custom_color_value_key: str | None = None
-    custom_color_key: str | None = None
-    brightness_scale: tuple[float, float] = (0.0, 100.0)
+    brightness_key: str | None
 
 
 LIGHTS: tuple[HomeConnectLightEntityDescription, ...] = (
     HomeConnectLightEntityDescription(
         key=REFRIGERATION_INTERNAL_LIGHT_POWER,
         brightness_key=REFRIGERATION_INTERNAL_LIGHT_BRIGHTNESS,
-        brightness_scale=(1.0, 100.0),
         translation_key="internal_light",
     ),
     HomeConnectLightEntityDescription(
         key=REFRIGERATION_EXTERNAL_LIGHT_POWER,
         brightness_key=REFRIGERATION_EXTERNAL_LIGHT_BRIGHTNESS,
-        brightness_scale=(1.0, 100.0),
         translation_key="external_light",
     ),
-    HomeConnectLightEntityDescription(
-        key=COOKING_LIGHTING,
-        brightness_key=COOKING_LIGHTING_BRIGHTNESS,
-        brightness_scale=(10.0, 100.0),
-        translation_key="cooking_lighting",
-    ),
-    HomeConnectLightEntityDescription(
-        key=BSH_AMBIENT_LIGHT_ENABLED,
-        brightness_key=BSH_AMBIENT_LIGHT_BRIGHTNESS,
-        color_key=BSH_AMBIENT_LIGHT_COLOR,
-        enable_custom_color_value_key=BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
-        custom_color_key=BSH_AMBIENT_LIGHT_CUSTOM_COLOR,
-        brightness_scale=(10.0, 100.0),
-        translation_key="ambient_light",
-    ),
 )
 
 
@@ -95,13 +70,41 @@ async def async_setup_entry(
 
     def get_entities() -> list[LightEntity]:
         """Get a list of entities."""
-        hc_api: ConfigEntryAuth = hass.data[DOMAIN][config_entry.entry_id]
-        return [
-            HomeConnectLight(device, description)
-            for description in LIGHTS
-            for device in hc_api.devices
-            if description.key in device.appliance.status
-        ]
+        entities: list[LightEntity] = []
+        hc_api = hass.data[DOMAIN][config_entry.entry_id]
+        for device in hc_api.devices:
+            if COOKING_LIGHTING in device.appliance.status:
+                entities.append(
+                    HomeConnectLight(
+                        device,
+                        LightEntityDescription(
+                            key=COOKING_LIGHTING,
+                            translation_key="cooking_lighting",
+                        ),
+                        False,
+                    )
+                )
+            if BSH_AMBIENT_LIGHT_ENABLED in device.appliance.status:
+                entities.append(
+                    HomeConnectLight(
+                        device,
+                        LightEntityDescription(
+                            key=BSH_AMBIENT_LIGHT_ENABLED,
+                            translation_key="ambient_light",
+                        ),
+                        True,
+                    )
+                )
+            entities.extend(
+                HomeConnectCoolingLight(
+                    device=device,
+                    ambient=False,
+                    entity_description=description,
+                )
+                for description in LIGHTS
+                if description.key in device.appliance.status
+            )
+        return entities
 
     async_add_entities(await hass.async_add_executor_job(get_entities), True)
 
@@ -112,125 +115,80 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
     entity_description: LightEntityDescription
 
     def __init__(
-        self, device: HomeConnectDevice, desc: HomeConnectLightEntityDescription
+        self,
+        device: HomeConnectDevice,
+        desc: LightEntityDescription,
+        ambient: bool,
     ) -> None:
         """Initialize the entity."""
         super().__init__(device, desc)
-
-        def get_setting_key_if_setting_exists(setting_key: str | None) -> str | None:
-            if setting_key and setting_key in device.appliance.status:
-                return setting_key
-            return None
-
-        self._brightness_key = get_setting_key_if_setting_exists(desc.brightness_key)
-        self._custom_color_key = get_setting_key_if_setting_exists(
-            desc.custom_color_key
-        )
-        self._color_key = get_setting_key_if_setting_exists(desc.color_key)
-        self._enable_custom_color_value_key = desc.enable_custom_color_value_key
-        self._custom_color_key = get_setting_key_if_setting_exists(
-            desc.custom_color_key
-        )
-        self._brightness_scale = desc.brightness_scale
-
-        match (self._brightness_key, self._custom_color_key):
-            case (None, None):
-                self._attr_color_mode = ColorMode.ONOFF
-                self._attr_supported_color_modes = {ColorMode.ONOFF}
-            case (_, None):
-                self._attr_color_mode = ColorMode.BRIGHTNESS
-                self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
-            case (_, _):
-                self._attr_color_mode = ColorMode.HS
-                self._attr_supported_color_modes = {ColorMode.HS, ColorMode.RGB}
+        self._ambient = ambient
+        self._percentage_scale = (10, 100)
+        self._brightness_key: str | None
+        self._custom_color_key: str | None
+        self._color_key: str | None
+        if ambient:
+            self._brightness_key = BSH_AMBIENT_LIGHT_BRIGHTNESS
+            self._custom_color_key = BSH_AMBIENT_LIGHT_CUSTOM_COLOR
+            self._color_key = BSH_AMBIENT_LIGHT_COLOR
+            self._attr_color_mode = ColorMode.HS
+            self._attr_supported_color_modes = {ColorMode.HS}
+        else:
+            self._brightness_key = COOKING_LIGHTING_BRIGHTNESS
+            self._custom_color_key = None
+            self._color_key = None
+            self._attr_color_mode = ColorMode.BRIGHTNESS
+            self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Switch the light on, change brightness, change color."""
-        _LOGGER.debug("Switching light on for: %s", self.name)
-        try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting, self.bsh_key, True
-            )
-        except HomeConnectError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="turn_on_light",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                },
-            ) from err
-        if self._custom_color_key:
-            if (
-                ATTR_RGB_COLOR in kwargs or ATTR_HS_COLOR in kwargs
-            ) and self._enable_custom_color_value_key:
+        if self._ambient:
+            _LOGGER.debug("Switching ambient light on for: %s", self.name)
+            try:
+                await self.hass.async_add_executor_job(
+                    self.device.appliance.set_setting, self.bsh_key, True
+                )
+            except HomeConnectError as err:
+                _LOGGER.error("Error while trying to turn on ambient light: %s", err)
+                return
+            if ATTR_BRIGHTNESS in kwargs or ATTR_HS_COLOR in kwargs:
                 try:
                     await self.hass.async_add_executor_job(
                         self.device.appliance.set_setting,
                         self._color_key,
-                        self._enable_custom_color_value_key,
+                        BSH_AMBIENT_LIGHT_COLOR_CUSTOM_COLOR,
                     )
                 except HomeConnectError as err:
-                    raise ServiceValidationError(
-                        translation_domain=DOMAIN,
-                        translation_key="select_light_custom_color",
-                        translation_placeholders={
-                            **get_dict_from_home_connect_error(err),
-                            SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                        },
-                    ) from err
+                    _LOGGER.error("Error while trying selecting customcolor: %s", err)
+                if self._attr_brightness is not None:
+                    brightness_arg = self._attr_brightness
+                    if ATTR_BRIGHTNESS in kwargs:
+                        brightness_arg = kwargs[ATTR_BRIGHTNESS]
 
-            if ATTR_RGB_COLOR in kwargs:
-                hex_val = color_util.color_rgb_to_hex(*kwargs[ATTR_RGB_COLOR])
-                try:
-                    await self.hass.async_add_executor_job(
-                        self.device.appliance.set_setting,
-                        self._custom_color_key,
-                        f"#{hex_val}",
-                    )
-                except HomeConnectError as err:
-                    raise ServiceValidationError(
-                        translation_domain=DOMAIN,
-                        translation_key="set_light_color",
-                        translation_placeholders={
-                            **get_dict_from_home_connect_error(err),
-                            SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                        },
-                    ) from err
-            elif (ATTR_BRIGHTNESS in kwargs or ATTR_HS_COLOR in kwargs) and (
-                self._attr_brightness is not None or ATTR_BRIGHTNESS in kwargs
-            ):
-                brightness = 10 + ceil(
-                    color_util.brightness_to_value(
-                        self._brightness_scale,
-                        kwargs.get(ATTR_BRIGHTNESS, self._attr_brightness),
-                    )
-                )
-
-                hs_color = kwargs.get(ATTR_HS_COLOR, self._attr_hs_color)
-
-                if hs_color is not None:
-                    rgb = color_util.color_hsv_to_RGB(
-                        hs_color[0], hs_color[1], brightness
-                    )
-                    hex_val = color_util.color_rgb_to_hex(*rgb)
-                    try:
-                        await self.hass.async_add_executor_job(
-                            self.device.appliance.set_setting,
-                            self._custom_color_key,
-                            f"#{hex_val}",
+                    brightness = ceil(
+                        color_util.brightness_to_value(
+                            self._percentage_scale, brightness_arg
                         )
-                    except HomeConnectError as err:
-                        raise ServiceValidationError(
-                            translation_domain=DOMAIN,
-                            translation_key="set_light_color",
-                            translation_placeholders={
-                                **get_dict_from_home_connect_error(err),
-                                SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                            },
-                        ) from err
+                    )
+                    hs_color = kwargs.get(ATTR_HS_COLOR, self._attr_hs_color)
 
-        elif self._brightness_key and ATTR_BRIGHTNESS in kwargs:
+                    if hs_color is not None:
+                        rgb = color_util.color_hsv_to_RGB(
+                            hs_color[0], hs_color[1], brightness
+                        )
+                        hex_val = color_util.color_rgb_to_hex(rgb[0], rgb[1], rgb[2])
+                        try:
+                            await self.hass.async_add_executor_job(
+                                self.device.appliance.set_setting,
+                                self._custom_color_key,
+                                f"#{hex_val}",
+                            )
+                        except HomeConnectError as err:
+                            _LOGGER.error(
+                                "Error while trying setting the color: %s", err
+                            )
+
+        elif ATTR_BRIGHTNESS in kwargs:
             _LOGGER.debug(
                 "Changing brightness for: %s, to: %s",
                 self.name,
@@ -238,7 +196,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
             )
             brightness = ceil(
                 color_util.brightness_to_value(
-                    self._brightness_scale, kwargs[ATTR_BRIGHTNESS]
+                    self._percentage_scale, kwargs[ATTR_BRIGHTNESS]
                 )
             )
             try:
@@ -246,14 +204,15 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                     self.device.appliance.set_setting, self._brightness_key, brightness
                 )
             except HomeConnectError as err:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="set_light_brightness",
-                    translation_placeholders={
-                        **get_dict_from_home_connect_error(err),
-                        SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    },
-                ) from err
+                _LOGGER.error("Error while trying set the brightness: %s", err)
+        else:
+            _LOGGER.debug("Switching light on for: %s", self.name)
+            try:
+                await self.hass.async_add_executor_job(
+                    self.device.appliance.set_setting, self.bsh_key, True
+                )
+            except HomeConnectError as err:
+                _LOGGER.error("Error while trying to turn on light: %s", err)
 
         self.async_entity_update()
 
@@ -265,14 +224,7 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
                 self.device.appliance.set_setting, self.bsh_key, False
             )
         except HomeConnectError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="turn_off_light",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                },
-            ) from err
+            _LOGGER.error("Error while trying to turn off light: %s", err)
         self.async_entity_update()
 
     async def async_update(self) -> None:
@@ -288,33 +240,44 @@ class HomeConnectLight(HomeConnectEntity, LightEntity):
 
         _LOGGER.debug("Updated, new light state: %s", self._attr_is_on)
 
-        if self._custom_color_key:
+        if self._ambient:
             color = self.device.appliance.status.get(self._custom_color_key, {})
 
             if not color:
-                self._attr_rgb_color = None
                 self._attr_hs_color = None
                 self._attr_brightness = None
             else:
-                color_value = color.get(ATTR_VALUE)[1:]
-                rgb = color_util.rgb_hex_to_rgb_list(color_value)
-                self._attr_rgb_color = (rgb[0], rgb[1], rgb[2])
-                hsv = color_util.color_RGB_to_hsv(*rgb)
+                colorvalue = color.get(ATTR_VALUE)[1:]
+                rgb = color_util.rgb_hex_to_rgb_list(colorvalue)
+                hsv = color_util.color_RGB_to_hsv(rgb[0], rgb[1], rgb[2])
                 self._attr_hs_color = (hsv[0], hsv[1])
                 self._attr_brightness = color_util.value_to_brightness(
-                    self._brightness_scale, hsv[2]
+                    self._percentage_scale, hsv[2]
                 )
-                _LOGGER.debug(
-                    "Updated, new color (%s) and new brightness (%s) ",
-                    color_value,
-                    self._attr_brightness,
-                )
-        elif self._brightness_key:
+                _LOGGER.debug("Updated, new brightness: %s", self._attr_brightness)
+
+        else:
             brightness = self.device.appliance.status.get(self._brightness_key, {})
             if brightness is None:
                 self._attr_brightness = None
             else:
                 self._attr_brightness = color_util.value_to_brightness(
-                    self._brightness_scale, brightness[ATTR_VALUE]
+                    self._percentage_scale, brightness[ATTR_VALUE]
                 )
             _LOGGER.debug("Updated, new brightness: %s", self._attr_brightness)
+
+
+class HomeConnectCoolingLight(HomeConnectLight):
+    """Light entity for Cooling Appliances."""
+
+    def __init__(
+        self,
+        device: HomeConnectDevice,
+        ambient: bool,
+        entity_description: HomeConnectLightEntityDescription,
+    ) -> None:
+        """Initialize Cooling Light Entity."""
+        super().__init__(device, entity_description, ambient)
+        self.entity_description = entity_description
+        self._brightness_key = entity_description.brightness_key
+        self._percentage_scale = (1, 100)
diff --git a/homeassistant/components/home_connect/manifest.json b/homeassistant/components/home_connect/manifest.json
index e041e13d36b..389386e42af 100644
--- a/homeassistant/components/home_connect/manifest.json
+++ b/homeassistant/components/home_connect/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "home_connect",
   "name": "Home Connect",
-  "codeowners": ["@DavidMStraub", "@Diegorro98"],
+  "codeowners": ["@DavidMStraub"],
   "config_flow": true,
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/home_connect",
diff --git a/homeassistant/components/home_connect/number.py b/homeassistant/components/home_connect/number.py
deleted file mode 100644
index ad853df77d0..00000000000
--- a/homeassistant/components/home_connect/number.py
+++ /dev/null
@@ -1,167 +0,0 @@
-"""Provides number enties for Home Connect."""
-
-import logging
-
-from homeconnect.api import HomeConnectError
-
-from homeassistant.components.number import (
-    ATTR_MAX,
-    ATTR_MIN,
-    NumberDeviceClass,
-    NumberEntity,
-    NumberEntityDescription,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import get_dict_from_home_connect_error
-from .api import ConfigEntryAuth
-from .const import (
-    ATTR_CONSTRAINTS,
-    ATTR_STEPSIZE,
-    ATTR_UNIT,
-    ATTR_VALUE,
-    DOMAIN,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
-    SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY,
-    SVE_TRANSLATION_PLACEHOLDER_VALUE,
-)
-from .entity import HomeConnectEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-NUMBERS = (
-    NumberEntityDescription(
-        key="Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="refrigerator_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.FridgeFreezer.Setting.SetpointTemperatureFreezer",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="freezer_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.Common.Setting.BottleCooler.SetpointTemperature",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="bottle_cooler_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.Common.Setting.ChillerLeft.SetpointTemperature",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="chiller_left_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.Common.Setting.ChillerCommon.SetpointTemperature",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="chiller_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.Common.Setting.ChillerRight.SetpointTemperature",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="chiller_right_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.Common.Setting.WineCompartment.SetpointTemperature",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="wine_compartment_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.Common.Setting.WineCompartment2.SetpointTemperature",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="wine_compartment_2_setpoint_temperature",
-    ),
-    NumberEntityDescription(
-        key="Refrigeration.Common.Setting.WineCompartment3.SetpointTemperature",
-        device_class=NumberDeviceClass.TEMPERATURE,
-        translation_key="wine_compartment_3_setpoint_temperature",
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Home Connect number."""
-
-    def get_entities() -> list[HomeConnectNumberEntity]:
-        """Get a list of entities."""
-        hc_api: ConfigEntryAuth = hass.data[DOMAIN][config_entry.entry_id]
-        return [
-            HomeConnectNumberEntity(device, description)
-            for description in NUMBERS
-            for device in hc_api.devices
-            if description.key in device.appliance.status
-        ]
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
-
-
-class HomeConnectNumberEntity(HomeConnectEntity, NumberEntity):
-    """Number setting class for Home Connect."""
-
-    async def async_set_native_value(self, value: float) -> None:
-        """Set the native value of the entity."""
-        _LOGGER.debug(
-            "Tried to set value %s to %s for %s",
-            value,
-            self.bsh_key,
-            self.entity_id,
-        )
-        try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting,
-                self.bsh_key,
-                value,
-            )
-        except HomeConnectError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="set_setting",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY: self.bsh_key,
-                    SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
-                },
-            ) from err
-
-    async def async_fetch_constraints(self) -> None:
-        """Fetch the max and min values and step for the number entity."""
-        try:
-            data = await self.hass.async_add_executor_job(
-                self.device.appliance.get, f"/settings/{self.bsh_key}"
-            )
-        except HomeConnectError as err:
-            _LOGGER.error("An error occurred: %s", err)
-            return
-        if not data or not (constraints := data.get(ATTR_CONSTRAINTS)):
-            return
-        self._attr_native_max_value = constraints.get(ATTR_MAX)
-        self._attr_native_min_value = constraints.get(ATTR_MIN)
-        self._attr_native_step = constraints.get(ATTR_STEPSIZE)
-        self._attr_native_unit_of_measurement = data.get(ATTR_UNIT)
-
-    async def async_update(self) -> None:
-        """Update the number setting status."""
-        if not (data := self.device.appliance.status.get(self.bsh_key)):
-            _LOGGER.error("No value for %s", self.bsh_key)
-            self._attr_native_value = None
-            return
-        self._attr_native_value = data.get(ATTR_VALUE, None)
-        _LOGGER.debug("Updated, new value: %s", self._attr_native_value)
-
-        if (
-            not hasattr(self, "_attr_native_min_value")
-            or self._attr_native_min_value is None
-            or not hasattr(self, "_attr_native_max_value")
-            or self._attr_native_max_value is None
-            or not hasattr(self, "_attr_native_step")
-            or self._attr_native_step is None
-        ):
-            await self.async_fetch_constraints()
diff --git a/homeassistant/components/home_connect/sensor.py b/homeassistant/components/home_connect/sensor.py
index 70096313d86..f241ec0f265 100644
--- a/homeassistant/components/home_connect/sensor.py
+++ b/homeassistant/components/home_connect/sensor.py
@@ -24,7 +24,6 @@ import homeassistant.util.dt as dt_util
 from .api import ConfigEntryAuth
 from .const import (
     ATTR_VALUE,
-    BSH_DOOR_STATE,
     BSH_OPERATION_STATE,
     BSH_OPERATION_STATE_FINISHED,
     BSH_OPERATION_STATE_PAUSE,
@@ -32,8 +31,6 @@ from .const import (
     COFFEE_EVENT_BEAN_CONTAINER_EMPTY,
     COFFEE_EVENT_DRIP_TRAY_FULL,
     COFFEE_EVENT_WATER_TANK_EMPTY,
-    DISHWASHER_EVENT_RINSE_AID_NEARLY_EMPTY,
-    DISHWASHER_EVENT_SALT_NEARLY_EMPTY,
     DOMAIN,
     REFRIGERATION_EVENT_DOOR_ALARM_FREEZER,
     REFRIGERATION_EVENT_DOOR_ALARM_REFRIGERATOR,
@@ -94,16 +91,6 @@ SENSORS = (
         ],
         translation_key="operation_state",
     ),
-    HomeConnectSensorEntityDescription(
-        key=BSH_DOOR_STATE,
-        device_class=SensorDeviceClass.ENUM,
-        options=[
-            "closed",
-            "locked",
-            "open",
-        ],
-        translation_key="door",
-    ),
     HomeConnectSensorEntityDescription(
         key="ConsumerProducts.CoffeeMaker.Status.BeverageCounterCoffee",
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -232,22 +219,6 @@ EVENT_SENSORS = (
         translation_key="drip_tray_full",
         appliance_types=("CoffeeMaker",),
     ),
-    HomeConnectSensorEntityDescription(
-        key=DISHWASHER_EVENT_SALT_NEARLY_EMPTY,
-        device_class=SensorDeviceClass.ENUM,
-        options=EVENT_OPTIONS,
-        default_value="off",
-        translation_key="salt_nearly_empty",
-        appliance_types=("Dishwasher",),
-    ),
-    HomeConnectSensorEntityDescription(
-        key=DISHWASHER_EVENT_RINSE_AID_NEARLY_EMPTY,
-        device_class=SensorDeviceClass.ENUM,
-        options=EVENT_OPTIONS,
-        default_value="off",
-        translation_key="rinse_aid_nearly_empty",
-        appliance_types=("Dishwasher",),
-    ),
 )
 
 
diff --git a/homeassistant/components/home_connect/strings.json b/homeassistant/components/home_connect/strings.json
index eb57d822b15..9fe967fb5d1 100644
--- a/homeassistant/components/home_connect/strings.json
+++ b/homeassistant/components/home_connect/strings.json
@@ -21,56 +21,6 @@
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
   },
-  "exceptions": {
-    "turn_on_light": {
-      "message": "Error while trying to turn on {entity_id}: {description}"
-    },
-    "turn_off_light": {
-      "message": "Error while trying to turn off {entity_id}: {description}"
-    },
-    "set_light_brightness": {
-      "message": "Error while trying to set brightness of {entity_id}: {description}"
-    },
-    "select_light_custom_color": {
-      "message": "Error while trying to select custom color of {entity_id}: {description}"
-    },
-    "set_light_color": {
-      "message": "Error while trying to set color of {entity_id}: {description}"
-    },
-    "set_setting": {
-      "message": "Error while trying to assign the value \"{value}\" to the setting \"{key}\" for {entity_id}: {description}"
-    },
-    "turn_on": {
-      "message": "Error while trying to turn on {entity_id} ({key}): {description}"
-    },
-    "turn_off": {
-      "message": "Error while trying to turn off {entity_id} ({key}): {description}"
-    },
-    "start_program": {
-      "message": "Error while trying to start program {program}: {description}"
-    },
-    "stop_program": {
-      "message": "Error while trying to stop program {program}: {description}"
-    },
-    "power_on": {
-      "message": "Error while trying to turn on {appliance_name}: {description}"
-    },
-    "power_off": {
-      "message": "Error while trying to turn off {appliance_name} with value \"{value}\": {description}"
-    },
-    "turn_off_not_supported": {
-      "message": "{appliance_name} does not support turning off or entering standby mode."
-    },
-    "unable_to_retrieve_turn_off": {
-      "message": "Unable to turn off {appliance_name} because its support for turning off or entering standby mode could not be determined."
-    }
-  },
-  "issues": {
-    "deprecated_binary_common_door_sensor": {
-      "title": "Deprecated binary door sensor detected in some automations or scripts",
-      "description": "The binary door sensor `{entity}`, which is deprecated, is used in the following automations or scripts:\n{items}\n\nA sensor entity with additional possible states is available and should be used going forward; Please use it on the above automations or scripts to fix this issue."
-    }
-  },
   "services": {
     "start_program": {
       "name": "Start program",
@@ -238,35 +188,6 @@
         "name": "Internal light"
       }
     },
-    "number": {
-      "refrigerator_setpoint_temperature": {
-        "name": "Refrigerator temperature"
-      },
-      "freezer_setpoint_temperature": {
-        "name": "Freezer temperature"
-      },
-      "bottle_cooler_setpoint_temperature": {
-        "name": "Bottle cooler temperature"
-      },
-      "chiller_left_setpoint_temperature": {
-        "name": "Chiller left temperature"
-      },
-      "chiller_setpoint_temperature": {
-        "name": "Chiller temperature"
-      },
-      "chiller_right_setpoint_temperature": {
-        "name": "Chiller right temperature"
-      },
-      "wine_compartment_setpoint_temperature": {
-        "name": "Wine compartment temperature"
-      },
-      "wine_compartment_2_setpoint_temperature": {
-        "name": "Wine compartment 2 temperature"
-      },
-      "wine_compartment_3_setpoint_temperature": {
-        "name": "Wine compartment 3 temperature"
-      }
-    },
     "sensor": {
       "program_progress": {
         "name": "Program progress"
@@ -288,14 +209,6 @@
           "aborting": "Aborting"
         }
       },
-      "door": {
-        "name": "Door",
-        "state": {
-          "closed": "[%key:common::state::closed%]",
-          "locked": "[%key:common::state::locked%]",
-          "open": "[%key:common::state::open%]"
-        }
-      },
       "coffee_counter": {
         "name": "Coffees"
       },
@@ -393,22 +306,6 @@
           "confirmed": "[%key:component::home_connect::common::confirmed%]",
           "present": "[%key:component::home_connect::common::present%]"
         }
-      },
-      "salt_nearly_empty": {
-        "name": "Salt nearly empty",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "confirmed": "[%key:component::home_connect::common::confirmed%]",
-          "present": "[%key:component::home_connect::common::present%]"
-        }
-      },
-      "rinse_aid_nearly_empty": {
-        "name": "Rinse aid nearly empty",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "confirmed": "[%key:component::home_connect::common::confirmed%]",
-          "present": "[%key:component::home_connect::common::present%]"
-        }
       }
     },
     "switch": {
@@ -452,11 +349,6 @@
       "door_assistant_freezer": {
         "name": "Freezer door assistant"
       }
-    },
-    "time": {
-      "alarm_clock": {
-        "name": "Alarm clock"
-      }
     }
   }
 }
diff --git a/homeassistant/components/home_connect/switch.py b/homeassistant/components/home_connect/switch.py
index 25bbb85278a..82024fe93fd 100644
--- a/homeassistant/components/home_connect/switch.py
+++ b/homeassistant/components/home_connect/switch.py
@@ -9,14 +9,10 @@ from homeconnect.api import HomeConnectError
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import get_dict_from_home_connect_error
 from .api import ConfigEntryAuth
 from .const import (
-    ATTR_ALLOWED_VALUES,
-    ATTR_CONSTRAINTS,
     ATTR_VALUE,
     BSH_ACTIVE_PROGRAM,
     BSH_CHILD_LOCK_STATE,
@@ -29,10 +25,6 @@ from .const import (
     REFRIGERATION_DISPENSER,
     REFRIGERATION_SUPERMODEFREEZER,
     REFRIGERATION_SUPERMODEREFRIGERATOR,
-    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
-    SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY,
-    SVE_TRANSLATION_PLACEHOLDER_VALUE,
 )
 from .entity import HomeConnectDevice, HomeConnectEntity
 
@@ -40,7 +32,7 @@ _LOGGER = logging.getLogger(__name__)
 
 APPLIANCES_WITH_PROGRAMS = (
     "CleaningRobot",
-    "CoffeeMaker",
+    "CoffeeMachine",
     "Dishwasher",
     "Dryer",
     "Hood",
@@ -147,16 +139,9 @@ class HomeConnectSwitch(HomeConnectEntity, SwitchEntity):
                 self.device.appliance.set_setting, self.entity_description.key, True
             )
         except HomeConnectError as err:
+            _LOGGER.error("Error while trying to turn on: %s", err)
             self._attr_available = False
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="turn_on",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY: self.bsh_key,
-                },
-            ) from err
+            return
 
         self._attr_available = True
         self.async_entity_update()
@@ -172,15 +157,7 @@ class HomeConnectSwitch(HomeConnectEntity, SwitchEntity):
         except HomeConnectError as err:
             _LOGGER.error("Error while trying to turn off: %s", err)
             self._attr_available = False
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="turn_off",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY: self.bsh_key,
-                },
-            ) from err
+            return
 
         self._attr_available = True
         self.async_entity_update()
@@ -211,7 +188,6 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
             )
         super().__init__(device, SwitchEntityDescription(key=program_name))
         self._attr_name = f"{device.appliance.name} {desc}"
-        self._attr_unique_id = f"{device.appliance.haId}-{desc}"
         self._attr_has_entity_name = False
         self.program_name = program_name
 
@@ -223,14 +199,7 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
                 self.device.appliance.start_program, self.program_name
             )
         except HomeConnectError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="start_program",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    "program": self.program_name,
-                },
-            ) from err
+            _LOGGER.error("Error while trying to start program: %s", err)
         self.async_entity_update()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
@@ -239,14 +208,7 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
         try:
             await self.hass.async_add_executor_job(self.device.appliance.stop_program)
         except HomeConnectError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="stop_program",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    "program": self.program_name,
-                },
-            ) from err
+            _LOGGER.error("Error while trying to stop program: %s", err)
         self.async_entity_update()
 
     async def async_update(self) -> None:
@@ -270,18 +232,19 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
             device,
             SwitchEntityDescription(key=BSH_POWER_STATE, translation_key="power"),
         )
-        if (
-            power_state := device.appliance.status.get(BSH_POWER_STATE, {}).get(
-                ATTR_VALUE
-            )
-        ) and power_state in [BSH_POWER_OFF, BSH_POWER_STANDBY]:
-            self.power_off_state = power_state
-
-    async def async_added_to_hass(self) -> None:
-        """Add the entity to the hass instance."""
-        await super().async_added_to_hass()
-        if not hasattr(self, "power_off_state"):
-            await self.async_fetch_power_off_state()
+        match device.appliance.type:
+            case "Dishwasher" | "Cooktop" | "Hood":
+                self.power_off_state = BSH_POWER_OFF
+            case (
+                "Oven"
+                | "WarmDrawer"
+                | "CoffeeMachine"
+                | "CleaningRobot"
+                | "CookProcessor"
+            ):
+                self.power_off_state = BSH_POWER_STANDBY
+            case _:
+                self.power_off_state = None
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Switch the device on."""
@@ -291,36 +254,15 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
                 self.device.appliance.set_setting, BSH_POWER_STATE, BSH_POWER_ON
             )
         except HomeConnectError as err:
+            _LOGGER.error("Error while trying to turn on device: %s", err)
             self._attr_is_on = False
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="power_on",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name,
-                },
-            ) from err
         self.async_entity_update()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Switch the device off."""
-        if not hasattr(self, "power_off_state"):
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="unable_to_retrieve_turn_off",
-                translation_placeholders={
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name
-                },
-            )
-
         if self.power_off_state is None:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="turn_off_not_supported",
-                translation_placeholders={
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name
-                },
-            )
+            _LOGGER.debug("This appliance type does not support turning off")
+            return
         _LOGGER.debug("tried to switch off %s", self.name)
         try:
             await self.hass.async_add_executor_job(
@@ -329,16 +271,8 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
                 self.power_off_state,
             )
         except HomeConnectError as err:
+            _LOGGER.error("Error while trying to turn off device: %s", err)
             self._attr_is_on = True
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="power_off",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_APPLIANCE_NAME: self.device.appliance.name,
-                    SVE_TRANSLATION_PLACEHOLDER_VALUE: self.power_off_state,
-                },
-            ) from err
         self.async_entity_update()
 
     async def async_update(self) -> None:
@@ -349,8 +283,7 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
         ):
             self._attr_is_on = True
         elif (
-            hasattr(self, "power_off_state")
-            and self.device.appliance.status.get(BSH_POWER_STATE, {}).get(ATTR_VALUE)
+            self.device.appliance.status.get(BSH_POWER_STATE, {}).get(ATTR_VALUE)
             == self.power_off_state
         ):
             self._attr_is_on = False
@@ -374,24 +307,3 @@ class HomeConnectPowerSwitch(HomeConnectEntity, SwitchEntity):
         else:
             self._attr_is_on = None
         _LOGGER.debug("Updated, new state: %s", self._attr_is_on)
-
-    async def async_fetch_power_off_state(self) -> None:
-        """Fetch the power off state."""
-        try:
-            data = await self.hass.async_add_executor_job(
-                self.device.appliance.get, f"/settings/{self.bsh_key}"
-            )
-        except HomeConnectError as err:
-            _LOGGER.error("An error occurred: %s", err)
-            return
-        if not data or not (
-            allowed_values := data.get(ATTR_CONSTRAINTS, {}).get(ATTR_ALLOWED_VALUES)
-        ):
-            return
-
-        if BSH_POWER_OFF in allowed_values:
-            self.power_off_state = BSH_POWER_OFF
-        elif BSH_POWER_STANDBY in allowed_values:
-            self.power_off_state = BSH_POWER_STANDBY
-        else:
-            self.power_off_state = None
diff --git a/homeassistant/components/home_connect/time.py b/homeassistant/components/home_connect/time.py
deleted file mode 100644
index 946a2354938..00000000000
--- a/homeassistant/components/home_connect/time.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""Provides time enties for Home Connect."""
-
-from datetime import time
-import logging
-
-from homeconnect.api import HomeConnectError
-
-from homeassistant.components.time import TimeEntity, TimeEntityDescription
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import get_dict_from_home_connect_error
-from .api import ConfigEntryAuth
-from .const import (
-    ATTR_VALUE,
-    DOMAIN,
-    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID,
-    SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY,
-    SVE_TRANSLATION_PLACEHOLDER_VALUE,
-)
-from .entity import HomeConnectEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-TIME_ENTITIES = (
-    TimeEntityDescription(
-        key="BSH.Common.Setting.AlarmClock",
-        translation_key="alarm_clock",
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Home Connect switch."""
-
-    def get_entities() -> list[HomeConnectTimeEntity]:
-        """Get a list of entities."""
-        hc_api: ConfigEntryAuth = hass.data[DOMAIN][config_entry.entry_id]
-        return [
-            HomeConnectTimeEntity(device, description)
-            for description in TIME_ENTITIES
-            for device in hc_api.devices
-            if description.key in device.appliance.status
-        ]
-
-    async_add_entities(await hass.async_add_executor_job(get_entities), True)
-
-
-def seconds_to_time(seconds: int) -> time:
-    """Convert seconds to a time object."""
-    minutes, sec = divmod(seconds, 60)
-    hours, minutes = divmod(minutes, 60)
-    return time(hour=hours, minute=minutes, second=sec)
-
-
-def time_to_seconds(t: time) -> int:
-    """Convert a time object to seconds."""
-    return t.hour * 3600 + t.minute * 60 + t.second
-
-
-class HomeConnectTimeEntity(HomeConnectEntity, TimeEntity):
-    """Time setting class for Home Connect."""
-
-    async def async_set_value(self, value: time) -> None:
-        """Set the native value of the entity."""
-        _LOGGER.debug(
-            "Tried to set value %s to %s for %s",
-            value,
-            self.bsh_key,
-            self.entity_id,
-        )
-        try:
-            await self.hass.async_add_executor_job(
-                self.device.appliance.set_setting,
-                self.bsh_key,
-                time_to_seconds(value),
-            )
-        except HomeConnectError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="set_setting",
-                translation_placeholders={
-                    **get_dict_from_home_connect_error(err),
-                    SVE_TRANSLATION_PLACEHOLDER_ENTITY_ID: self.entity_id,
-                    SVE_TRANSLATION_PLACEHOLDER_SETTING_KEY: self.bsh_key,
-                    SVE_TRANSLATION_PLACEHOLDER_VALUE: str(value),
-                },
-            ) from err
-
-    async def async_update(self) -> None:
-        """Update the Time setting status."""
-        data = self.device.appliance.status.get(self.bsh_key)
-        if data is None:
-            _LOGGER.error("No value for %s", self.bsh_key)
-            self._attr_native_value = None
-            return
-        seconds = data.get(ATTR_VALUE, None)
-        if seconds is not None:
-            self._attr_native_value = seconds_to_time(seconds)
-        else:
-            self._attr_native_value = None
-        _LOGGER.debug("Updated, new value: %s", self._attr_native_value)
diff --git a/homeassistant/components/homeassistant/__init__.py b/homeassistant/components/homeassistant/__init__.py
index dc33b0c63e3..6cec47152e5 100644
--- a/homeassistant/components/homeassistant/__init__.py
+++ b/homeassistant/components/homeassistant/__init__.py
@@ -8,9 +8,9 @@ from typing import Any
 
 import voluptuous as vol
 
-from homeassistant import config as conf_util, core_config
 from homeassistant.auth.permissions.const import CAT_ENTITIES, POLICY_CONTROL
 from homeassistant.components import persistent_notification
+import homeassistant.config as conf_util
 from homeassistant.const import (
     ATTR_ELEVATION,
     ATTR_ENTITY_ID,
@@ -269,7 +269,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
             return
 
         # auth only processed during startup
-        await core_config.async_process_ha_core_config(hass, conf.get(DOMAIN) or {})
+        await conf_util.async_process_ha_core_config(hass, conf.get(DOMAIN) or {})
 
     async_register_admin_service(
         hass, DOMAIN, SERVICE_RELOAD_CORE_CONFIG, async_handle_reload_config
@@ -282,7 +282,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
             "longitude": call.data[ATTR_LONGITUDE],
         }
 
-        if (elevation := call.data.get(ATTR_ELEVATION)) is not None:
+        if elevation := call.data.get(ATTR_ELEVATION):
             service_data["elevation"] = elevation
 
         await hass.config.async_update(**service_data)
diff --git a/homeassistant/components/homeassistant/strings.json b/homeassistant/components/homeassistant/strings.json
index 0dd4eff507d..29612bd61ed 100644
--- a/homeassistant/components/homeassistant/strings.json
+++ b/homeassistant/components/homeassistant/strings.json
@@ -57,14 +57,6 @@
       "title": "[%key:common::config_flow::title::reauth%]",
       "description": "Reauthentication is needed"
     },
-    "config_entry_unique_id_collision": {
-      "title": "Multiple {domain} config entries with same unique ID",
-      "description": "There are multiple {domain} config entries with the same unique ID.\nThe config entries are named {titles}.\n\nTo fix this error, [configure the integration]({configure_url}) and remove all except one of the duplicates.\n\nNote: Another group of duplicates may be revealed after removing these duplicates."
-    },
-    "config_entry_unique_id_collision_many": {
-      "title": "[%key:component::homeassistant::issues::config_entry_unique_id_collision::title%]",
-      "description": "There are multiple ({number_of_entries}) {domain} config entries with the same unique ID.\nThe first {title_limit} config entries are named {titles}.\n\nTo fix this error, [configure the integration]({configure_url}) and remove all except one of the duplicates.\n\nNote: Another group of duplicates may be revealed after removing these duplicates."
-    },
     "integration_not_found": {
       "title": "Integration {domain} not found",
       "fix_flow": {
diff --git a/homeassistant/components/homeassistant/triggers/time.py b/homeassistant/components/homeassistant/triggers/time.py
index bea6e8a66a7..443d9c65d95 100644
--- a/homeassistant/components/homeassistant/triggers/time.py
+++ b/homeassistant/components/homeassistant/triggers/time.py
@@ -3,7 +3,7 @@
 from collections.abc import Callable
 from datetime import datetime, timedelta
 from functools import partial
-from typing import Any, NamedTuple
+from typing import NamedTuple
 
 import voluptuous as vol
 
@@ -26,8 +26,7 @@ from homeassistant.core import (
     State,
     callback,
 )
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv, template
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import (
     async_track_point_in_time,
     async_track_state_change_event,
@@ -38,7 +37,6 @@ from homeassistant.helpers.typing import ConfigType
 import homeassistant.util.dt as dt_util
 
 _TIME_TRIGGER_ENTITY = vol.All(str, cv.entity_domain(["input_datetime", "sensor"]))
-_TIME_AT_SCHEMA = vol.Any(cv.time, _TIME_TRIGGER_ENTITY)
 
 _TIME_TRIGGER_ENTITY_WITH_OFFSET = vol.Schema(
     {
@@ -47,29 +45,16 @@ _TIME_TRIGGER_ENTITY_WITH_OFFSET = vol.Schema(
     }
 )
 
-
-def valid_at_template(value: Any) -> template.Template:
-    """Validate either a jinja2 template, valid time, or valid trigger entity."""
-    tpl = cv.template(value)
-
-    if tpl.is_static:
-        _TIME_AT_SCHEMA(value)
-
-    return tpl
-
-
 _TIME_TRIGGER_SCHEMA = vol.Any(
     cv.time,
     _TIME_TRIGGER_ENTITY,
     _TIME_TRIGGER_ENTITY_WITH_OFFSET,
-    valid_at_template,
     msg=(
         "Expected HH:MM, HH:MM:SS, an Entity ID with domain 'input_datetime' or "
-        "'sensor', a combination of a timestamp sensor entity and an offset, or Limited Template"
+        "'sensor', or a combination of a timestamp sensor entity and an offset."
     ),
 )
 
-
 TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_PLATFORM): "time",
@@ -93,7 +78,6 @@ async def async_attach_trigger(
 ) -> CALLBACK_TYPE:
     """Listen for state changes based on configuration."""
     trigger_data = trigger_info["trigger_data"]
-    variables = trigger_info["variables"] or {}
     entities: dict[tuple[str, timedelta], CALLBACK_TYPE] = {}
     removes: list[CALLBACK_TYPE] = []
     job = HassJob(action, f"time trigger {trigger_info}")
@@ -218,16 +202,6 @@ async def async_attach_trigger(
     to_track: list[TrackEntity] = []
 
     for at_time in config[CONF_AT]:
-        if isinstance(at_time, template.Template):
-            render = template.render_complex(at_time, variables, limited=True)
-            try:
-                at_time = _TIME_AT_SCHEMA(render)
-            except vol.Invalid as exc:
-                raise HomeAssistantError(
-                    f"Limited Template for 'at' rendered a unexpected value '{render}', expected HH:MM, "
-                    f"HH:MM:SS or Entity ID with domain 'input_datetime' or 'sensor'"
-                ) from exc
-
         if isinstance(at_time, str):
             # entity
             update_entity_trigger(at_time, new_state=hass.states.get(at_time))
diff --git a/homeassistant/components/homeassistant_alerts/coordinator.py b/homeassistant/components/homeassistant_alerts/coordinator.py
index a81824d2376..5d99e1c980f 100644
--- a/homeassistant/components/homeassistant_alerts/coordinator.py
+++ b/homeassistant/components/homeassistant_alerts/coordinator.py
@@ -5,11 +5,10 @@ import logging
 
 from awesomeversion import AwesomeVersion, AwesomeVersionStrategy
 
-from homeassistant.components.hassio import get_supervisor_info
+from homeassistant.components.hassio import get_supervisor_info, is_hassio
 from homeassistant.const import __version__
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, REQUEST_TIMEOUT, UPDATE_INTERVAL
diff --git a/homeassistant/components/homeassistant_alerts/manifest.json b/homeassistant/components/homeassistant_alerts/manifest.json
index 0412f43da69..96e419ad9a2 100644
--- a/homeassistant/components/homeassistant_alerts/manifest.json
+++ b/homeassistant/components/homeassistant_alerts/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "homeassistant_alerts",
   "name": "Home Assistant Alerts",
-  "after_dependencies": ["hassio"],
   "codeowners": ["@home-assistant/core"],
   "config_flow": false,
   "documentation": "https://www.home-assistant.io/integrations/homeassistant_alerts",
diff --git a/homeassistant/components/homeassistant_green/__init__.py b/homeassistant/components/homeassistant_green/__init__.py
index 79688f9d16a..2d35b5bbed3 100644
--- a/homeassistant/components/homeassistant_green/__init__.py
+++ b/homeassistant/components/homeassistant_green/__init__.py
@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-from homeassistant.components.hassio import get_os_info
+from homeassistant.components.hassio import get_os_info, is_hassio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.hassio import is_hassio
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/homeassistant/components/homeassistant_green/config_flow.py b/homeassistant/components/homeassistant_green/config_flow.py
index c9aed577365..3a015faa11a 100644
--- a/homeassistant/components/homeassistant_green/config_flow.py
+++ b/homeassistant/components/homeassistant_green/config_flow.py
@@ -13,6 +13,7 @@ from homeassistant.components.hassio import (
     HassioAPIError,
     async_get_green_settings,
     async_set_green_settings,
+    is_hassio,
 )
 from homeassistant.config_entries import (
     ConfigEntry,
@@ -22,7 +23,6 @@ from homeassistant.config_entries import (
 )
 from homeassistant.core import callback
 from homeassistant.helpers import selector
-from homeassistant.helpers.hassio import is_hassio
 
 from .const import DOMAIN
 
diff --git a/homeassistant/components/homeassistant_hardware/firmware_config_flow.py b/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
index a91fb00c142..b8dc4227ece 100644
--- a/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
+++ b/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
@@ -14,6 +14,7 @@ from homeassistant.components.hassio import (
     AddonInfo,
     AddonManager,
     AddonState,
+    is_hassio,
 )
 from homeassistant.components.zha.repairs.wrong_silabs_firmware import (
     probe_silabs_firmware_type,
@@ -24,10 +25,10 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import AbortFlow
-from homeassistant.helpers.hassio import is_hassio
 
 from . import silabs_multiprotocol_addon
 from .const import ZHA_DOMAIN
@@ -495,15 +496,13 @@ class BaseFirmwareConfigFlow(BaseFirmwareInstallFlow, ConfigFlow):
         return await self.async_step_pick_firmware()
 
 
-class BaseFirmwareOptionsFlow(BaseFirmwareInstallFlow, OptionsFlow):
+class BaseFirmwareOptionsFlow(BaseFirmwareInstallFlow, OptionsFlowWithConfigEntry):
     """Zigbee and Thread options flow handlers."""
 
-    def __init__(self, config_entry: ConfigEntry, *args: Any, **kwargs: Any) -> None:
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Instantiate options flow."""
         super().__init__(*args, **kwargs)
 
-        self._config_entry = config_entry
-
         self._probed_firmware_type = ApplicationType(self.config_entry.data["firmware"])
 
         # Make `context` a regular dictionary
diff --git a/homeassistant/components/homeassistant_hardware/manifest.json b/homeassistant/components/homeassistant_hardware/manifest.json
index f692094bc67..8898cece75a 100644
--- a/homeassistant/components/homeassistant_hardware/manifest.json
+++ b/homeassistant/components/homeassistant_hardware/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "homeassistant_hardware",
   "name": "Home Assistant Hardware",
-  "after_dependencies": ["hassio", "zha"],
+  "after_dependencies": ["zha"],
   "codeowners": ["@home-assistant/core"],
   "documentation": "https://www.home-assistant.io/integrations/homeassistant_hardware",
   "integration_type": "system"
diff --git a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
index 2b08031405f..31032ff6a8c 100644
--- a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
+++ b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
@@ -17,6 +17,7 @@ from homeassistant.components.hassio import (
     AddonManager,
     AddonState,
     hostname_from_addon_slug,
+    is_hassio,
 )
 from homeassistant.config_entries import (
     ConfigEntry,
@@ -27,7 +28,6 @@ from homeassistant.config_entries import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.integration_platform import (
     async_process_integration_platforms,
 )
@@ -318,6 +318,7 @@ class OptionsFlowHandler(OptionsFlow, ABC):
         self.start_task: asyncio.Task | None = None
         self.stop_task: asyncio.Task | None = None
         self._zha_migration_mgr: ZhaMultiPANMigrationHelper | None = None
+        self.config_entry = config_entry
         self.original_addon_config: dict[str, Any] | None = None
         self.revert_reason: str | None = None
 
diff --git a/homeassistant/components/homeassistant_hardware/util.py b/homeassistant/components/homeassistant_hardware/util.py
index 0c06ff05e5c..90cfee076e3 100644
--- a/homeassistant/components/homeassistant_hardware/util.py
+++ b/homeassistant/components/homeassistant_hardware/util.py
@@ -9,10 +9,9 @@ from typing import cast
 
 from universal_silabs_flasher.const import ApplicationType
 
-from homeassistant.components.hassio import AddonError, AddonState
+from homeassistant.components.hassio import AddonError, AddonState, is_hassio
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.singleton import singleton
 
 from .const import (
diff --git a/homeassistant/components/homeassistant_yellow/__init__.py b/homeassistant/components/homeassistant_yellow/__init__.py
index dc34cc4cdc9..04abe5a1dca 100644
--- a/homeassistant/components/homeassistant_yellow/__init__.py
+++ b/homeassistant/components/homeassistant_yellow/__init__.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from homeassistant.components.hassio import get_os_info
+from homeassistant.components.hassio import get_os_info, is_hassio
 from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon import (
     check_multi_pan_addon,
 )
@@ -16,7 +16,6 @@ from homeassistant.config_entries import SOURCE_HARDWARE, ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import discovery_flow
-from homeassistant.helpers.hassio import is_hassio
 
 from .const import FIRMWARE, RADIO_DEVICE, ZHA_HW_DISCOVERY_DATA
 
diff --git a/homeassistant/components/homekit/config_flow.py b/homeassistant/components/homekit/config_flow.py
index 53db7774821..a63e365ead7 100644
--- a/homeassistant/components/homekit/config_flow.py
+++ b/homeassistant/components/homekit/config_flow.py
@@ -362,14 +362,15 @@ class HomeKitConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for homekit."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self.hk_options: dict[str, Any] = {}
         self.included_cameras: list[str] = []
 
diff --git a/homeassistant/components/homekit/manifest.json b/homeassistant/components/homekit/manifest.json
index cf74bcc7d67..eebdc0026fd 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.9.2",
+    "HAP-python==4.9.1",
     "fnv-hash-fast==1.0.2",
     "PyQRCode==1.2.1",
     "base36==0.1.1"
diff --git a/homeassistant/components/homekit/type_lights.py b/homeassistant/components/homekit/type_lights.py
index cde80178c5e..6b57a03153c 100644
--- a/homeassistant/components/homekit/type_lights.py
+++ b/homeassistant/components/homekit/type_lights.py
@@ -171,9 +171,8 @@ class Light(HomeAccessory):
         events = []
         service = SERVICE_TURN_ON
         params: dict[str, Any] = {ATTR_ENTITY_ID: self.entity_id}
-        has_on = CHAR_ON in char_values
 
-        if has_on:
+        if CHAR_ON in char_values:
             if not char_values[CHAR_ON]:
                 service = SERVICE_TURN_OFF
             events.append(f"Set state to {char_values[CHAR_ON]}")
@@ -181,10 +180,7 @@ class Light(HomeAccessory):
         brightness_pct = None
         if CHAR_BRIGHTNESS in char_values:
             if char_values[CHAR_BRIGHTNESS] == 0:
-                if has_on:
-                    events[-1] = "Set state to 0"
-                else:
-                    events.append("Set state to 0")
+                events[-1] = "Set state to 0"
                 service = SERVICE_TURN_OFF
             else:
                 brightness_pct = char_values[CHAR_BRIGHTNESS]
diff --git a/homeassistant/components/homekit/type_security_systems.py b/homeassistant/components/homekit/type_security_systems.py
index 8634589cb5f..6ab521b6727 100644
--- a/homeassistant/components/homekit/type_security_systems.py
+++ b/homeassistant/components/homekit/type_security_systems.py
@@ -8,7 +8,6 @@ from pyhap.const import CATEGORY_ALARM_SYSTEM
 from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.const import (
     ATTR_CODE,
@@ -18,8 +17,13 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_ARM_NIGHT,
     SERVICE_ALARM_DISARM,
-    STATE_UNAVAILABLE,
-    STATE_UNKNOWN,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import State, callback
 
@@ -39,22 +43,22 @@ HK_ALARM_DISARMED = 3
 HK_ALARM_TRIGGERED = 4
 
 HASS_TO_HOMEKIT_CURRENT = {
-    AlarmControlPanelState.ARMED_HOME: HK_ALARM_STAY_ARMED,
-    AlarmControlPanelState.ARMED_VACATION: HK_ALARM_AWAY_ARMED,
-    AlarmControlPanelState.ARMED_AWAY: HK_ALARM_AWAY_ARMED,
-    AlarmControlPanelState.ARMED_NIGHT: HK_ALARM_NIGHT_ARMED,
-    AlarmControlPanelState.ARMING: HK_ALARM_DISARMED,
-    AlarmControlPanelState.DISARMED: HK_ALARM_DISARMED,
-    AlarmControlPanelState.TRIGGERED: HK_ALARM_TRIGGERED,
+    STATE_ALARM_ARMED_HOME: HK_ALARM_STAY_ARMED,
+    STATE_ALARM_ARMED_VACATION: HK_ALARM_AWAY_ARMED,
+    STATE_ALARM_ARMED_AWAY: HK_ALARM_AWAY_ARMED,
+    STATE_ALARM_ARMED_NIGHT: HK_ALARM_NIGHT_ARMED,
+    STATE_ALARM_ARMING: HK_ALARM_DISARMED,
+    STATE_ALARM_DISARMED: HK_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED: HK_ALARM_TRIGGERED,
 }
 
 HASS_TO_HOMEKIT_TARGET = {
-    AlarmControlPanelState.ARMED_HOME: HK_ALARM_STAY_ARMED,
-    AlarmControlPanelState.ARMED_VACATION: HK_ALARM_AWAY_ARMED,
-    AlarmControlPanelState.ARMED_AWAY: HK_ALARM_AWAY_ARMED,
-    AlarmControlPanelState.ARMED_NIGHT: HK_ALARM_NIGHT_ARMED,
-    AlarmControlPanelState.ARMING: HK_ALARM_AWAY_ARMED,
-    AlarmControlPanelState.DISARMED: HK_ALARM_DISARMED,
+    STATE_ALARM_ARMED_HOME: HK_ALARM_STAY_ARMED,
+    STATE_ALARM_ARMED_VACATION: HK_ALARM_AWAY_ARMED,
+    STATE_ALARM_ARMED_AWAY: HK_ALARM_AWAY_ARMED,
+    STATE_ALARM_ARMED_NIGHT: HK_ALARM_NIGHT_ARMED,
+    STATE_ALARM_ARMING: HK_ALARM_AWAY_ARMED,
+    STATE_ALARM_DISARMED: HK_ALARM_DISARMED,
 }
 
 HASS_TO_HOMEKIT_SERVICES = {
@@ -120,7 +124,7 @@ class SecuritySystem(HomeAccessory):
 
         self.char_current_state = serv_alarm.configure_char(
             CHAR_CURRENT_SECURITY_STATE,
-            value=HASS_TO_HOMEKIT_CURRENT[AlarmControlPanelState.DISARMED],
+            value=HASS_TO_HOMEKIT_CURRENT[STATE_ALARM_DISARMED],
             valid_values={
                 key: val
                 for key, val in default_current_states.items()
@@ -154,16 +158,8 @@ class SecuritySystem(HomeAccessory):
     @callback
     def async_update_state(self, new_state: State) -> None:
         """Update security state after state changed."""
-        hass_state: str | AlarmControlPanelState = new_state.state
-        if hass_state in {"None", STATE_UNKNOWN, STATE_UNAVAILABLE}:
-            # Bail out early for no state, unknown or unavailable
-            return
-        if hass_state is not None:
-            hass_state = AlarmControlPanelState(hass_state)
-        if (
-            hass_state
-            and (current_state := HASS_TO_HOMEKIT_CURRENT.get(hass_state)) is not None
-        ):
+        hass_state = new_state.state
+        if (current_state := HASS_TO_HOMEKIT_CURRENT.get(hass_state)) is not None:
             self.char_current_state.set_value(current_state)
             _LOGGER.debug(
                 "%s: Updated current state to %s (%d)",
@@ -171,8 +167,5 @@ class SecuritySystem(HomeAccessory):
                 hass_state,
                 current_state,
             )
-        if (
-            hass_state
-            and (target_state := HASS_TO_HOMEKIT_TARGET.get(hass_state)) is not None
-        ):
+        if (target_state := HASS_TO_HOMEKIT_TARGET.get(hass_state)) is not None:
             self.char_target_state.set_value(target_state)
diff --git a/homeassistant/components/homekit_controller/alarm_control_panel.py b/homeassistant/components/homekit_controller/alarm_control_panel.py
index 3cb80f2c817..1cb94926e8b 100644
--- a/homeassistant/components/homekit_controller/alarm_control_panel.py
+++ b/homeassistant/components/homekit_controller/alarm_control_panel.py
@@ -10,10 +10,17 @@ from aiohomekit.model.services import Service, ServicesTypes
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_BATTERY_LEVEL, Platform
+from homeassistant.const import (
+    ATTR_BATTERY_LEVEL,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+    Platform,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -22,18 +29,18 @@ from .connection import HKDevice
 from .entity import HomeKitEntity
 
 CURRENT_STATE_MAP = {
-    0: AlarmControlPanelState.ARMED_HOME,
-    1: AlarmControlPanelState.ARMED_AWAY,
-    2: AlarmControlPanelState.ARMED_NIGHT,
-    3: AlarmControlPanelState.DISARMED,
-    4: AlarmControlPanelState.TRIGGERED,
+    0: STATE_ALARM_ARMED_HOME,
+    1: STATE_ALARM_ARMED_AWAY,
+    2: STATE_ALARM_ARMED_NIGHT,
+    3: STATE_ALARM_DISARMED,
+    4: STATE_ALARM_TRIGGERED,
 }
 
 TARGET_STATE_MAP = {
-    AlarmControlPanelState.ARMED_HOME: 0,
-    AlarmControlPanelState.ARMED_AWAY: 1,
-    AlarmControlPanelState.ARMED_NIGHT: 2,
-    AlarmControlPanelState.DISARMED: 3,
+    STATE_ALARM_ARMED_HOME: 0,
+    STATE_ALARM_ARMED_AWAY: 1,
+    STATE_ALARM_ARMED_NIGHT: 2,
+    STATE_ALARM_DISARMED: 3,
 }
 
 
@@ -79,7 +86,7 @@ class HomeKitAlarmControlPanelEntity(HomeKitEntity, AlarmControlPanelEntity):
         ]
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState:
+    def state(self) -> str:
         """Return the state of the device."""
         return CURRENT_STATE_MAP[
             self.service.value(CharacteristicsTypes.SECURITY_SYSTEM_STATE_CURRENT)
@@ -87,23 +94,21 @@ class HomeKitAlarmControlPanelEntity(HomeKitEntity, AlarmControlPanelEntity):
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
-        await self.set_alarm_state(AlarmControlPanelState.DISARMED, code)
+        await self.set_alarm_state(STATE_ALARM_DISARMED, code)
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm command."""
-        await self.set_alarm_state(AlarmControlPanelState.ARMED_AWAY, code)
+        await self.set_alarm_state(STATE_ALARM_ARMED_AWAY, code)
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send stay command."""
-        await self.set_alarm_state(AlarmControlPanelState.ARMED_HOME, code)
+        await self.set_alarm_state(STATE_ALARM_ARMED_HOME, code)
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send night command."""
-        await self.set_alarm_state(AlarmControlPanelState.ARMED_NIGHT, code)
+        await self.set_alarm_state(STATE_ALARM_ARMED_NIGHT, code)
 
-    async def set_alarm_state(
-        self, state: AlarmControlPanelState, code: str | None = None
-    ) -> None:
+    async def set_alarm_state(self, state: str, code: str | None = None) -> None:
         """Send state command."""
         await self.async_put_characteristics(
             {CharacteristicsTypes.SECURITY_SYSTEM_STATE_TARGET: TARGET_STATE_MAP[state]}
diff --git a/homeassistant/components/homekit_controller/climate.py b/homeassistant/components/homekit_controller/climate.py
index 4e55c8212be..3be0af17dbd 100644
--- a/homeassistant/components/homekit_controller/climate.py
+++ b/homeassistant/components/homekit_controller/climate.py
@@ -8,7 +8,6 @@ from typing import Any, Final
 from aiohomekit.model.characteristics import (
     ActivationStateValues,
     CharacteristicsTypes,
-    CurrentFanStateValues,
     CurrentHeaterCoolerStateValues,
     HeatingCoolingCurrentValues,
     HeatingCoolingTargetValues,
@@ -485,7 +484,6 @@ class HomeKitClimateEntity(HomeKitBaseClimateEntity):
             CharacteristicsTypes.TEMPERATURE_TARGET,
             CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT,
             CharacteristicsTypes.RELATIVE_HUMIDITY_TARGET,
-            CharacteristicsTypes.FAN_STATE_CURRENT,
         ]
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
@@ -668,19 +666,7 @@ class HomeKitClimateEntity(HomeKitBaseClimateEntity):
             return HVACAction.IDLE
 
         value = self.service.value(CharacteristicsTypes.HEATING_COOLING_CURRENT)
-        current_hass_value = CURRENT_MODE_HOMEKIT_TO_HASS.get(value)
-
-        # If a device has a fan state (such as an Ecobee thermostat)
-        # show the Fan state when the device is otherwise idle.
-        if (
-            current_hass_value == HVACAction.IDLE
-            and self.service.has(CharacteristicsTypes.FAN_STATE_CURRENT)
-            and self.service.value(CharacteristicsTypes.FAN_STATE_CURRENT)
-            == CurrentFanStateValues.ACTIVE
-        ):
-            return HVACAction.FAN
-
-        return current_hass_value
+        return CURRENT_MODE_HOMEKIT_TO_HASS.get(value)
 
     @property
     def hvac_mode(self) -> HVACMode:
diff --git a/homeassistant/components/homekit_controller/const.py b/homeassistant/components/homekit_controller/const.py
index 77deb07b3dd..aea5a6661ee 100644
--- a/homeassistant/components/homekit_controller/const.py
+++ b/homeassistant/components/homekit_controller/const.py
@@ -50,7 +50,6 @@ HOMEKIT_ACCESSORY_DISPATCH = {
     ServicesTypes.FAN_V2: "fan",
     ServicesTypes.OCCUPANCY_SENSOR: "binary_sensor",
     ServicesTypes.TELEVISION: "media_player",
-    ServicesTypes.FAUCET: "switch",
     ServicesTypes.VALVE: "switch",
     ServicesTypes.CAMERA_RTP_STREAM_MANAGEMENT: "camera",
     ServicesTypes.DOORBELL: "event",
diff --git a/homeassistant/components/homekit_controller/manifest.json b/homeassistant/components/homekit_controller/manifest.json
index cddd61a12c1..b2b215a98b9 100644
--- a/homeassistant/components/homekit_controller/manifest.json
+++ b/homeassistant/components/homekit_controller/manifest.json
@@ -14,6 +14,6 @@
   "documentation": "https://www.home-assistant.io/integrations/homekit_controller",
   "iot_class": "local_push",
   "loggers": ["aiohomekit", "commentjson"],
-  "requirements": ["aiohomekit==3.2.6"],
+  "requirements": ["aiohomekit==3.2.3"],
   "zeroconf": ["_hap._tcp.local.", "_hap._udp.local."]
 }
diff --git a/homeassistant/components/homekit_controller/switch.py b/homeassistant/components/homekit_controller/switch.py
index 5abed2a5c79..9fa4782e061 100644
--- a/homeassistant/components/homekit_controller/switch.py
+++ b/homeassistant/components/homekit_controller/switch.py
@@ -102,27 +102,6 @@ class HomeKitSwitch(HomeKitEntity, SwitchEntity):
         return None
 
 
-class HomeKitFaucet(HomeKitEntity, SwitchEntity):
-    """Representation of a Homekit faucet."""
-
-    def get_characteristic_types(self) -> list[str]:
-        """Define the homekit characteristics the entity cares about."""
-        return [CharacteristicsTypes.ACTIVE]
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if device is on."""
-        return self.service.value(CharacteristicsTypes.ACTIVE)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the specified faucet on."""
-        await self.async_put_characteristics({CharacteristicsTypes.ACTIVE: True})
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the specified faucet off."""
-        await self.async_put_characteristics({CharacteristicsTypes.ACTIVE: False})
-
-
 class HomeKitValve(HomeKitEntity, SwitchEntity):
     """Represents a valve in an irrigation system."""
 
@@ -213,10 +192,9 @@ class DeclarativeCharacteristicSwitch(CharacteristicEntity, SwitchEntity):
         )
 
 
-ENTITY_TYPES: dict[str, type[HomeKitSwitch | HomeKitFaucet | HomeKitValve]] = {
+ENTITY_TYPES: dict[str, type[HomeKitSwitch | HomeKitValve]] = {
     ServicesTypes.SWITCH: HomeKitSwitch,
     ServicesTypes.OUTLET: HomeKitSwitch,
-    ServicesTypes.FAUCET: HomeKitFaucet,
     ServicesTypes.VALVE: HomeKitValve,
 }
 
@@ -235,7 +213,7 @@ async def async_setup_entry(
         if not (entity_class := ENTITY_TYPES.get(service.type)):
             return False
         info = {"aid": service.accessory.aid, "iid": service.iid}
-        entity: HomeKitSwitch | HomeKitFaucet | HomeKitValve = entity_class(conn, info)
+        entity: HomeKitSwitch | HomeKitValve = entity_class(conn, info)
         conn.async_migrate_unique_id(
             entity.old_unique_id, entity.unique_id, Platform.SWITCH
         )
diff --git a/homeassistant/components/homematicip_cloud/alarm_control_panel.py b/homeassistant/components/homematicip_cloud/alarm_control_panel.py
index 4241316c2a4..35aa321f2a8 100644
--- a/homeassistant/components/homematicip_cloud/alarm_control_panel.py
+++ b/homeassistant/components/homematicip_cloud/alarm_control_panel.py
@@ -9,9 +9,14 @@ from homematicip.functionalHomes import SecurityAndAlarmHome
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -60,21 +65,21 @@ class HomematicipAlarmControlPanelEntity(AlarmControlPanelEntity):
         )
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState:
+    def state(self) -> str:
         """Return the state of the alarm control panel."""
         # check for triggered alarm
         if self._security_and_alarm.alarmActive:
-            return AlarmControlPanelState.TRIGGERED
+            return STATE_ALARM_TRIGGERED
 
         activation_state = self._home.get_security_zones_activation()
         # check arm_away
         if activation_state == (True, True):
-            return AlarmControlPanelState.ARMED_AWAY
+            return STATE_ALARM_ARMED_AWAY
         # check arm_home
         if activation_state == (False, True):
-            return AlarmControlPanelState.ARMED_HOME
+            return STATE_ALARM_ARMED_HOME
 
-        return AlarmControlPanelState.DISARMED
+        return STATE_ALARM_DISARMED
 
     @property
     def _security_and_alarm(self) -> SecurityAndAlarmHome:
diff --git a/homeassistant/components/homematicip_cloud/sensor.py b/homeassistant/components/homematicip_cloud/sensor.py
index c44d280c190..eab7ba4f09e 100644
--- a/homeassistant/components/homematicip_cloud/sensor.py
+++ b/homeassistant/components/homematicip_cloud/sensor.py
@@ -420,7 +420,6 @@ class HomematicipWindspeedSensor(HomematicipGenericEntity, SensorEntity):
 
     _attr_device_class = SensorDeviceClass.WIND_SPEED
     _attr_native_unit_of_measurement = UnitOfSpeed.KILOMETERS_PER_HOUR
-    _attr_state_class = SensorStateClass.MEASUREMENT
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the windspeed sensor."""
@@ -452,7 +451,6 @@ class HomematicipTodayRainSensor(HomematicipGenericEntity, SensorEntity):
 
     _attr_device_class = SensorDeviceClass.PRECIPITATION
     _attr_native_unit_of_measurement = UnitOfPrecipitationDepth.MILLIMETERS
-    _attr_state_class = SensorStateClass.MEASUREMENT
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the  device."""
diff --git a/homeassistant/components/homeworks/strings.json b/homeassistant/components/homeworks/strings.json
index 977e6be8afd..a9dcab2f1e0 100644
--- a/homeassistant/components/homeworks/strings.json
+++ b/homeassistant/components/homeworks/strings.json
@@ -1,8 +1,5 @@
 {
   "config": {
-    "abort": {
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
-    },
     "error": {
       "connection_error": "Could not connect to the controller.",
       "credentials_needed": "The controller needs credentials.",
diff --git a/homeassistant/components/honeywell/climate.py b/homeassistant/components/honeywell/climate.py
index 98cbae4eb7e..934d41b238e 100644
--- a/homeassistant/components/honeywell/climate.py
+++ b/homeassistant/components/honeywell/climate.py
@@ -49,10 +49,6 @@ from .const import (
     RETRY,
 )
 
-MODE_PERMANENT_HOLD = 2
-MODE_TEMPORARY_HOLD = 1
-MODE_HOLD = {MODE_PERMANENT_HOLD, MODE_TEMPORARY_HOLD}
-
 ATTR_FAN_ACTION = "fan_action"
 
 ATTR_PERMANENT_HOLD = "permanent_hold"
@@ -179,7 +175,6 @@ class HoneywellUSThermostat(ClimateEntity):
         self._cool_away_temp = cool_away_temp
         self._heat_away_temp = heat_away_temp
         self._away = False
-        self._away_hold = False
         self._retry = 0
 
         self._attr_unique_id = str(device.deviceid)
@@ -328,15 +323,11 @@ class HoneywellUSThermostat(ClimateEntity):
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode, e.g., home, away, temp."""
-        if self._away and self._is_hold():
-            self._away_hold = True
+        if self._away:
             return PRESET_AWAY
-        if self._is_hold():
+        if self._is_permanent_hold():
             return PRESET_HOLD
-        # Someone has changed the stat manually out of hold in away mode
-        if self._away and self._away_hold:
-            self._away = False
-            self._away_hold = False
+
         return PRESET_NONE
 
     @property
@@ -344,15 +335,10 @@ class HoneywellUSThermostat(ClimateEntity):
         """Return the fan setting."""
         return HW_FAN_MODE_TO_HA.get(self._device.fan_mode)
 
-    def _is_hold(self) -> bool:
-        heat_status = self._device.raw_ui_data.get("StatusHeat", 0)
-        cool_status = self._device.raw_ui_data.get("StatusCool", 0)
-        return heat_status in MODE_HOLD or cool_status in MODE_HOLD
-
     def _is_permanent_hold(self) -> bool:
         heat_status = self._device.raw_ui_data.get("StatusHeat", 0)
         cool_status = self._device.raw_ui_data.get("StatusCool", 0)
-        return MODE_PERMANENT_HOLD in (heat_status, cool_status)
+        return heat_status == 2 or cool_status == 2
 
     async def _set_temperature(self, **kwargs) -> None:
         """Set new target temperature."""
diff --git a/homeassistant/components/honeywell/config_flow.py b/homeassistant/components/honeywell/config_flow.py
index c7cda500692..c9b1dfb950a 100644
--- a/homeassistant/components/honeywell/config_flow.py
+++ b/homeassistant/components/honeywell/config_flow.py
@@ -129,12 +129,16 @@ class HoneywellConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> HoneywellOptionsFlowHandler:
         """Options callback for Honeywell."""
-        return HoneywellOptionsFlowHandler()
+        return HoneywellOptionsFlowHandler(config_entry)
 
 
 class HoneywellOptionsFlowHandler(OptionsFlow):
     """Config flow options for Honeywell."""
 
+    def __init__(self, entry: ConfigEntry) -> None:
+        """Initialize Honeywell options flow."""
+        self.config_entry = entry
+
     async def async_step_init(self, user_input=None) -> ConfigFlowResult:
         """Manage the options."""
         if user_input is not None:
diff --git a/homeassistant/components/honeywell/strings.json b/homeassistant/components/honeywell/strings.json
index a64f1a6fce0..aa6e53620a5 100644
--- a/homeassistant/components/honeywell/strings.json
+++ b/homeassistant/components/honeywell/strings.json
@@ -16,9 +16,6 @@
         }
       }
     },
-    "abort": {
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    },
     "error": {
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
diff --git a/homeassistant/components/http/ban.py b/homeassistant/components/http/ban.py
index c8fc8ffb11b..dd5f1ed1b05 100644
--- a/homeassistant/components/http/ban.py
+++ b/homeassistant/components/http/ban.py
@@ -27,7 +27,6 @@ from homeassistant.config import load_yaml_config_file
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.hassio import get_supervisor_ip, is_hassio
 from homeassistant.util import dt as dt_util, yaml
 
 from .const import KEY_HASS
@@ -150,8 +149,12 @@ async def process_wrong_login(request: Request) -> None:
     request.app[KEY_FAILED_LOGIN_ATTEMPTS][remote_addr] += 1
 
     # Supervisor IP should never be banned
-    if is_hassio(hass) and str(remote_addr) == get_supervisor_ip():
-        return
+    if "hassio" in hass.config.components:
+        # pylint: disable-next=import-outside-toplevel
+        from homeassistant.components import hassio
+
+        if hassio.get_supervisor_ip() == str(remote_addr):
+            return
 
     if (
         request.app[KEY_FAILED_LOGIN_ATTEMPTS][remote_addr]
diff --git a/homeassistant/components/huawei_lte/config_flow.py b/homeassistant/components/huawei_lte/config_flow.py
index 08fdae50c51..02349b2ae7f 100644
--- a/homeassistant/components/huawei_lte/config_flow.py
+++ b/homeassistant/components/huawei_lte/config_flow.py
@@ -69,7 +69,7 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def _async_show_user_form(
         self,
@@ -345,6 +345,10 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Huawei LTE options flow."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/huawei_lte/manifest.json b/homeassistant/components/huawei_lte/manifest.json
index 6720d6718ef..908092ba2ca 100644
--- a/homeassistant/components/huawei_lte/manifest.json
+++ b/homeassistant/components/huawei_lte/manifest.json
@@ -7,7 +7,7 @@
   "iot_class": "local_polling",
   "loggers": ["huawei_lte_api.Session"],
   "requirements": [
-    "huawei-lte-api==1.10.0",
+    "huawei-lte-api==1.9.3",
     "stringcase==1.2.0",
     "url-normalize==1.4.3"
   ],
diff --git a/homeassistant/components/hue/config_flow.py b/homeassistant/components/hue/config_flow.py
index 8d17f810461..e73ae8fe11d 100644
--- a/homeassistant/components/hue/config_flow.py
+++ b/homeassistant/components/hue/config_flow.py
@@ -57,8 +57,8 @@ class HueFlowHandler(ConfigFlow, domain=DOMAIN):
     ) -> HueV1OptionsFlowHandler | HueV2OptionsFlowHandler:
         """Get the options flow for this handler."""
         if config_entry.data.get(CONF_API_VERSION, 1) == 1:
-            return HueV1OptionsFlowHandler()
-        return HueV2OptionsFlowHandler()
+            return HueV1OptionsFlowHandler(config_entry)
+        return HueV2OptionsFlowHandler(config_entry)
 
     def __init__(self) -> None:
         """Initialize the Hue flow."""
@@ -280,6 +280,10 @@ class HueFlowHandler(ConfigFlow, domain=DOMAIN):
 class HueV1OptionsFlowHandler(OptionsFlow):
     """Handle Hue options for V1 implementation."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize Hue options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -311,6 +315,10 @@ class HueV1OptionsFlowHandler(OptionsFlow):
 class HueV2OptionsFlowHandler(OptionsFlow):
     """Handle Hue options for V2 implementation."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize Hue options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/hue/strings.json b/homeassistant/components/hue/strings.json
index 2f7f2e55561..ab1d0fb58ad 100644
--- a/homeassistant/components/hue/strings.json
+++ b/homeassistant/components/hue/strings.json
@@ -137,15 +137,15 @@
   "services": {
     "hue_activate_scene": {
       "name": "Activate scene",
-      "description": "Activates a Hue scene stored in the Hue hub.",
+      "description": "Activates a hue scene stored in the hue hub.",
       "fields": {
         "group_name": {
           "name": "Group",
-          "description": "Name of Hue group/room from the Hue app."
+          "description": "Name of hue group/room from the hue app."
         },
         "scene_name": {
           "name": "Scene",
-          "description": "Name of Hue scene from the Hue app."
+          "description": "Name of hue scene from the hue app."
         },
         "dynamic": {
           "name": "Dynamic",
diff --git a/homeassistant/components/huisbaasje/__init__.py b/homeassistant/components/huisbaasje/__init__.py
index f9703f67df5..3e0c9845c92 100644
--- a/homeassistant/components/huisbaasje/__init__.py
+++ b/homeassistant/components/huisbaasje/__init__.py
@@ -54,7 +54,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="sensor",
         update_method=async_update_data,
         update_interval=timedelta(seconds=POLLING_INTERVAL),
diff --git a/homeassistant/components/hunterdouglas_powerview/__init__.py b/homeassistant/components/hunterdouglas_powerview/__init__.py
index d9358db2753..f8c7ac43b94 100644
--- a/homeassistant/components/hunterdouglas_powerview/__init__.py
+++ b/homeassistant/components/hunterdouglas_powerview/__init__.py
@@ -1,8 +1,9 @@
 """The Hunter Douglas PowerView integration."""
 
 import logging
-from typing import TYPE_CHECKING
 
+from aiopvapi.helpers.aiorequest import AioRequest
+from aiopvapi.hub import Hub
 from aiopvapi.resources.model import PowerviewData
 from aiopvapi.rooms import Rooms
 from aiopvapi.scenes import Scenes
@@ -11,13 +12,12 @@ from aiopvapi.shades import Shades
 from homeassistant.const import CONF_API_VERSION, CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN, HUB_EXCEPTIONS
 from .coordinator import PowerviewShadeUpdateCoordinator
-from .model import PowerviewConfigEntry, PowerviewEntryData
+from .model import PowerviewConfigEntry, PowerviewDeviceInfo, PowerviewEntryData
 from .shade_data import PowerviewShadeData
-from .util import async_connect_hub
 
 PARALLEL_UPDATES = 1
 
@@ -35,23 +35,29 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(hass: HomeAssistant, entry: PowerviewConfigEntry) -> bool:
     """Set up Hunter Douglas PowerView from a config entry."""
+
     config = entry.data
-    hub_address: str = config[CONF_HOST]
-    api_version: int | None = config.get(CONF_API_VERSION)
+
+    hub_address = config[CONF_HOST]
+    api_version = config.get(CONF_API_VERSION, None)
     _LOGGER.debug("Connecting %s at %s with v%s api", DOMAIN, hub_address, api_version)
 
+    websession = async_get_clientsession(hass)
+
+    pv_request = AioRequest(
+        hub_address, loop=hass.loop, websession=websession, api_version=api_version
+    )
+
     # default 15 second timeout for each call in upstream
     try:
-        api = await async_connect_hub(hass, hub_address, api_version)
+        hub = Hub(pv_request)
+        await hub.query_firmware()
+        device_info = await async_get_device_info(hub)
     except HUB_EXCEPTIONS as err:
         raise ConfigEntryNotReady(
             f"Connection error to PowerView hub {hub_address}: {err}"
         ) from err
 
-    hub = api.hub
-    pv_request = api.pv_request
-    device_info = api.device_info
-
     if hub.role != "Primary":
         # this should be caught in config_flow, but account for a hub changing roles
         # this will only happen manually by a user
@@ -86,11 +92,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: PowerviewConfigEntry) ->
         new_data[CONF_API_VERSION] = hub.api_version
         hass.config_entries.async_update_entry(entry, data=new_data)
 
-    if entry.unique_id is None:
-        hass.config_entries.async_update_entry(
-            entry, unique_id=device_info.serial_number
-        )
-
     coordinator = PowerviewShadeUpdateCoordinator(hass, shades, hub)
     coordinator.async_set_updated_data(PowerviewShadeData())
     # populate raw shade data into the coordinator for diagnostics
@@ -110,62 +111,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: PowerviewConfigEntry) ->
     return True
 
 
+async def async_get_device_info(hub: Hub) -> PowerviewDeviceInfo:
+    """Determine device info."""
+    return PowerviewDeviceInfo(
+        name=hub.name,
+        mac_address=hub.mac_address,
+        serial_number=hub.serial_number,
+        firmware=hub.firmware,
+        model=hub.model,
+        hub_address=hub.ip,
+    )
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: PowerviewConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-
-async def async_migrate_entry(hass: HomeAssistant, entry: PowerviewConfigEntry) -> bool:
-    """Migrate entry."""
-
-    _LOGGER.debug("Migrating from version %s.%s", entry.version, entry.minor_version)
-
-    if entry.version == 1:
-        # 1 -> 2: Unique ID from integer to string
-        if entry.minor_version == 1:
-            if entry.unique_id is None:
-                await _async_add_missing_entry_unique_id(hass, entry)
-            await _migrate_unique_ids(hass, entry)
-            hass.config_entries.async_update_entry(entry, minor_version=2)
-
-    _LOGGER.debug("Migrated to version %s.%s", entry.version, entry.minor_version)
-
-    return True
-
-
-async def _async_add_missing_entry_unique_id(
-    hass: HomeAssistant, entry: PowerviewConfigEntry
-) -> None:
-    """Add the unique id if its missing."""
-    address: str = entry.data[CONF_HOST]
-    api_version: int | None = entry.data.get(CONF_API_VERSION)
-    api = await async_connect_hub(hass, address, api_version)
-    hass.config_entries.async_update_entry(
-        entry, unique_id=api.device_info.serial_number
-    )
-
-
-async def _migrate_unique_ids(hass: HomeAssistant, entry: PowerviewConfigEntry) -> None:
-    """Migrate int based unique ids to str."""
-    entity_registry = er.async_get(hass)
-    registry_entries = er.async_entries_for_config_entry(
-        entity_registry, entry.entry_id
-    )
-    if TYPE_CHECKING:
-        assert entry.unique_id
-    for reg_entry in registry_entries:
-        if isinstance(reg_entry.unique_id, int) or (
-            isinstance(reg_entry.unique_id, str)
-            and not reg_entry.unique_id.startswith(entry.unique_id)
-        ):
-            _LOGGER.debug(
-                "Migrating %s: %s to %s_%s",
-                reg_entry.entity_id,
-                reg_entry.unique_id,
-                entry.unique_id,
-                reg_entry.unique_id,
-            )
-            entity_registry.async_update_entity(
-                reg_entry.entity_id,
-                new_unique_id=f"{entry.unique_id}_{reg_entry.unique_id}",
-            )
diff --git a/homeassistant/components/hunterdouglas_powerview/config_flow.py b/homeassistant/components/hunterdouglas_powerview/config_flow.py
index debb9710dbd..c9e563ff04e 100644
--- a/homeassistant/components/hunterdouglas_powerview/config_flow.py
+++ b/homeassistant/components/hunterdouglas_powerview/config_flow.py
@@ -5,6 +5,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Any, Self
 
+from aiopvapi.helpers.aiorequest import AioRequest
+from aiopvapi.hub import Hub
 import voluptuous as vol
 
 from homeassistant.components import dhcp, zeroconf
@@ -12,9 +14,10 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_VERSION, CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
+from . import async_get_device_info
 from .const import DOMAIN, HUB_EXCEPTIONS
-from .util import async_connect_hub
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,9 +31,18 @@ async def validate_input(hass: HomeAssistant, hub_address: str) -> dict[str, str
 
     Data has the keys from DATA_SCHEMA with values provided by the user.
     """
-    api = await async_connect_hub(hass, hub_address)
-    hub = api.hub
-    device_info = api.device_info
+
+    websession = async_get_clientsession(hass)
+
+    pv_request = AioRequest(hub_address, loop=hass.loop, websession=websession)
+
+    try:
+        hub = Hub(pv_request)
+        await hub.query_firmware()
+        device_info = await async_get_device_info(hub)
+    except HUB_EXCEPTIONS as err:
+        raise CannotConnect from err
+
     if hub.role != "Primary":
         raise UnsupportedDevice(
             f"{hub.name} ({hub.hub_address}) is the {hub.role} Hub. "
@@ -51,7 +63,6 @@ class PowerviewConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Hunter Douglas PowerView."""
 
     VERSION = 1
-    MINOR_VERSION = 2
 
     def __init__(self) -> None:
         """Initialize the powerview config flow."""
@@ -99,7 +110,7 @@ class PowerviewConfigFlow(ConfigFlow, domain=DOMAIN):
 
         try:
             info = await validate_input(self.hass, host)
-        except HUB_EXCEPTIONS:
+        except CannotConnect:
             return None, "cannot_connect"
         except UnsupportedDevice:
             return None, "unsupported_device"
@@ -188,5 +199,9 @@ class PowerviewConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
+class CannotConnect(HomeAssistantError):
+    """Error to indicate we cannot connect."""
+
+
 class UnsupportedDevice(HomeAssistantError):
     """Error to indicate the device is not supported."""
diff --git a/homeassistant/components/hunterdouglas_powerview/cover.py b/homeassistant/components/hunterdouglas_powerview/cover.py
index 197fb4e6223..6ee5fc92a41 100644
--- a/homeassistant/components/hunterdouglas_powerview/cover.py
+++ b/homeassistant/components/hunterdouglas_powerview/cover.py
@@ -595,7 +595,7 @@ class PowerViewShadeTDBUBottom(PowerViewShadeDualRailBase):
     ) -> None:
         """Initialize the shade."""
         super().__init__(coordinator, device_info, room_name, shade, name)
-        self._attr_unique_id = f"{self._attr_unique_id}_bottom"
+        self._attr_unique_id = f"{self._shade.id}_bottom"
 
     @callback
     def _clamp_cover_limit(self, target_hass_position: int) -> int:
@@ -632,7 +632,7 @@ class PowerViewShadeTDBUTop(PowerViewShadeDualRailBase):
     ) -> None:
         """Initialize the shade."""
         super().__init__(coordinator, device_info, room_name, shade, name)
-        self._attr_unique_id = f"{self._attr_unique_id}_top"
+        self._attr_unique_id = f"{self._shade.id}_top"
 
     @property
     def should_poll(self) -> bool:
@@ -740,7 +740,7 @@ class PowerViewShadeDualOverlappedCombined(PowerViewShadeDualOverlappedBase):
     ) -> None:
         """Initialize the shade."""
         super().__init__(coordinator, device_info, room_name, shade, name)
-        self._attr_unique_id = f"{self._attr_unique_id}_combined"
+        self._attr_unique_id = f"{self._shade.id}_combined"
 
     @property
     def is_closed(self) -> bool:
@@ -806,7 +806,7 @@ class PowerViewShadeDualOverlappedFront(PowerViewShadeDualOverlappedBase):
     ) -> None:
         """Initialize the shade."""
         super().__init__(coordinator, device_info, room_name, shade, name)
-        self._attr_unique_id = f"{self._attr_unique_id}_front"
+        self._attr_unique_id = f"{self._shade.id}_front"
 
     @property
     def should_poll(self) -> bool:
@@ -862,7 +862,7 @@ class PowerViewShadeDualOverlappedRear(PowerViewShadeDualOverlappedBase):
     ) -> None:
         """Initialize the shade."""
         super().__init__(coordinator, device_info, room_name, shade, name)
-        self._attr_unique_id = f"{self._attr_unique_id}_rear"
+        self._attr_unique_id = f"{self._shade.id}_rear"
 
     @property
     def should_poll(self) -> bool:
diff --git a/homeassistant/components/hunterdouglas_powerview/entity.py b/homeassistant/components/hunterdouglas_powerview/entity.py
index ba572ecefce..424d314c4b9 100644
--- a/homeassistant/components/hunterdouglas_powerview/entity.py
+++ b/homeassistant/components/hunterdouglas_powerview/entity.py
@@ -26,12 +26,12 @@ class HDEntity(CoordinatorEntity[PowerviewShadeUpdateCoordinator]):
         coordinator: PowerviewShadeUpdateCoordinator,
         device_info: PowerviewDeviceInfo,
         room_name: str,
-        powerview_id: str,
+        unique_id: str,
     ) -> None:
         """Initialize the entity."""
         super().__init__(coordinator)
         self._room_name = room_name
-        self._attr_unique_id = f"{device_info.serial_number}_{powerview_id}"
+        self._attr_unique_id = unique_id
         self._device_info = device_info
         self._configuration_url = self.coordinator.hub.url
 
diff --git a/homeassistant/components/hunterdouglas_powerview/model.py b/homeassistant/components/hunterdouglas_powerview/model.py
index 407de86368f..86296b949f4 100644
--- a/homeassistant/components/hunterdouglas_powerview/model.py
+++ b/homeassistant/components/hunterdouglas_powerview/model.py
@@ -3,23 +3,20 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
 
 from aiopvapi.helpers.aiorequest import AioRequest
-from aiopvapi.hub import Hub
 from aiopvapi.resources.room import Room
 from aiopvapi.resources.scene import Scene
 from aiopvapi.resources.shade import BaseShade
 
 from homeassistant.config_entries import ConfigEntry
 
-if TYPE_CHECKING:
-    from .coordinator import PowerviewShadeUpdateCoordinator
+from .coordinator import PowerviewShadeUpdateCoordinator
 
 type PowerviewConfigEntry = ConfigEntry[PowerviewEntryData]
 
 
-@dataclass(slots=True)
+@dataclass
 class PowerviewEntryData:
     """Define class for main domain information."""
 
@@ -31,7 +28,7 @@ class PowerviewEntryData:
     device_info: PowerviewDeviceInfo
 
 
-@dataclass(slots=True)
+@dataclass
 class PowerviewDeviceInfo:
     """Define class for device information."""
 
@@ -41,12 +38,3 @@ class PowerviewDeviceInfo:
     firmware: str | None
     model: str
     hub_address: str
-
-
-@dataclass(slots=True)
-class PowerviewAPI:
-    """Define class to hold the Powerview Hub API data."""
-
-    hub: Hub
-    pv_request: AioRequest
-    device_info: PowerviewDeviceInfo
diff --git a/homeassistant/components/hunterdouglas_powerview/number.py b/homeassistant/components/hunterdouglas_powerview/number.py
index fb8c9f76d79..f893b04b2d1 100644
--- a/homeassistant/components/hunterdouglas_powerview/number.py
+++ b/homeassistant/components/hunterdouglas_powerview/number.py
@@ -95,7 +95,7 @@ class PowerViewNumber(ShadeEntity, RestoreNumber):
         self.entity_description = description
         self._attr_unique_id = f"{self._attr_unique_id}_{description.key}"
 
-    async def async_set_native_value(self, value: float) -> None:
+    def set_native_value(self, value: float) -> None:
         """Update the current value."""
         self._attr_native_value = value
         self.entity_description.store_value_fn(self.coordinator, self._shade.id, value)
diff --git a/homeassistant/components/hunterdouglas_powerview/util.py b/homeassistant/components/hunterdouglas_powerview/util.py
index 360bd7f722b..1d670f46429 100644
--- a/homeassistant/components/hunterdouglas_powerview/util.py
+++ b/homeassistant/components/hunterdouglas_powerview/util.py
@@ -5,38 +5,12 @@ from __future__ import annotations
 from collections.abc import Iterable
 from typing import Any
 
-from aiopvapi.helpers.aiorequest import AioRequest
 from aiopvapi.helpers.constants import ATTR_ID
-from aiopvapi.hub import Hub
 
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .model import PowerviewAPI, PowerviewDeviceInfo
+from homeassistant.core import callback
 
 
 @callback
 def async_map_data_by_id(data: Iterable[dict[str | int, Any]]):
     """Return a dict with the key being the id for a list of entries."""
     return {entry[ATTR_ID]: entry for entry in data}
-
-
-async def async_connect_hub(
-    hass: HomeAssistant, address: str, api_version: int | None = None
-) -> PowerviewAPI:
-    """Create the hub and fetch the device info address."""
-    websession = async_get_clientsession(hass)
-    pv_request = AioRequest(
-        address, loop=hass.loop, websession=websession, api_version=api_version
-    )
-    hub = Hub(pv_request)
-    await hub.query_firmware()
-    info = PowerviewDeviceInfo(
-        name=hub.name,
-        mac_address=hub.mac_address,
-        serial_number=hub.serial_number,
-        firmware=hub.firmware,
-        model=hub.model,
-        hub_address=hub.ip,
-    )
-    return PowerviewAPI(hub, pv_request, info)
diff --git a/homeassistant/components/husqvarna_automower/__init__.py b/homeassistant/components/husqvarna_automower/__init__.py
index 822f81f5f75..c7d69866313 100644
--- a/homeassistant/components/husqvarna_automower/__init__.py
+++ b/homeassistant/components/husqvarna_automower/__init__.py
@@ -13,9 +13,7 @@ from homeassistant.helpers import (
     aiohttp_client,
     config_entry_oauth2_flow,
     device_registry as dr,
-    entity_registry as er,
 )
-from homeassistant.util import dt as dt_util
 
 from . import api
 from .const import DOMAIN
@@ -50,11 +48,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AutomowerConfigEntry) ->
         aiohttp_client.async_get_clientsession(hass),
         session,
     )
-    time_zone_str = str(dt_util.DEFAULT_TIME_ZONE)
-    automower_api = AutomowerSession(
-        api_api,
-        await dt_util.async_get_time_zone(time_zone_str),
-    )
+    automower_api = AutomowerSession(api_api)
     try:
         await api_api.async_get_access_token()
     except ClientResponseError as err:
@@ -100,20 +94,3 @@ def cleanup_removed_devices(
             device_reg.async_update_device(
                 device.id, remove_config_entry_id=config_entry.entry_id
             )
-
-
-def remove_work_area_entities(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    removed_work_areas: set[int],
-    mower_id: str,
-) -> None:
-    """Remove all unused work area entities for the specified mower."""
-    entity_reg = er.async_get(hass)
-    for entity_entry in er.async_entries_for_config_entry(
-        entity_reg, config_entry.entry_id
-    ):
-        for work_area_id in removed_work_areas:
-            if entity_entry.unique_id.startswith(f"{mower_id}_{work_area_id}_"):
-                _LOGGER.info("Deleting: %s", entity_entry.entity_id)
-                entity_reg.async_remove(entity_entry.entity_id)
diff --git a/homeassistant/components/husqvarna_automower/button.py b/homeassistant/components/husqvarna_automower/button.py
index 22a732ec54c..bbc6316c541 100644
--- a/homeassistant/components/husqvarna_automower/button.py
+++ b/homeassistant/components/husqvarna_automower/button.py
@@ -11,6 +11,7 @@ from aioautomower.session import AutomowerSession
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
@@ -23,6 +24,19 @@ from .entity import (
 _LOGGER = logging.getLogger(__name__)
 
 
+async def _async_set_time(
+    session: AutomowerSession,
+    mower_id: str,
+) -> None:
+    """Set datetime for the mower."""
+    # dt_util returns the current (aware) local datetime, set in the frontend.
+    # We assume it's the timezone in which the mower is.
+    await session.commands.set_datetime(
+        mower_id,
+        dt_util.now(),
+    )
+
+
 @dataclass(frozen=True, kw_only=True)
 class AutomowerButtonEntityDescription(ButtonEntityDescription):
     """Describes Automower button entities."""
@@ -44,7 +58,7 @@ MOWER_BUTTON_TYPES: tuple[AutomowerButtonEntityDescription, ...] = (
         key="sync_clock",
         translation_key="sync_clock",
         available_fn=_check_error_free,
-        press_fn=lambda session, mower_id: session.commands.set_datetime(mower_id),
+        press_fn=_async_set_time,
     ),
 )
 
diff --git a/homeassistant/components/husqvarna_automower/calendar.py b/homeassistant/components/husqvarna_automower/calendar.py
index d4162af0c5c..87fac58beb2 100644
--- a/homeassistant/components/husqvarna_automower/calendar.py
+++ b/homeassistant/components/husqvarna_automower/calendar.py
@@ -60,8 +60,8 @@ class AutomowerCalendarEntity(AutomowerBaseEntity, CalendarEntity):
             ]
         return CalendarEvent(
             summary=make_name_string(work_area_name, program_event.schedule_no),
-            start=program_event.start,
-            end=program_event.end,
+            start=program_event.start.replace(tzinfo=dt_util.DEFAULT_TIME_ZONE),
+            end=program_event.end.replace(tzinfo=dt_util.DEFAULT_TIME_ZONE),
             rrule=program_event.rrule_str,
         )
 
diff --git a/homeassistant/components/husqvarna_automower/coordinator.py b/homeassistant/components/husqvarna_automower/coordinator.py
index c19f37a040d..458ff50dac9 100644
--- a/homeassistant/components/husqvarna_automower/coordinator.py
+++ b/homeassistant/components/husqvarna_automower/coordinator.py
@@ -8,7 +8,6 @@ from aioautomower.exceptions import (
     ApiException,
     AuthException,
     HusqvarnaWSServerHandshakeError,
-    TimeoutException,
 )
 from aioautomower.model import MowerAttributes
 from aioautomower.session import AutomowerSession
@@ -23,7 +22,6 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 MAX_WS_RECONNECT_TIME = 600
 SCAN_INTERVAL = timedelta(minutes=8)
-DEFAULT_RECONNECT_TIME = 2  # Define a default reconnect time
 
 
 class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttributes]]):
@@ -42,8 +40,8 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
             update_interval=SCAN_INTERVAL,
         )
         self.api = api
+
         self.ws_connected: bool = False
-        self.reconnect_time = DEFAULT_RECONNECT_TIME
 
     async def _async_update_data(self) -> dict[str, MowerAttributes]:
         """Subscribe for websocket and poll data from the API."""
@@ -68,28 +66,24 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
         hass: HomeAssistant,
         entry: ConfigEntry,
         automower_client: AutomowerSession,
+        reconnect_time: int = 2,
     ) -> None:
         """Listen with the client."""
         try:
             await automower_client.auth.websocket_connect()
-            # Reset reconnect time after successful connection
-            self.reconnect_time = DEFAULT_RECONNECT_TIME
+            reconnect_time = 2
             await automower_client.start_listening()
         except HusqvarnaWSServerHandshakeError as err:
             _LOGGER.debug(
-                "Failed to connect to websocket. Trying to reconnect: %s",
-                err,
-            )
-        except TimeoutException as err:
-            _LOGGER.debug(
-                "Failed to listen to websocket. Trying to reconnect: %s",
-                err,
+                "Failed to connect to websocket. Trying to reconnect: %s", err
             )
+
         if not hass.is_stopping:
-            await asyncio.sleep(self.reconnect_time)
-            self.reconnect_time = min(self.reconnect_time * 2, MAX_WS_RECONNECT_TIME)
-            entry.async_create_background_task(
-                hass,
-                self.client_listen(hass, entry, automower_client),
-                "reconnect_task",
+            await asyncio.sleep(reconnect_time)
+            reconnect_time = min(reconnect_time * 2, MAX_WS_RECONNECT_TIME)
+            await self.client_listen(
+                hass=hass,
+                entry=entry,
+                automower_client=automower_client,
+                reconnect_time=reconnect_time,
             )
diff --git a/homeassistant/components/husqvarna_automower/entity.py b/homeassistant/components/husqvarna_automower/entity.py
index da6c0ae59ce..1bf9c004966 100644
--- a/homeassistant/components/husqvarna_automower/entity.py
+++ b/homeassistant/components/husqvarna_automower/entity.py
@@ -9,12 +9,13 @@ from typing import TYPE_CHECKING, Any
 from aioautomower.exceptions import ApiException
 from aioautomower.model import MowerActivities, MowerAttributes, MowerStates, WorkArea
 
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AutomowerDataUpdateCoordinator
+from . import AutomowerConfigEntry, AutomowerDataUpdateCoordinator
 from .const import DOMAIN, EXECUTION_TIME_DELAY
 
 _LOGGER = logging.getLogger(__name__)
@@ -52,6 +53,30 @@ def _work_area_translation_key(work_area_id: int, key: str) -> str:
     return f"work_area_{key}"
 
 
+@callback
+def async_remove_work_area_entities(
+    hass: HomeAssistant,
+    coordinator: AutomowerDataUpdateCoordinator,
+    entry: AutomowerConfigEntry,
+    mower_id: str,
+) -> None:
+    """Remove deleted work areas from Home Assistant."""
+    entity_reg = er.async_get(hass)
+    active_work_areas = set()
+    _work_areas = coordinator.data[mower_id].work_areas
+    if _work_areas is not None:
+        for work_area_id in _work_areas:
+            uid = f"{mower_id}_{work_area_id}_cutting_height_work_area"
+            active_work_areas.add(uid)
+    for entity_entry in er.async_entries_for_config_entry(entity_reg, entry.entry_id):
+        if (
+            (split := entity_entry.unique_id.split("_"))[0] == mower_id
+            and split[-1] == "area"
+            and entity_entry.unique_id not in active_work_areas
+        ):
+            entity_reg.async_remove(entity_entry.entity_id)
+
+
 def handle_sending_exception(
     poll_after_sending: bool = False,
 ) -> Callable[
diff --git a/homeassistant/components/husqvarna_automower/manifest.json b/homeassistant/components/husqvarna_automower/manifest.json
index d22d23583ba..17d32c270d9 100644
--- a/homeassistant/components/husqvarna_automower/manifest.json
+++ b/homeassistant/components/husqvarna_automower/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/husqvarna_automower",
   "iot_class": "cloud_push",
   "loggers": ["aioautomower"],
-  "requirements": ["aioautomower==2024.10.3"]
+  "requirements": ["aioautomower==2024.10.0"]
 }
diff --git a/homeassistant/components/husqvarna_automower/number.py b/homeassistant/components/husqvarna_automower/number.py
index d6d794f2d83..2a67400d1bf 100644
--- a/homeassistant/components/husqvarna_automower/number.py
+++ b/homeassistant/components/husqvarna_automower/number.py
@@ -13,12 +13,13 @@ from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AutomowerConfigEntry, remove_work_area_entities
+from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
 from .entity import (
     AutomowerControlEntity,
     WorkAreaControlEntity,
     _work_area_translation_key,
+    async_remove_work_area_entities,
     handle_sending_exception,
 )
 
@@ -109,44 +110,26 @@ async def async_setup_entry(
 ) -> None:
     """Set up number platform."""
     coordinator = entry.runtime_data
-    current_work_areas: dict[str, set[int]] = {}
+    entities: list[NumberEntity] = []
 
-    async_add_entities(
-        AutomowerNumberEntity(mower_id, coordinator, description)
-        for mower_id in coordinator.data
-        for description in MOWER_NUMBER_TYPES
-        if description.exists_fn(coordinator.data[mower_id])
-    )
-
-    def _async_work_area_listener() -> None:
-        """Listen for new work areas and add/remove entities as needed."""
-        for mower_id in coordinator.data:
-            if (
-                coordinator.data[mower_id].capabilities.work_areas
-                and (_work_areas := coordinator.data[mower_id].work_areas) is not None
-            ):
-                received_work_areas = set(_work_areas.keys())
-                current_work_area_set = current_work_areas.setdefault(mower_id, set())
-
-                new_work_areas = received_work_areas - current_work_area_set
-                removed_work_areas = current_work_area_set - received_work_areas
-
-                if new_work_areas:
-                    current_work_area_set.update(new_work_areas)
-                    async_add_entities(
-                        WorkAreaNumberEntity(
-                            mower_id, coordinator, description, work_area_id
-                        )
-                        for description in WORK_AREA_NUMBER_TYPES
-                        for work_area_id in new_work_areas
+    for mower_id in coordinator.data:
+        if coordinator.data[mower_id].capabilities.work_areas:
+            _work_areas = coordinator.data[mower_id].work_areas
+            if _work_areas is not None:
+                entities.extend(
+                    WorkAreaNumberEntity(
+                        mower_id, coordinator, description, work_area_id
                     )
-
-                if removed_work_areas:
-                    remove_work_area_entities(hass, entry, removed_work_areas, mower_id)
-                    current_work_area_set.difference_update(removed_work_areas)
-
-    coordinator.async_add_listener(_async_work_area_listener)
-    _async_work_area_listener()
+                    for description in WORK_AREA_NUMBER_TYPES
+                    for work_area_id in _work_areas
+                )
+            async_remove_work_area_entities(hass, coordinator, entry, mower_id)
+        entities.extend(
+            AutomowerNumberEntity(mower_id, coordinator, description)
+            for description in MOWER_NUMBER_TYPES
+            if description.exists_fn(coordinator.data[mower_id])
+        )
+    async_add_entities(entities)
 
 
 class AutomowerNumberEntity(AutomowerControlEntity, NumberEntity):
diff --git a/homeassistant/components/husqvarna_automower/sensor.py b/homeassistant/components/husqvarna_automower/sensor.py
index ebb68033918..b9a6fb16486 100644
--- a/homeassistant/components/husqvarna_automower/sensor.py
+++ b/homeassistant/components/husqvarna_automower/sensor.py
@@ -4,8 +4,8 @@ from collections.abc import Callable, Mapping
 from dataclasses import dataclass
 from datetime import datetime
 import logging
-from operator import attrgetter
 from typing import TYPE_CHECKING, Any
+from zoneinfo import ZoneInfo
 
 from aioautomower.model import (
     MowerAttributes,
@@ -14,6 +14,7 @@ from aioautomower.model import (
     RestrictedReasons,
     WorkArea,
 )
+from aioautomower.utils import naive_to_aware
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -25,6 +26,7 @@ from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfLength, UnitOf
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
+from homeassistant.util import dt as dt_util
 
 from . import AutomowerConfigEntry
 from .coordinator import AutomowerDataUpdateCoordinator
@@ -194,16 +196,16 @@ ERROR_STATES = {
 }
 
 RESTRICTED_REASONS: list = [
-    RestrictedReasons.ALL_WORK_AREAS_COMPLETED,
-    RestrictedReasons.DAILY_LIMIT,
-    RestrictedReasons.EXTERNAL,
-    RestrictedReasons.FOTA,
-    RestrictedReasons.FROST,
-    RestrictedReasons.NONE,
-    RestrictedReasons.NOT_APPLICABLE,
-    RestrictedReasons.PARK_OVERRIDE,
-    RestrictedReasons.SENSOR,
-    RestrictedReasons.WEEK_SCHEDULE,
+    RestrictedReasons.ALL_WORK_AREAS_COMPLETED.lower(),
+    RestrictedReasons.DAILY_LIMIT.lower(),
+    RestrictedReasons.EXTERNAL.lower(),
+    RestrictedReasons.FOTA.lower(),
+    RestrictedReasons.FROST.lower(),
+    RestrictedReasons.NONE.lower(),
+    RestrictedReasons.NOT_APPLICABLE.lower(),
+    RestrictedReasons.PARK_OVERRIDE.lower(),
+    RestrictedReasons.SENSOR.lower(),
+    RestrictedReasons.WEEK_SCHEDULE.lower(),
 ]
 
 STATE_NO_WORK_AREA_ACTIVE = "no_work_area_active"
@@ -270,15 +272,15 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=attrgetter("battery.battery_percent"),
+        value_fn=lambda data: data.battery.battery_percent,
     ),
     AutomowerSensorEntityDescription(
         key="mode",
         translation_key="mode",
         device_class=SensorDeviceClass.ENUM,
-        option_fn=lambda data: list(MowerModes),
+        option_fn=lambda data: [option.lower() for option in list(MowerModes)],
         value_fn=(
-            lambda data: data.mower.mode
+            lambda data: data.mower.mode.lower()
             if data.mower.mode != MowerModes.UNKNOWN
             else None
         ),
@@ -291,7 +293,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTime.SECONDS,
         suggested_unit_of_measurement=UnitOfTime.HOURS,
         exists_fn=lambda data: data.statistics.cutting_blade_usage_time is not None,
-        value_fn=attrgetter("statistics.cutting_blade_usage_time"),
+        value_fn=lambda data: data.statistics.cutting_blade_usage_time,
     ),
     AutomowerSensorEntityDescription(
         key="total_charging_time",
@@ -302,7 +304,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTime.SECONDS,
         suggested_unit_of_measurement=UnitOfTime.HOURS,
         exists_fn=lambda data: data.statistics.total_charging_time is not None,
-        value_fn=attrgetter("statistics.total_charging_time"),
+        value_fn=lambda data: data.statistics.total_charging_time,
     ),
     AutomowerSensorEntityDescription(
         key="total_cutting_time",
@@ -313,7 +315,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTime.SECONDS,
         suggested_unit_of_measurement=UnitOfTime.HOURS,
         exists_fn=lambda data: data.statistics.total_cutting_time is not None,
-        value_fn=attrgetter("statistics.total_cutting_time"),
+        value_fn=lambda data: data.statistics.total_cutting_time,
     ),
     AutomowerSensorEntityDescription(
         key="total_running_time",
@@ -324,7 +326,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTime.SECONDS,
         suggested_unit_of_measurement=UnitOfTime.HOURS,
         exists_fn=lambda data: data.statistics.total_running_time is not None,
-        value_fn=attrgetter("statistics.total_running_time"),
+        value_fn=lambda data: data.statistics.total_running_time,
     ),
     AutomowerSensorEntityDescription(
         key="total_searching_time",
@@ -335,7 +337,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTime.SECONDS,
         suggested_unit_of_measurement=UnitOfTime.HOURS,
         exists_fn=lambda data: data.statistics.total_searching_time is not None,
-        value_fn=attrgetter("statistics.total_searching_time"),
+        value_fn=lambda data: data.statistics.total_searching_time,
     ),
     AutomowerSensorEntityDescription(
         key="number_of_charging_cycles",
@@ -343,7 +345,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL,
         exists_fn=lambda data: data.statistics.number_of_charging_cycles is not None,
-        value_fn=attrgetter("statistics.number_of_charging_cycles"),
+        value_fn=lambda data: data.statistics.number_of_charging_cycles,
     ),
     AutomowerSensorEntityDescription(
         key="number_of_collisions",
@@ -351,7 +353,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL,
         exists_fn=lambda data: data.statistics.number_of_collisions is not None,
-        value_fn=attrgetter("statistics.number_of_collisions"),
+        value_fn=lambda data: data.statistics.number_of_collisions,
     ),
     AutomowerSensorEntityDescription(
         key="total_drive_distance",
@@ -362,13 +364,16 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfLength.METERS,
         suggested_unit_of_measurement=UnitOfLength.KILOMETERS,
         exists_fn=lambda data: data.statistics.total_drive_distance is not None,
-        value_fn=attrgetter("statistics.total_drive_distance"),
+        value_fn=lambda data: data.statistics.total_drive_distance,
     ),
     AutomowerSensorEntityDescription(
         key="next_start_timestamp",
         translation_key="next_start_timestamp",
         device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=attrgetter("planner.next_start_datetime"),
+        value_fn=lambda data: naive_to_aware(
+            data.planner.next_start_datetime_naive,
+            ZoneInfo(str(dt_util.DEFAULT_TIME_ZONE)),
+        ),
     ),
     AutomowerSensorEntityDescription(
         key="error",
@@ -382,7 +387,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         translation_key="restricted_reason",
         device_class=SensorDeviceClass.ENUM,
         option_fn=lambda data: RESTRICTED_REASONS,
-        value_fn=attrgetter("planner.restricted_reason"),
+        value_fn=lambda data: data.planner.restricted_reason.lower(),
     ),
     AutomowerSensorEntityDescription(
         key="work_area",
@@ -412,14 +417,17 @@ WORK_AREA_SENSOR_TYPES: tuple[WorkAreaSensorEntityDescription, ...] = (
         exists_fn=lambda data: data.progress is not None,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=attrgetter("progress"),
+        value_fn=lambda data: data.progress,
     ),
     WorkAreaSensorEntityDescription(
         key="last_time_completed",
         translation_key_fn=_work_area_translation_key,
-        exists_fn=lambda data: data.last_time_completed is not None,
+        exists_fn=lambda data: data.last_time_completed_naive is not None,
         device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=attrgetter("last_time_completed"),
+        value_fn=lambda data: naive_to_aware(
+            data.last_time_completed_naive,
+            ZoneInfo(str(dt_util.DEFAULT_TIME_ZONE)),
+        ),
     ),
 )
 
@@ -431,44 +439,25 @@ async def async_setup_entry(
 ) -> None:
     """Set up sensor platform."""
     coordinator = entry.runtime_data
-    current_work_areas: dict[str, set[int]] = {}
-
-    async_add_entities(
-        AutomowerSensorEntity(mower_id, coordinator, description)
-        for mower_id, data in coordinator.data.items()
-        for description in MOWER_SENSOR_TYPES
-        if description.exists_fn(data)
-    )
-
-    def _async_work_area_listener() -> None:
-        """Listen for new work areas and add sensor entities if they did not exist.
-
-        Listening for deletable work areas is managed in the number platform.
-        """
-        for mower_id in coordinator.data:
-            if (
-                coordinator.data[mower_id].capabilities.work_areas
-                and (_work_areas := coordinator.data[mower_id].work_areas) is not None
-            ):
-                received_work_areas = set(_work_areas.keys())
-                new_work_areas = received_work_areas - current_work_areas.get(
-                    mower_id, set()
+    entities: list[SensorEntity] = []
+    for mower_id in coordinator.data:
+        if coordinator.data[mower_id].capabilities.work_areas:
+            _work_areas = coordinator.data[mower_id].work_areas
+            if _work_areas is not None:
+                entities.extend(
+                    WorkAreaSensorEntity(
+                        mower_id, coordinator, description, work_area_id
+                    )
+                    for description in WORK_AREA_SENSOR_TYPES
+                    for work_area_id in _work_areas
+                    if description.exists_fn(_work_areas[work_area_id])
                 )
-                if new_work_areas:
-                    current_work_areas.setdefault(mower_id, set()).update(
-                        new_work_areas
-                    )
-                    async_add_entities(
-                        WorkAreaSensorEntity(
-                            mower_id, coordinator, description, work_area_id
-                        )
-                        for description in WORK_AREA_SENSOR_TYPES
-                        for work_area_id in new_work_areas
-                        if description.exists_fn(_work_areas[work_area_id])
-                    )
-
-    coordinator.async_add_listener(_async_work_area_listener)
-    _async_work_area_listener()
+        entities.extend(
+            AutomowerSensorEntity(mower_id, coordinator, description)
+            for description in MOWER_SENSOR_TYPES
+            if description.exists_fn(coordinator.data[mower_id])
+        )
+    async_add_entities(entities)
 
 
 class AutomowerSensorEntity(AutomowerBaseEntity, SensorEntity):
diff --git a/homeassistant/components/husqvarna_automower/switch.py b/homeassistant/components/husqvarna_automower/switch.py
index 2bbe5c87624..c26348d875a 100644
--- a/homeassistant/components/husqvarna_automower/switch.py
+++ b/homeassistant/components/husqvarna_automower/switch.py
@@ -6,7 +6,8 @@ from typing import TYPE_CHECKING, Any
 from aioautomower.model import MowerModes, StayOutZones, Zone
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.core import HomeAssistant
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -29,82 +30,28 @@ async def async_setup_entry(
 ) -> None:
     """Set up switch platform."""
     coordinator = entry.runtime_data
-    current_work_areas: dict[str, set[int]] = {}
-    current_stay_out_zones: dict[str, set[str]] = {}
-
-    async_add_entities(
+    entities: list[SwitchEntity] = []
+    entities.extend(
         AutomowerScheduleSwitchEntity(mower_id, coordinator)
         for mower_id in coordinator.data
     )
-
-    def _async_work_area_listener() -> None:
-        """Listen for new work areas and add switch entities if they did not exist.
-
-        Listening for deletable work areas is managed in the number platform.
-        """
-        for mower_id in coordinator.data:
-            if (
-                coordinator.data[mower_id].capabilities.work_areas
-                and (_work_areas := coordinator.data[mower_id].work_areas) is not None
-            ):
-                received_work_areas = set(_work_areas.keys())
-                new_work_areas = received_work_areas - current_work_areas.get(
-                    mower_id, set()
+    for mower_id in coordinator.data:
+        if coordinator.data[mower_id].capabilities.stay_out_zones:
+            _stay_out_zones = coordinator.data[mower_id].stay_out_zones
+            if _stay_out_zones is not None:
+                entities.extend(
+                    StayOutZoneSwitchEntity(coordinator, mower_id, stay_out_zone_uid)
+                    for stay_out_zone_uid in _stay_out_zones.zones
                 )
-                if new_work_areas:
-                    current_work_areas.setdefault(mower_id, set()).update(
-                        new_work_areas
-                    )
-                    async_add_entities(
-                        WorkAreaSwitchEntity(coordinator, mower_id, work_area_id)
-                        for work_area_id in new_work_areas
-                    )
-
-    def _remove_stay_out_zone_entities(
-        removed_stay_out_zones: set, mower_id: str
-    ) -> None:
-        """Remove all unused stay-out zones for all platforms."""
-        entity_reg = er.async_get(hass)
-        for entity_entry in er.async_entries_for_config_entry(
-            entity_reg, entry.entry_id
-        ):
-            for stay_out_zone_uid in removed_stay_out_zones:
-                if entity_entry.unique_id.startswith(f"{mower_id}_{stay_out_zone_uid}"):
-                    entity_reg.async_remove(entity_entry.entity_id)
-
-    def _async_stay_out_zone_listener() -> None:
-        """Listen for new stay-out zones and add/remove switch entities if they did not exist."""
-        for mower_id in coordinator.data:
-            if (
-                coordinator.data[mower_id].capabilities.stay_out_zones
-                and (_stay_out_zones := coordinator.data[mower_id].stay_out_zones)
-                is not None
-            ):
-                received_stay_out_zones = set(_stay_out_zones.zones)
-                current_stay_out_zones_set = current_stay_out_zones.get(mower_id, set())
-                new_stay_out_zones = (
-                    received_stay_out_zones - current_stay_out_zones_set
+            async_remove_entities(hass, coordinator, entry, mower_id)
+        if coordinator.data[mower_id].capabilities.work_areas:
+            _work_areas = coordinator.data[mower_id].work_areas
+            if _work_areas is not None:
+                entities.extend(
+                    WorkAreaSwitchEntity(coordinator, mower_id, work_area_id)
+                    for work_area_id in _work_areas
                 )
-                removed_stay_out_zones = (
-                    current_stay_out_zones_set - received_stay_out_zones
-                )
-                if new_stay_out_zones:
-                    current_stay_out_zones.setdefault(mower_id, set()).update(
-                        new_stay_out_zones
-                    )
-                    async_add_entities(
-                        StayOutZoneSwitchEntity(
-                            coordinator, mower_id, stay_out_zone_uid
-                        )
-                        for stay_out_zone_uid in new_stay_out_zones
-                    )
-                if removed_stay_out_zones:
-                    _remove_stay_out_zone_entities(removed_stay_out_zones, mower_id)
-
-    coordinator.async_add_listener(_async_work_area_listener)
-    coordinator.async_add_listener(_async_stay_out_zone_listener)
-    _async_work_area_listener()
-    _async_stay_out_zone_listener()
+    async_add_entities(entities)
 
 
 class AutomowerScheduleSwitchEntity(AutomowerControlEntity, SwitchEntity):
@@ -233,3 +180,28 @@ class WorkAreaSwitchEntity(WorkAreaControlEntity, SwitchEntity):
         await self.coordinator.api.commands.workarea_settings(
             self.mower_id, self.work_area_id, enabled=True
         )
+
+
+@callback
+def async_remove_entities(
+    hass: HomeAssistant,
+    coordinator: AutomowerDataUpdateCoordinator,
+    entry: AutomowerConfigEntry,
+    mower_id: str,
+) -> None:
+    """Remove deleted stay-out-zones from Home Assistant."""
+    entity_reg = er.async_get(hass)
+    active_zones = set()
+    _zones = coordinator.data[mower_id].stay_out_zones
+    if _zones is not None:
+        for zones_uid in _zones.zones:
+            uid = f"{mower_id}_{zones_uid}_stay_out_zones"
+            active_zones.add(uid)
+    for entity_entry in er.async_entries_for_config_entry(entity_reg, entry.entry_id):
+        if (
+            entity_entry.domain == Platform.SWITCH
+            and (split := entity_entry.unique_id.split("_"))[0] == mower_id
+            and split[-1] == "zones"
+            and entity_entry.unique_id not in active_zones
+        ):
+            entity_reg.async_remove(entity_entry.entity_id)
diff --git a/homeassistant/components/husqvarna_automower_ble/__init__.py b/homeassistant/components/husqvarna_automower_ble/__init__.py
deleted file mode 100644
index 2025ba64cf1..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/__init__.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""The Husqvarna Autoconnect Bluetooth integration."""
-
-from __future__ import annotations
-
-from automower_ble.mower import Mower
-from bleak import BleakError
-from bleak_retry_connector import close_stale_connections_by_address, get_device
-
-from homeassistant.components import bluetooth
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ADDRESS, CONF_CLIENT_ID, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-
-from .const import LOGGER
-from .coordinator import HusqvarnaCoordinator
-
-PLATFORMS = [
-    Platform.LAWN_MOWER,
-]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Husqvarna Autoconnect Bluetooth from a config entry."""
-    address = entry.data[CONF_ADDRESS]
-    channel_id = entry.data[CONF_CLIENT_ID]
-
-    mower = Mower(channel_id, address)
-
-    await close_stale_connections_by_address(address)
-
-    LOGGER.debug("connecting to %s with channel ID %s", address, str(channel_id))
-    try:
-        device = bluetooth.async_ble_device_from_address(
-            hass, address, connectable=True
-        ) or await get_device(address)
-        if not await mower.connect(device):
-            raise ConfigEntryNotReady
-    except (TimeoutError, BleakError) as exception:
-        raise ConfigEntryNotReady(
-            f"Unable to connect to device {address} due to {exception}"
-        ) from exception
-    LOGGER.debug("connected and paired")
-
-    model = await mower.get_model()
-    LOGGER.debug("Connected to Automower: %s", model)
-
-    coordinator = HusqvarnaCoordinator(hass, mower, address, channel_id, model)
-
-    await coordinator.async_config_entry_first_refresh()
-    entry.runtime_data = 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):
-        coordinator: HusqvarnaCoordinator = entry.runtime_data
-        await coordinator.async_shutdown()
-
-    return unload_ok
diff --git a/homeassistant/components/husqvarna_automower_ble/config_flow.py b/homeassistant/components/husqvarna_automower_ble/config_flow.py
deleted file mode 100644
index 72835c22334..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/config_flow.py
+++ /dev/null
@@ -1,121 +0,0 @@
-"""Config flow for Husqvarna Bluetooth integration."""
-
-from __future__ import annotations
-
-import random
-from typing import Any
-
-from automower_ble.mower import Mower
-from bleak import BleakError
-import voluptuous as vol
-
-from homeassistant.components import bluetooth
-from homeassistant.components.bluetooth import BluetoothServiceInfo
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ADDRESS, CONF_CLIENT_ID
-
-from .const import DOMAIN, LOGGER
-
-
-def _is_supported(discovery_info: BluetoothServiceInfo):
-    """Check if device is supported."""
-
-    LOGGER.debug(
-        "%s manufacturer data: %s",
-        discovery_info.address,
-        discovery_info.manufacturer_data,
-    )
-
-    manufacturer = any(key == 1062 for key in discovery_info.manufacturer_data)
-    service_husqvarna = any(
-        service == "98bd0001-0b0e-421a-84e5-ddbf75dc6de4"
-        for service in discovery_info.service_uuids
-    )
-    service_generic = any(
-        service == "00001800-0000-1000-8000-00805f9b34fb"
-        for service in discovery_info.service_uuids
-    )
-
-    return manufacturer and service_husqvarna and service_generic
-
-
-class HusqvarnaAutomowerBleConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Husqvarna Bluetooth."""
-
-    VERSION = 1
-
-    def __init__(self) -> None:
-        """Initialize the config flow."""
-        self.address: str | None
-
-    async def async_step_bluetooth(
-        self, discovery_info: BluetoothServiceInfo
-    ) -> ConfigFlowResult:
-        """Handle the bluetooth discovery step."""
-
-        LOGGER.debug("Discovered device: %s", discovery_info)
-        if not _is_supported(discovery_info):
-            return self.async_abort(reason="no_devices_found")
-
-        self.address = discovery_info.address
-        await self.async_set_unique_id(self.address)
-        self._abort_if_unique_id_configured()
-        return await self.async_step_confirm()
-
-    async def async_step_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm discovery."""
-        assert self.address
-
-        device = bluetooth.async_ble_device_from_address(
-            self.hass, self.address, connectable=True
-        )
-        channel_id = random.randint(1, 0xFFFFFFFF)
-
-        try:
-            (manufacturer, device_type, model) = await Mower(
-                channel_id, self.address
-            ).probe_gatts(device)
-        except (BleakError, TimeoutError) as exception:
-            LOGGER.exception("Failed to connect to device: %s", exception)
-            return self.async_abort(reason="cannot_connect")
-
-        title = manufacturer + " " + device_type
-
-        LOGGER.debug("Found device: %s", title)
-
-        if user_input is not None:
-            return self.async_create_entry(
-                title=title,
-                data={CONF_ADDRESS: self.address, CONF_CLIENT_ID: channel_id},
-            )
-
-        self.context["title_placeholders"] = {
-            "name": title,
-        }
-
-        self._set_confirm_only()
-        return self.async_show_form(
-            step_id="confirm",
-            description_placeholders=self.context["title_placeholders"],
-        )
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        if user_input is not None:
-            self.address = user_input[CONF_ADDRESS]
-            await self.async_set_unique_id(self.address, raise_on_progress=False)
-            self._abort_if_unique_id_configured()
-            return await self.async_step_confirm()
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_ADDRESS): str,
-                },
-            ),
-        )
diff --git a/homeassistant/components/husqvarna_automower_ble/const.py b/homeassistant/components/husqvarna_automower_ble/const.py
deleted file mode 100644
index 7117d0c9e29..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/const.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Constants for the Husqvarna Automower Bluetooth integration."""
-
-import logging
-
-DOMAIN = "husqvarna_automower_ble"
-MANUFACTURER = "Husqvarna"
-
-LOGGER = logging.getLogger(__package__)
diff --git a/homeassistant/components/husqvarna_automower_ble/coordinator.py b/homeassistant/components/husqvarna_automower_ble/coordinator.py
deleted file mode 100644
index c577ccd9196..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/coordinator.py
+++ /dev/null
@@ -1,100 +0,0 @@
-"""Provides the DataUpdateCoordinator."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-
-from automower_ble.mower import Mower
-from bleak import BleakError
-from bleak_retry_connector import close_stale_connections_by_address
-
-from homeassistant.components import bluetooth
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN, LOGGER
-
-SCAN_INTERVAL = timedelta(seconds=60)
-
-
-class HusqvarnaCoordinator(DataUpdateCoordinator[dict[str, bytes]]):
-    """Class to manage fetching data."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        mower: Mower,
-        address: str,
-        channel_id: str,
-        model: str,
-    ) -> None:
-        """Initialize global data updater."""
-        super().__init__(
-            hass=hass,
-            logger=LOGGER,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
-        )
-        self.address = address
-        self.channel_id = channel_id
-        self.model = model
-        self.mower = mower
-
-    async def async_shutdown(self) -> None:
-        """Shutdown coordinator and any connection."""
-        LOGGER.debug("Shutdown")
-        await super().async_shutdown()
-        if self.mower.is_connected():
-            await self.mower.disconnect()
-
-    async def _async_find_device(self):
-        LOGGER.debug("Trying to reconnect")
-        await close_stale_connections_by_address(self.address)
-
-        device = bluetooth.async_ble_device_from_address(
-            self.hass, self.address, connectable=True
-        )
-
-        try:
-            if not await self.mower.connect(device):
-                raise UpdateFailed("Failed to connect")
-        except BleakError as err:
-            raise UpdateFailed("Failed to connect") from err
-
-    async def _async_update_data(self) -> dict[str, bytes]:
-        """Poll the device."""
-        LOGGER.debug("Polling device")
-
-        data: dict[str, bytes] = {}
-
-        try:
-            if not self.mower.is_connected():
-                await self._async_find_device()
-        except BleakError as err:
-            raise UpdateFailed("Failed to connect") from err
-
-        try:
-            data["battery_level"] = await self.mower.battery_level()
-            LOGGER.debug("battery_level" + str(data["battery_level"]))
-            if data["battery_level"] is None:
-                await self._async_find_device()
-                raise UpdateFailed("Error getting data from device")
-
-            data["activity"] = await self.mower.mower_activity()
-            LOGGER.debug("activity:" + str(data["activity"]))
-            if data["activity"] is None:
-                await self._async_find_device()
-                raise UpdateFailed("Error getting data from device")
-
-            data["state"] = await self.mower.mower_state()
-            LOGGER.debug("state:" + str(data["state"]))
-            if data["state"] is None:
-                await self._async_find_device()
-                raise UpdateFailed("Error getting data from device")
-
-        except BleakError as err:
-            LOGGER.error("Error getting data from device")
-            await self._async_find_device()
-            raise UpdateFailed("Error getting data from device") from err
-
-        return data
diff --git a/homeassistant/components/husqvarna_automower_ble/entity.py b/homeassistant/components/husqvarna_automower_ble/entity.py
deleted file mode 100644
index d2873d933ff..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/entity.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""Provides the HusqvarnaAutomowerBleEntity."""
-
-from __future__ import annotations
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN, MANUFACTURER
-from .coordinator import HusqvarnaCoordinator
-
-
-class HusqvarnaAutomowerBleEntity(CoordinatorEntity[HusqvarnaCoordinator]):
-    """HusqvarnaCoordinator entity for Husqvarna Automower Bluetooth."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: HusqvarnaCoordinator) -> None:
-        """Initialize coordinator entity."""
-        super().__init__(coordinator)
-
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"{coordinator.address}_{coordinator.channel_id}")},
-            manufacturer=MANUFACTURER,
-            model_id=coordinator.model,
-        )
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return super().available and self.coordinator.mower.is_connected()
diff --git a/homeassistant/components/husqvarna_automower_ble/lawn_mower.py b/homeassistant/components/husqvarna_automower_ble/lawn_mower.py
deleted file mode 100644
index 980efc6f069..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/lawn_mower.py
+++ /dev/null
@@ -1,153 +0,0 @@
-"""The Husqvarna Autoconnect Bluetooth lawn mower platform."""
-
-from __future__ import annotations
-
-from automower_ble.protocol import MowerActivity, MowerState
-
-from homeassistant.components import bluetooth
-from homeassistant.components.lawn_mower import (
-    LawnMowerActivity,
-    LawnMowerEntity,
-    LawnMowerEntityFeature,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import LOGGER
-from .coordinator import HusqvarnaCoordinator
-from .entity import HusqvarnaAutomowerBleEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up AutomowerLawnMower integration from a config entry."""
-    coordinator: HusqvarnaCoordinator = config_entry.runtime_data
-    address = coordinator.address
-
-    async_add_entities(
-        [
-            AutomowerLawnMower(
-                coordinator,
-                address,
-            ),
-        ]
-    )
-
-
-class AutomowerLawnMower(HusqvarnaAutomowerBleEntity, LawnMowerEntity):
-    """Husqvarna Automower."""
-
-    _attr_name = None
-    _attr_supported_features = (
-        LawnMowerEntityFeature.PAUSE
-        | LawnMowerEntityFeature.START_MOWING
-        | LawnMowerEntityFeature.DOCK
-    )
-
-    def __init__(
-        self,
-        coordinator: HusqvarnaCoordinator,
-        address: str,
-    ) -> None:
-        """Initialize the lawn mower."""
-        super().__init__(coordinator)
-        self._attr_unique_id = str(address)
-
-    def _get_activity(self) -> LawnMowerActivity | None:
-        """Return the current lawn mower activity."""
-        if self.coordinator.data is None:
-            return None
-
-        state = self.coordinator.data["state"]
-        activity = self.coordinator.data["activity"]
-
-        if state is None or activity is None:
-            return None
-
-        if state == MowerState.PAUSED:
-            return LawnMowerActivity.PAUSED
-        if state in (MowerState.STOPPED, MowerState.OFF, MowerState.WAIT_FOR_SAFETYPIN):
-            # This is actually stopped, but that isn't an option
-            return LawnMowerActivity.ERROR
-        if state in (
-            MowerState.RESTRICTED,
-            MowerState.IN_OPERATION,
-            MowerState.PENDING_START,
-        ):
-            if activity in (
-                MowerActivity.CHARGING,
-                MowerActivity.PARKED,
-                MowerActivity.NONE,
-            ):
-                return LawnMowerActivity.DOCKED
-            if activity in (MowerActivity.GOING_OUT, MowerActivity.MOWING):
-                return LawnMowerActivity.MOWING
-            if activity == MowerActivity.GOING_HOME:
-                return LawnMowerActivity.RETURNING
-        return LawnMowerActivity.ERROR
-
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        LOGGER.debug("AutomowerLawnMower: _handle_coordinator_update")
-
-        self._attr_activity = self._get_activity()
-        self._attr_available = self._attr_activity is not None
-        super()._handle_coordinator_update()
-
-    async def async_start_mowing(self) -> None:
-        """Start mowing."""
-        LOGGER.debug("Starting mower")
-
-        if not self.coordinator.mower.is_connected():
-            device = bluetooth.async_ble_device_from_address(
-                self.coordinator.hass, self.coordinator.address, connectable=True
-            )
-            if not await self.coordinator.mower.connect(device):
-                return
-
-        await self.coordinator.mower.mower_resume()
-        if self._attr_activity is LawnMowerActivity.DOCKED:
-            await self.coordinator.mower.mower_override()
-        await self.coordinator.async_request_refresh()
-
-        self._attr_activity = self._get_activity()
-        self.async_write_ha_state()
-
-    async def async_dock(self) -> None:
-        """Start docking."""
-        LOGGER.debug("Start docking")
-
-        if not self.coordinator.mower.is_connected():
-            device = bluetooth.async_ble_device_from_address(
-                self.coordinator.hass, self.coordinator.address, connectable=True
-            )
-            if not await self.coordinator.mower.connect(device):
-                return
-
-        await self.coordinator.mower.mower_park()
-        await self.coordinator.async_request_refresh()
-
-        self._attr_activity = self._get_activity()
-        self.async_write_ha_state()
-
-    async def async_pause(self) -> None:
-        """Pause mower."""
-        LOGGER.debug("Pausing mower")
-
-        if not self.coordinator.mower.is_connected():
-            device = bluetooth.async_ble_device_from_address(
-                self.coordinator.hass, self.coordinator.address, connectable=True
-            )
-            if not await self.coordinator.mower.connect(device):
-                return
-
-        await self.coordinator.mower.mower_pause()
-        await self.coordinator.async_request_refresh()
-
-        self._attr_activity = self._get_activity()
-        self.async_write_ha_state()
diff --git a/homeassistant/components/husqvarna_automower_ble/manifest.json b/homeassistant/components/husqvarna_automower_ble/manifest.json
deleted file mode 100644
index 3e72d9707c7..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/manifest.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "domain": "husqvarna_automower_ble",
-  "name": "Husqvarna Automower BLE",
-  "bluetooth": [
-    {
-      "service_uuid": "98bd0001-0b0e-421a-84e5-ddbf75dc6de4",
-      "connectable": true
-    }
-  ],
-  "codeowners": ["@alistair23"],
-  "config_flow": true,
-  "dependencies": ["bluetooth_adapters"],
-  "documentation": "https://www.home-assistant.io/integrations/???",
-  "iot_class": "local_polling",
-  "requirements": ["automower-ble==0.2.0"]
-}
diff --git a/homeassistant/components/husqvarna_automower_ble/strings.json b/homeassistant/components/husqvarna_automower_ble/strings.json
deleted file mode 100644
index de0a140933a..00000000000
--- a/homeassistant/components/husqvarna_automower_ble/strings.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "config": {
-    "flow_title": "{name} ({address})",
-    "step": {
-      "user": {
-        "data": {
-          "address": "Device BLE address"
-        }
-      },
-      "confirm": {
-        "description": "Do you want to set up {name}? Make sure the mower is in pairing mode"
-      }
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_devices_found": "Ensure the mower is in pairing mode and try again. It can take a few attempts.",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    }
-  }
-}
diff --git a/homeassistant/components/huum/manifest.json b/homeassistant/components/huum/manifest.json
index 38562e1a072..7629f529b91 100644
--- a/homeassistant/components/huum/manifest.json
+++ b/homeassistant/components/huum/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/huum",
   "iot_class": "cloud_polling",
-  "requirements": ["huum==0.7.12"]
+  "requirements": ["huum==0.7.10"]
 }
diff --git a/homeassistant/components/hvv_departures/config_flow.py b/homeassistant/components/hvv_departures/config_flow.py
index 536b8f18259..3e1b98d9a38 100644
--- a/homeassistant/components/hvv_departures/config_flow.py
+++ b/homeassistant/components/hvv_departures/config_flow.py
@@ -141,14 +141,16 @@ class HVVDeparturesConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Options flow handler."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize HVV Departures options flow."""
+        self.config_entry = config_entry
+        self.options = dict(config_entry.options)
         self.departure_filters: dict[str, Any] = {}
 
     async def async_step_init(
diff --git a/homeassistant/components/hydrawise/strings.json b/homeassistant/components/hydrawise/strings.json
index 4d50f10bcb2..b6df36ad4ff 100644
--- a/homeassistant/components/hydrawise/strings.json
+++ b/homeassistant/components/hydrawise/strings.json
@@ -13,8 +13,7 @@
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]",
-      "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_service%]",
diff --git a/homeassistant/components/hyperion/config_flow.py b/homeassistant/components/hyperion/config_flow.py
index b2b7dbdf531..161c531328d 100644
--- a/homeassistant/components/hyperion/config_flow.py
+++ b/homeassistant/components/hyperion/config_flow.py
@@ -424,22 +424,24 @@ class HyperionConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> HyperionOptionsFlow:
+    def async_get_options_flow(config_entry: ConfigEntry) -> HyperionOptionsFlow:
         """Get the Hyperion Options flow."""
-        return HyperionOptionsFlow()
+        return HyperionOptionsFlow(config_entry)
 
 
 class HyperionOptionsFlow(OptionsFlow):
     """Hyperion options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize a Hyperion options flow."""
+        self._config_entry = config_entry
+
     def _create_client(self) -> client.HyperionClient:
         """Create and connect a client instance."""
         return create_hyperion_client(
-            self.config_entry.data[CONF_HOST],
-            self.config_entry.data[CONF_PORT],
-            token=self.config_entry.data.get(CONF_TOKEN),
+            self._config_entry.data[CONF_HOST],
+            self._config_entry.data[CONF_PORT],
+            token=self._config_entry.data.get(CONF_TOKEN),
         )
 
     async def async_step_init(
@@ -468,7 +470,8 @@ class HyperionOptionsFlow(OptionsFlow):
             return self.async_create_entry(title="", data=user_input)
 
         default_effect_show_list = list(
-            set(effects) - set(self.config_entry.options.get(CONF_EFFECT_HIDE_LIST, []))
+            set(effects)
+            - set(self._config_entry.options.get(CONF_EFFECT_HIDE_LIST, []))
         )
 
         return self.async_show_form(
@@ -477,7 +480,7 @@ class HyperionOptionsFlow(OptionsFlow):
                 {
                     vol.Optional(
                         CONF_PRIORITY,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_PRIORITY, DEFAULT_PRIORITY
                         ),
                     ): vol.All(vol.Coerce(int), vol.Range(min=0, max=255)),
diff --git a/homeassistant/components/ialarm/alarm_control_panel.py b/homeassistant/components/ialarm/alarm_control_panel.py
index 4ae3787dc1d..912f04a1d1e 100644
--- a/homeassistant/components/ialarm/alarm_control_panel.py
+++ b/homeassistant/components/ialarm/alarm_control_panel.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -51,7 +50,7 @@ class IAlarmPanel(
         self._attr_unique_id = coordinator.mac
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         return self.coordinator.state
 
diff --git a/homeassistant/components/ialarm/const.py b/homeassistant/components/ialarm/const.py
index 1b8074c34f0..d1561cc86d5 100644
--- a/homeassistant/components/ialarm/const.py
+++ b/homeassistant/components/ialarm/const.py
@@ -2,7 +2,12 @@
 
 from pyialarm import IAlarm
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 
 DATA_COORDINATOR = "ialarm"
 
@@ -11,8 +16,8 @@ DEFAULT_PORT = 18034
 DOMAIN = "ialarm"
 
 IALARM_TO_HASS = {
-    IAlarm.ARMED_AWAY: AlarmControlPanelState.ARMED_AWAY,
-    IAlarm.ARMED_STAY: AlarmControlPanelState.ARMED_HOME,
-    IAlarm.DISARMED: AlarmControlPanelState.DISARMED,
-    IAlarm.TRIGGERED: AlarmControlPanelState.TRIGGERED,
+    IAlarm.ARMED_AWAY: STATE_ALARM_ARMED_AWAY,
+    IAlarm.ARMED_STAY: STATE_ALARM_ARMED_HOME,
+    IAlarm.DISARMED: STATE_ALARM_DISARMED,
+    IAlarm.TRIGGERED: STATE_ALARM_TRIGGERED,
 }
diff --git a/homeassistant/components/ialarm/coordinator.py b/homeassistant/components/ialarm/coordinator.py
index ad0f2298a3b..2aec99c98c4 100644
--- a/homeassistant/components/ialarm/coordinator.py
+++ b/homeassistant/components/ialarm/coordinator.py
@@ -7,10 +7,7 @@ import logging
 
 from pyialarm import IAlarm
 
-from homeassistant.components.alarm_control_panel import (
-    SCAN_INTERVAL,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -25,7 +22,7 @@ class IAlarmDataUpdateCoordinator(DataUpdateCoordinator[None]):
     def __init__(self, hass: HomeAssistant, ialarm: IAlarm, mac: str) -> None:
         """Initialize global iAlarm data updater."""
         self.ialarm = ialarm
-        self.state: AlarmControlPanelState | None = None
+        self.state: str | None = None
         self.host: str = ialarm.host
         self.mac = mac
 
diff --git a/homeassistant/components/ibeacon/config_flow.py b/homeassistant/components/ibeacon/config_flow.py
index c00398e39b0..feb5a801d51 100644
--- a/homeassistant/components/ibeacon/config_flow.py
+++ b/homeassistant/components/ibeacon/config_flow.py
@@ -44,12 +44,16 @@ class IBeaconConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return IBeaconOptionsFlow()
+        return IBeaconOptionsFlow(config_entry)
 
 
 class IBeaconOptionsFlow(OptionsFlow):
     """Handle options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(self, user_input: dict | None = None) -> ConfigFlowResult:
         """Manage the options."""
         errors = {}
diff --git a/homeassistant/components/ifttt/alarm_control_panel.py b/homeassistant/components/ifttt/alarm_control_panel.py
index 739352485bd..1af23d716c8 100644
--- a/homeassistant/components/ifttt/alarm_control_panel.py
+++ b/homeassistant/components/ifttt/alarm_control_panel.py
@@ -10,7 +10,6 @@ from homeassistant.components.alarm_control_panel import (
     PLATFORM_SCHEMA as ALARM_CONTROL_PANEL_PLATFORM_SCHEMA,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.const import (
@@ -19,6 +18,10 @@ from homeassistant.const import (
     CONF_CODE,
     CONF_NAME,
     CONF_OPTIMISTIC,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 import homeassistant.helpers.config_validation as cv
@@ -30,10 +33,10 @@ from . import ATTR_EVENT, DOMAIN, SERVICE_PUSH_ALARM_STATE, SERVICE_TRIGGER
 _LOGGER = logging.getLogger(__name__)
 
 ALLOWED_STATES = [
-    AlarmControlPanelState.DISARMED,
-    AlarmControlPanelState.ARMED_NIGHT,
-    AlarmControlPanelState.ARMED_AWAY,
-    AlarmControlPanelState.ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
 ]
 
 DATA_IFTTT_ALARM = "ifttt_alarm"
@@ -165,41 +168,40 @@ class IFTTTAlarmPanel(AlarmControlPanelEntity):
         """Send disarm command."""
         if not self._check_code(code):
             return
-        self.set_alarm_state(self._event_disarm, AlarmControlPanelState.DISARMED)
+        self.set_alarm_state(self._event_disarm, STATE_ALARM_DISARMED)
 
     def alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
         if self._code_arm_required and not self._check_code(code):
             return
-        self.set_alarm_state(self._event_away, AlarmControlPanelState.ARMED_AWAY)
+        self.set_alarm_state(self._event_away, STATE_ALARM_ARMED_AWAY)
 
     def alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
         if self._code_arm_required and not self._check_code(code):
             return
-        self.set_alarm_state(self._event_home, AlarmControlPanelState.ARMED_HOME)
+        self.set_alarm_state(self._event_home, STATE_ALARM_ARMED_HOME)
 
     def alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
         if self._code_arm_required and not self._check_code(code):
             return
-        self.set_alarm_state(self._event_night, AlarmControlPanelState.ARMED_NIGHT)
+        self.set_alarm_state(self._event_night, STATE_ALARM_ARMED_NIGHT)
 
-    def set_alarm_state(self, event: str, state: AlarmControlPanelState) -> None:
+    def set_alarm_state(self, event: str, state: str) -> None:
         """Call the IFTTT trigger service to change the alarm state."""
         data = {ATTR_EVENT: event}
 
         self.hass.services.call(DOMAIN, SERVICE_TRIGGER, data)
         _LOGGER.debug("Called IFTTT integration to trigger event %s", event)
         if self._optimistic:
-            self._attr_alarm_state = state
+            self._attr_state = state
 
     def push_alarm_state(self, value: str) -> None:
         """Push the alarm state to the given value."""
-        value = AlarmControlPanelState(value)
         if value in ALLOWED_STATES:
             _LOGGER.debug("Pushed the alarm state to %s", value)
-            self._attr_alarm_state = value
+            self._attr_state = value
 
     def _check_code(self, code: str | None) -> bool:
         return self._code is None or self._code == code
diff --git a/homeassistant/components/image/__init__.py b/homeassistant/components/image/__init__.py
index dbb5962eabf..47019f3e92e 100644
--- a/homeassistant/components/image/__init__.py
+++ b/homeassistant/components/image/__init__.py
@@ -8,27 +8,19 @@ from contextlib import suppress
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import logging
-import os
 from random import SystemRandom
 from typing import Final, final
 
 from aiohttp import hdrs, web
 import httpx
 from propcache import cached_property
-import voluptuous as vol
 
 from homeassistant.components.http import KEY_AUTHENTICATED, KEY_HASS, HomeAssistantView
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONTENT_TYPE_MULTIPART, EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import (
-    Event,
-    EventStateChangedData,
-    HomeAssistant,
-    ServiceCall,
-    callback,
-)
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import (
@@ -36,26 +28,17 @@ 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,
-    VolDictType,
-)
+from homeassistant.helpers.typing import UNDEFINED, ConfigType, UndefinedType
 
 from .const import DATA_COMPONENT, DOMAIN, IMAGE_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
-SERVICE_SNAPSHOT: Final = "snapshot"
-
 ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
 PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA
 PLATFORM_SCHEMA_BASE = cv.PLATFORM_SCHEMA_BASE
 SCAN_INTERVAL: Final = timedelta(seconds=30)
 
-ATTR_FILENAME: Final = "filename"
-
 DEFAULT_CONTENT_TYPE: Final = "image/jpeg"
 ENTITY_IMAGE_URL: Final = "/api/image_proxy/{0}?token={1}"
 
@@ -68,8 +51,6 @@ FRAME_BOUNDARY = "frame-boundary"
 FRAME_SEPARATOR = bytes(f"\r\n--{FRAME_BOUNDARY}\r\n", "utf-8")
 LAST_FRAME_MARKER = bytes(f"\r\n--{FRAME_BOUNDARY}--\r\n", "utf-8")
 
-IMAGE_SERVICE_SNAPSHOT: VolDictType = {vol.Required(ATTR_FILENAME): cv.string}
-
 
 class ImageEntityDescription(EntityDescription, frozen_or_thawed=True):
     """A class that describes image entities."""
@@ -134,10 +115,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, unsub_track_time_interval)
 
-    component.async_register_entity_service(
-        SERVICE_SNAPSHOT, IMAGE_SERVICE_SNAPSHOT, async_handle_snapshot_service
-    )
-
     return True
 
 
@@ -403,34 +380,3 @@ class ImageStreamView(ImageView):
     ) -> web.StreamResponse:
         """Serve image stream."""
         return await async_get_still_stream(request, image_entity)
-
-
-async def async_handle_snapshot_service(
-    image: ImageEntity, service_call: ServiceCall
-) -> None:
-    """Handle snapshot services calls."""
-    hass = image.hass
-    snapshot_file: str = service_call.data[ATTR_FILENAME]
-
-    # check if we allow to access to that file
-    if not hass.config.is_allowed_path(snapshot_file):
-        raise HomeAssistantError(
-            f"Cannot write `{snapshot_file}`, no access to path; `allowlist_external_dirs` may need to be adjusted in `configuration.yaml`"
-        )
-
-    async with asyncio.timeout(IMAGE_TIMEOUT):
-        image_data = await image.async_image()
-
-    if image_data is None:
-        return
-
-    def _write_image(to_file: str, image_data: bytes) -> None:
-        """Executor helper to write image."""
-        os.makedirs(os.path.dirname(to_file), exist_ok=True)
-        with open(to_file, "wb") as img_file:
-            img_file.write(image_data)
-
-    try:
-        await hass.async_add_executor_job(_write_image, snapshot_file, image_data)
-    except OSError as err:
-        raise HomeAssistantError("Can't write image to file") from err
diff --git a/homeassistant/components/image/icons.json b/homeassistant/components/image/icons.json
index 4434f3c180c..cec9c99d765 100644
--- a/homeassistant/components/image/icons.json
+++ b/homeassistant/components/image/icons.json
@@ -3,10 +3,5 @@
     "_": {
       "default": "mdi:image"
     }
-  },
-  "services": {
-    "snapshot": {
-      "service": "mdi:camera"
-    }
   }
 }
diff --git a/homeassistant/components/image/services.yaml b/homeassistant/components/image/services.yaml
deleted file mode 100644
index 8eef055cd89..00000000000
--- a/homeassistant/components/image/services.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Describes the format for available image services
-
-snapshot:
-  target:
-    entity:
-      domain: image
-  fields:
-    filename:
-      required: true
-      example: "/tmp/image_snapshot.jpg"
-      selector:
-        text:
diff --git a/homeassistant/components/image/strings.json b/homeassistant/components/image/strings.json
index 011102f5b9e..ea7ecd16956 100644
--- a/homeassistant/components/image/strings.json
+++ b/homeassistant/components/image/strings.json
@@ -4,17 +4,5 @@
     "_": {
       "name": "[%key:component::image::title%]"
     }
-  },
-  "services": {
-    "snapshot": {
-      "name": "Take snapshot",
-      "description": "Takes a snapshot from an image.",
-      "fields": {
-        "filename": {
-          "name": "Filename",
-          "description": "Template of a filename. Variable available is `entity_id`."
-        }
-      }
-    }
   }
 }
diff --git a/homeassistant/components/image_processing/__init__.py b/homeassistant/components/image_processing/__init__.py
index 0ac8d39813b..2c1d0f9304c 100644
--- a/homeassistant/components/image_processing/__init__.py
+++ b/homeassistant/components/image_processing/__init__.py
@@ -223,7 +223,7 @@ class ImageProcessingFaceEntity(ImageProcessingEntity):
                 confidence = f_co
                 for attr in (ATTR_NAME, ATTR_MOTION):
                     if attr in face:
-                        state = face[attr]
+                        state = face[attr]  # type: ignore[literal-required]
                         break
 
         return state
diff --git a/homeassistant/components/image_upload/manifest.json b/homeassistant/components/image_upload/manifest.json
index bb8c33ba749..963721a0476 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==11.0.0"]
+  "requirements": ["Pillow==10.4.0"]
 }
diff --git a/homeassistant/components/imap/config_flow.py b/homeassistant/components/imap/config_flow.py
index 994c53b5b3e..b8215e8b709 100644
--- a/homeassistant/components/imap/config_flow.py
+++ b/homeassistant/components/imap/config_flow.py
@@ -13,15 +13,9 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
-)
-from homeassistant.const import (
-    CONF_NAME,
-    CONF_PASSWORD,
-    CONF_PORT,
-    CONF_USERNAME,
-    CONF_VERIFY_SSL,
+    OptionsFlowWithConfigEntry,
 )
+from homeassistant.const import CONF_PASSWORD, CONF_PORT, CONF_USERNAME, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.helpers import config_validation as cv
@@ -196,10 +190,7 @@ class IMAPConfigFlow(ConfigFlow, domain=DOMAIN):
                 return self.async_update_reload_and_abort(reauth_entry, data=user_input)
 
         return self.async_show_form(
-            description_placeholders={
-                CONF_USERNAME: reauth_entry.data[CONF_USERNAME],
-                CONF_NAME: reauth_entry.title,
-            },
+            description_placeholders={CONF_USERNAME: reauth_entry.data[CONF_USERNAME]},
             step_id="reauth_confirm",
             data_schema=vol.Schema(
                 {
@@ -213,12 +204,12 @@ class IMAPConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> ImapOptionsFlow:
+    ) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return ImapOptionsFlow()
+        return OptionsFlow(config_entry)
 
 
-class ImapOptionsFlow(OptionsFlow):
+class OptionsFlow(OptionsFlowWithConfigEntry):
     """Option flow handler."""
 
     async def async_step_init(
@@ -226,13 +217,13 @@ class ImapOptionsFlow(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the options."""
         errors: dict[str, str] | None = None
-        entry_data: dict[str, Any] = dict(self.config_entry.data)
+        entry_data: dict[str, Any] = dict(self._config_entry.data)
         if user_input is not None:
             try:
                 self._async_abort_entries_match(
                     {
-                        CONF_SERVER: self.config_entry.data[CONF_SERVER],
-                        CONF_USERNAME: self.config_entry.data[CONF_USERNAME],
+                        CONF_SERVER: self._config_entry.data[CONF_SERVER],
+                        CONF_USERNAME: self._config_entry.data[CONF_USERNAME],
                         CONF_FOLDER: user_input[CONF_FOLDER],
                         CONF_SEARCH: user_input[CONF_SEARCH],
                     }
diff --git a/homeassistant/components/imap/strings.json b/homeassistant/components/imap/strings.json
index 7c4a0d9a973..115d46f3d0e 100644
--- a/homeassistant/components/imap/strings.json
+++ b/homeassistant/components/imap/strings.json
@@ -104,7 +104,7 @@
   "services": {
     "fetch": {
       "name": "Fetch message",
-      "description": "Fetch an email message from the server.",
+      "description": "Fetch the email message from the server.",
       "fields": {
         "entry": {
           "name": "Entry",
diff --git a/homeassistant/components/improv_ble/config_flow.py b/homeassistant/components/improv_ble/config_flow.py
index 05dd1de449a..f38f4830ace 100644
--- a/homeassistant/components/improv_ble/config_flow.py
+++ b/homeassistant/components/improv_ble/config_flow.py
@@ -120,22 +120,12 @@ class ImprovBLEConfigFlow(ConfigFlow, domain=DOMAIN):
         assert self._discovery_info is not None
 
         service_data = self._discovery_info.service_data
-        try:
-            improv_service_data = ImprovServiceData.from_bytes(
-                service_data[SERVICE_DATA_UUID]
-            )
-        except improv_ble_errors.InvalidCommand as err:
-            _LOGGER.warning(
-                "Aborting improv flow, device %s sent invalid improv data: '%s'",
-                self._discovery_info.address,
-                service_data[SERVICE_DATA_UUID].hex(),
-            )
-            raise AbortFlow("invalid_improv_data") from err
-
+        improv_service_data = ImprovServiceData.from_bytes(
+            service_data[SERVICE_DATA_UUID]
+        )
         if improv_service_data.state in (State.PROVISIONING, State.PROVISIONED):
             _LOGGER.debug(
-                "Aborting improv flow, device %s is already provisioned: %s",
-                self._discovery_info.address,
+                "Aborting improv flow, device is already provisioned: %s",
                 improv_service_data.state,
             )
             raise AbortFlow("already_provisioned")
diff --git a/homeassistant/components/incomfort/water_heater.py b/homeassistant/components/incomfort/water_heater.py
index e7620ac2a1a..28424069d1c 100644
--- a/homeassistant/components/incomfort/water_heater.py
+++ b/homeassistant/components/incomfort/water_heater.py
@@ -54,16 +54,12 @@ class IncomfortWaterHeater(IncomfortBoilerEntity, WaterHeaterEntity):
         return {k: v for k, v in self._heater.status.items() if k in HEATER_ATTRS}
 
     @property
-    def current_temperature(self) -> float | None:
+    def current_temperature(self) -> float:
         """Return the current temperature."""
         if self._heater.is_tapping:
             return self._heater.tap_temp
         if self._heater.is_pumping:
             return self._heater.heater_temp
-        if self._heater.heater_temp is None:
-            return self._heater.tap_temp
-        if self._heater.tap_temp is None:
-            return self._heater.heater_temp
         return max(self._heater.heater_temp, self._heater.tap_temp)
 
     @property
diff --git a/homeassistant/components/insteon/strings.json b/homeassistant/components/insteon/strings.json
index 4df997ac939..1464a2dbc8f 100644
--- a/homeassistant/components/insteon/strings.json
+++ b/homeassistant/components/insteon/strings.json
@@ -112,7 +112,7 @@
   "services": {
     "add_all_link": {
       "name": "Add all link",
-      "description": "Tells the Insteon Modem (IM) start All-Linking mode. Once the IM is in All-Linking mode, press the link button on the device to complete All-Linking.",
+      "description": "Tells the Insteom Modem (IM) start All-Linking mode. Once the IM is in All-Linking mode, press the link button on the device to complete All-Linking.",
       "fields": {
         "group": {
           "name": "Group",
diff --git a/homeassistant/components/intellifire/binary_sensor.py b/homeassistant/components/intellifire/binary_sensor.py
index 7d00bdfc26d..f0a5d84fa62 100644
--- a/homeassistant/components/intellifire/binary_sensor.py
+++ b/homeassistant/components/intellifire/binary_sensor.py
@@ -5,6 +5,8 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 
+from intellifire4py.model import IntelliFirePollData
+
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -24,7 +26,7 @@ from .entity import IntellifireEntity
 class IntellifireBinarySensorRequiredKeysMixin:
     """Mixin for required keys."""
 
-    value_fn: Callable[[IntellifireDataUpdateCoordinator], bool | None]
+    value_fn: Callable[[IntelliFirePollData], bool]
 
 
 @dataclass(frozen=True)
@@ -38,114 +40,100 @@ INTELLIFIRE_BINARY_SENSORS: tuple[IntellifireBinarySensorEntityDescription, ...]
     IntellifireBinarySensorEntityDescription(
         key="on_off",  # This is the sensor name
         translation_key="flame",  # This is the translation key
-        value_fn=lambda coordinator: coordinator.data.is_on,
+        value_fn=lambda data: data.is_on,
     ),
     IntellifireBinarySensorEntityDescription(
         key="timer_on",
         translation_key="timer_on",
-        value_fn=lambda coordinator: coordinator.data.timer_on,
+        value_fn=lambda data: data.timer_on,
     ),
     IntellifireBinarySensorEntityDescription(
         key="pilot_light_on",
         translation_key="pilot_light_on",
-        value_fn=lambda coordinator: coordinator.data.pilot_on,
+        value_fn=lambda data: data.pilot_on,
     ),
     IntellifireBinarySensorEntityDescription(
         key="thermostat_on",
         translation_key="thermostat_on",
-        value_fn=lambda coordinator: coordinator.data.thermostat_on,
+        value_fn=lambda data: data.thermostat_on,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_pilot_flame",
         translation_key="pilot_flame_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_pilot_flame,
+        value_fn=lambda data: data.error_pilot_flame,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_flame",
         translation_key="flame_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_flame,
+        value_fn=lambda data: data.error_flame,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_fan_delay",
         translation_key="fan_delay_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_fan_delay,
+        value_fn=lambda data: data.error_fan_delay,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_maintenance",
         translation_key="maintenance_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_maintenance,
+        value_fn=lambda data: data.error_maintenance,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_disabled",
         translation_key="disabled_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_disabled,
+        value_fn=lambda data: data.error_disabled,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_fan",
         translation_key="fan_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_fan,
+        value_fn=lambda data: data.error_fan,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_lights",
         translation_key="lights_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_lights,
+        value_fn=lambda data: data.error_lights,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_accessory",
         translation_key="accessory_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_accessory,
+        value_fn=lambda data: data.error_accessory,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_soft_lock_out",
         translation_key="soft_lock_out_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_soft_lock_out,
+        value_fn=lambda data: data.error_soft_lock_out,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_ecm_offline",
         translation_key="ecm_offline_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_ecm_offline,
+        value_fn=lambda data: data.error_ecm_offline,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     IntellifireBinarySensorEntityDescription(
         key="error_offline",
         translation_key="offline_error",
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda coordinator: coordinator.data.error_offline,
+        value_fn=lambda data: data.error_offline,
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
-    IntellifireBinarySensorEntityDescription(
-        key="local_connectivity",
-        translation_key="local_connectivity",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.CONNECTIVITY,
-        value_fn=lambda coordinator: coordinator.fireplace.local_connectivity,
-    ),
-    IntellifireBinarySensorEntityDescription(
-        key="cloud_connectivity",
-        translation_key="cloud_connectivity",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.CONNECTIVITY,
-        value_fn=lambda coordinator: coordinator.fireplace.cloud_connectivity,
-    ),
 )
 
 
@@ -169,6 +157,6 @@ class IntellifireBinarySensor(IntellifireEntity, BinarySensorEntity):
     entity_description: IntellifireBinarySensorEntityDescription
 
     @property
-    def is_on(self) -> bool | None:
+    def is_on(self) -> bool:
         """Use this to get the correct value."""
-        return self.entity_description.value_fn(self.coordinator)
+        return self.entity_description.value_fn(self.coordinator.read_api.data)
diff --git a/homeassistant/components/intellifire/icons.json b/homeassistant/components/intellifire/icons.json
index fd6a2c149a7..6dca69484b6 100644
--- a/homeassistant/components/intellifire/icons.json
+++ b/homeassistant/components/intellifire/icons.json
@@ -18,20 +18,6 @@
       },
       "fan_error": {
         "default": "mdi:fan-alert"
-      },
-      "local_connectivity": {
-        "default": "mdi:lan-pending",
-        "state": {
-          "on": "mdi:lan-connect",
-          "off": "mdi:lan-disconnect"
-        }
-      },
-      "cloud_connectivity": {
-        "default": "mdi:cloud-question",
-        "state": {
-          "on": "mdi:cloud-check-variant-outline",
-          "off": "mdi:cloud-alert-outline"
-        }
       }
     },
     "number": {
diff --git a/homeassistant/components/intellifire/strings.json b/homeassistant/components/intellifire/strings.json
index 423d2c0788d..2eeb2b50b93 100644
--- a/homeassistant/components/intellifire/strings.json
+++ b/homeassistant/components/intellifire/strings.json
@@ -73,12 +73,6 @@
       },
       "offline_error": {
         "name": "Offline error"
-      },
-      "cloud_connectivity": {
-        "name": "Cloud connectivity"
-      },
-      "local_connectivity": {
-        "name": "Local connectivity"
       }
     },
     "fan": {
diff --git a/homeassistant/components/intent/__init__.py b/homeassistant/components/intent/__init__.py
index 1322576f115..85fdf5c88c3 100644
--- a/homeassistant/components/intent/__init__.py
+++ b/homeassistant/components/intent/__init__.py
@@ -137,7 +137,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     intent.async_register(hass, TimerStatusIntentHandler())
     intent.async_register(hass, GetCurrentDateIntentHandler())
     intent.async_register(hass, GetCurrentTimeIntentHandler())
-    intent.async_register(hass, HelloIntentHandler())
 
     return True
 
@@ -365,7 +364,7 @@ class NevermindIntentHandler(intent.IntentHandler):
     description = "Cancels the current request and does nothing"
 
     async def async_handle(self, intent_obj: intent.Intent) -> intent.IntentResponse:
-        """Do nothing and produces an empty response."""
+        """Doe not do anything, and produces an empty response."""
         return intent_obj.create_response()
 
 
@@ -421,17 +420,6 @@ class GetCurrentTimeIntentHandler(intent.IntentHandler):
         return response
 
 
-class HelloIntentHandler(intent.IntentHandler):
-    """Responds with no action."""
-
-    intent_type = intent.INTENT_RESPOND
-    description = "Returns the provided response with no action."
-
-    async def async_handle(self, intent_obj: intent.Intent) -> intent.IntentResponse:
-        """Return the provided response, but take no action."""
-        return intent_obj.create_response()
-
-
 async def _async_process_intent(
     hass: HomeAssistant, domain: str, platform: IntentPlatformProtocol
 ) -> None:
diff --git a/homeassistant/components/iotty/coordinator.py b/homeassistant/components/iotty/coordinator.py
index 420248f7724..12764ac1cf6 100644
--- a/homeassistant/components/iotty/coordinator.py
+++ b/homeassistant/components/iotty/coordinator.py
@@ -61,12 +61,14 @@ class IottyDataUpdateCoordinator(DataUpdateCoordinator[IottyData]):
         )
         self._device_registry = dr.async_get(hass)
 
-    async def _async_setup(self) -> None:
-        """Get devices."""
+    async def async_config_entry_first_refresh(self) -> None:
+        """Override the first refresh to also fetch iotty devices list."""
         _LOGGER.debug("Fetching devices list from iottyCloud")
         self._devices = await self.iotty.get_devices()
         _LOGGER.debug("There are %d devices", len(self._devices))
 
+        await super().async_config_entry_first_refresh()
+
     async def _async_update_data(self) -> IottyData:
         """Fetch data from iottyCloud device."""
         _LOGGER.debug("Fetching devices status from iottyCloud")
diff --git a/homeassistant/components/iqvia/__init__.py b/homeassistant/components/iqvia/__init__.py
index 3fabb88b041..8b72d6f8784 100644
--- a/homeassistant/components/iqvia/__init__.py
+++ b/homeassistant/components/iqvia/__init__.py
@@ -76,7 +76,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         coordinator = coordinators[sensor_type] = DataUpdateCoordinator(
             hass,
             LOGGER,
-            config_entry=entry,
             name=f"{entry.data[CONF_ZIP_CODE]} {sensor_type}",
             update_interval=DEFAULT_SCAN_INTERVAL,
             update_method=partial(async_get_data_from_api, api_coro),
diff --git a/homeassistant/components/iqvia/manifest.json b/homeassistant/components/iqvia/manifest.json
index 11c99a7428f..6142fa1349e 100644
--- a/homeassistant/components/iqvia/manifest.json
+++ b/homeassistant/components/iqvia/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["pyiqvia"],
-  "requirements": ["numpy==2.1.3", "pyiqvia==2022.04.0"]
+  "requirements": ["numpy==1.26.4", "pyiqvia==2022.04.0"]
 }
diff --git a/homeassistant/components/iron_os/__init__.py b/homeassistant/components/iron_os/__init__.py
index 56a83117e68..43691c8594a 100644
--- a/homeassistant/components/iron_os/__init__.py
+++ b/homeassistant/components/iron_os/__init__.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 import logging
 from typing import TYPE_CHECKING
 
@@ -13,10 +14,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, Platform
 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.typing import ConfigType
-from homeassistant.util.hass_dict import HassKey
 
 from .const import DOMAIN
 from .coordinator import IronOSFirmwareUpdateCoordinator, IronOSLiveDataCoordinator
@@ -24,25 +22,19 @@ from .coordinator import IronOSFirmwareUpdateCoordinator, IronOSLiveDataCoordina
 PLATFORMS: list[Platform] = [Platform.NUMBER, Platform.SENSOR, Platform.UPDATE]
 
 
-type IronOSConfigEntry = ConfigEntry[IronOSLiveDataCoordinator]
-IRON_OS_KEY: HassKey[IronOSFirmwareUpdateCoordinator] = HassKey(DOMAIN)
+@dataclass
+class IronOSCoordinators:
+    """IronOS data class holding coordinators."""
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+    live_data: IronOSLiveDataCoordinator
+    firmware: IronOSFirmwareUpdateCoordinator
+
+
+type IronOSConfigEntry = ConfigEntry[IronOSCoordinators]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up IronOS firmware update coordinator."""
-
-    session = async_get_clientsession(hass)
-    github = GitHubAPI(session=session)
-
-    hass.data[IRON_OS_KEY] = IronOSFirmwareUpdateCoordinator(hass, github)
-    await hass.data[IRON_OS_KEY].async_request_refresh()
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: IronOSConfigEntry) -> bool:
     """Set up IronOS from a config entry."""
     if TYPE_CHECKING:
@@ -62,7 +54,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: IronOSConfigEntry) -> bo
     coordinator = IronOSLiveDataCoordinator(hass, device)
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    session = async_get_clientsession(hass)
+    github = GitHubAPI(session=session)
+
+    firmware_update_coordinator = IronOSFirmwareUpdateCoordinator(hass, device, github)
+    await firmware_update_coordinator.async_config_entry_first_refresh()
+
+    entry.runtime_data = IronOSCoordinators(
+        live_data=coordinator,
+        firmware=firmware_update_coordinator,
+    )
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
diff --git a/homeassistant/components/iron_os/coordinator.py b/homeassistant/components/iron_os/coordinator.py
index 699f5a01704..175de484870 100644
--- a/homeassistant/components/iron_os/coordinator.py
+++ b/homeassistant/components/iron_os/coordinator.py
@@ -21,48 +21,56 @@ SCAN_INTERVAL = timedelta(seconds=5)
 SCAN_INTERVAL_GITHUB = timedelta(hours=3)
 
 
-class IronOSLiveDataCoordinator(DataUpdateCoordinator[LiveDataResponse]):
-    """IronOS live data coordinator."""
+class IronOSBaseCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
+    """IronOS base coordinator."""
 
     device_info: DeviceInfoResponse
     config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, device: Pynecil) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        device: Pynecil,
+        update_interval: timedelta,
+    ) -> None:
         """Initialize IronOS coordinator."""
         super().__init__(
             hass,
             _LOGGER,
             name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
+            update_interval=update_interval,
         )
         self.device = device
 
+    async def _async_setup(self) -> None:
+        """Set up the coordinator."""
+
+        self.device_info = await self.device.get_device_info()
+
+
+class IronOSLiveDataCoordinator(IronOSBaseCoordinator):
+    """IronOS live data coordinator."""
+
+    def __init__(self, hass: HomeAssistant, device: Pynecil) -> None:
+        """Initialize IronOS coordinator."""
+        super().__init__(hass, device=device, update_interval=SCAN_INTERVAL)
+
     async def _async_update_data(self) -> LiveDataResponse:
         """Fetch data from Device."""
 
         try:
-            # device info is cached and won't be refetched on every
-            # coordinator refresh, only after the device has disconnected
-            # the device info is refetched
-            self.device_info = await self.device.get_device_info()
             return await self.device.get_live_data()
 
         except CommunicationError as e:
             raise UpdateFailed("Cannot connect to device") from e
 
 
-class IronOSFirmwareUpdateCoordinator(DataUpdateCoordinator[GitHubReleaseModel]):
+class IronOSFirmwareUpdateCoordinator(IronOSBaseCoordinator):
     """IronOS coordinator for retrieving update information from github."""
 
-    def __init__(self, hass: HomeAssistant, github: GitHubAPI) -> None:
+    def __init__(self, hass: HomeAssistant, device: Pynecil, github: GitHubAPI) -> None:
         """Initialize IronOS coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=None,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL_GITHUB,
-        )
+        super().__init__(hass, device=device, update_interval=SCAN_INTERVAL_GITHUB)
         self.github = github
 
     async def _async_update_data(self) -> GitHubReleaseModel:
diff --git a/homeassistant/components/iron_os/entity.py b/homeassistant/components/iron_os/entity.py
index 77bebda9390..d1c9a9aa0ee 100644
--- a/homeassistant/components/iron_os/entity.py
+++ b/homeassistant/components/iron_os/entity.py
@@ -9,17 +9,17 @@ from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import MANUFACTURER, MODEL
-from .coordinator import IronOSLiveDataCoordinator
+from .coordinator import IronOSBaseCoordinator
 
 
-class IronOSBaseEntity(CoordinatorEntity[IronOSLiveDataCoordinator]):
+class IronOSBaseEntity(CoordinatorEntity[IronOSBaseCoordinator]):
     """Base IronOS entity."""
 
     _attr_has_entity_name = True
 
     def __init__(
         self,
-        coordinator: IronOSLiveDataCoordinator,
+        coordinator: IronOSBaseCoordinator,
         entity_description: EntityDescription,
     ) -> None:
         """Initialize the sensor."""
diff --git a/homeassistant/components/iron_os/manifest.json b/homeassistant/components/iron_os/manifest.json
index 4ec08a43b61..9fcb84e0f6a 100644
--- a/homeassistant/components/iron_os/manifest.json
+++ b/homeassistant/components/iron_os/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/iron_os",
   "iot_class": "local_polling",
   "loggers": ["pynecil", "aiogithubapi"],
-  "requirements": ["pynecil==0.2.1", "aiogithubapi==24.6.0"]
+  "requirements": ["pynecil==0.2.0", "aiogithubapi==24.6.0"]
 }
diff --git a/homeassistant/components/iron_os/number.py b/homeassistant/components/iron_os/number.py
index 9230faec1f1..bc8da968187 100644
--- a/homeassistant/components/iron_os/number.py
+++ b/homeassistant/components/iron_os/number.py
@@ -61,7 +61,7 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up number entities from a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = entry.runtime_data.live_data
 
     async_add_entities(
         IronOSNumberEntity(coordinator, description)
diff --git a/homeassistant/components/iron_os/sensor.py b/homeassistant/components/iron_os/sensor.py
index 095ffd254df..a44e61c4de3 100644
--- a/homeassistant/components/iron_os/sensor.py
+++ b/homeassistant/components/iron_os/sensor.py
@@ -180,7 +180,7 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up sensors from a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = entry.runtime_data.live_data
 
     async_add_entities(
         IronOSSensorEntity(coordinator, description)
diff --git a/homeassistant/components/iron_os/update.py b/homeassistant/components/iron_os/update.py
index 786ba86f730..9086dc0b7b5 100644
--- a/homeassistant/components/iron_os/update.py
+++ b/homeassistant/components/iron_os/update.py
@@ -11,8 +11,8 @@ from homeassistant.components.update import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import IRON_OS_KEY, IronOSConfigEntry, IronOSLiveDataCoordinator
-from .coordinator import IronOSFirmwareUpdateCoordinator
+from . import IronOSConfigEntry
+from .coordinator import IronOSBaseCoordinator
 from .entity import IronOSBaseEntity
 
 UPDATE_DESCRIPTION = UpdateEntityDescription(
@@ -28,11 +28,9 @@ async def async_setup_entry(
 ) -> None:
     """Set up IronOS update platform."""
 
-    coordinator = entry.runtime_data
+    coordinator = entry.runtime_data.firmware
 
-    async_add_entities(
-        [IronOSUpdate(coordinator, hass.data[IRON_OS_KEY], UPDATE_DESCRIPTION)]
-    )
+    async_add_entities([IronOSUpdate(coordinator, UPDATE_DESCRIPTION)])
 
 
 class IronOSUpdate(IronOSBaseEntity, UpdateEntity):
@@ -42,12 +40,10 @@ class IronOSUpdate(IronOSBaseEntity, UpdateEntity):
 
     def __init__(
         self,
-        coordinator: IronOSLiveDataCoordinator,
-        firmware_update: IronOSFirmwareUpdateCoordinator,
+        coordinator: IronOSBaseCoordinator,
         entity_description: UpdateEntityDescription,
     ) -> None:
         """Initialize the sensor."""
-        self.firmware_update = firmware_update
         super().__init__(coordinator, entity_description)
 
     @property
@@ -60,39 +56,21 @@ class IronOSUpdate(IronOSBaseEntity, UpdateEntity):
     def title(self) -> str | None:
         """Title of the IronOS release."""
 
-        return f"IronOS {self.firmware_update.data.name}"
+        return f"IronOS {self.coordinator.data.name}"
 
     @property
     def release_url(self) -> str | None:
         """URL to the full release notes of the latest IronOS version available."""
 
-        return self.firmware_update.data.html_url
+        return self.coordinator.data.html_url
 
     @property
     def latest_version(self) -> str | None:
         """Latest IronOS version available for install."""
 
-        return self.firmware_update.data.tag_name
+        return self.coordinator.data.tag_name
 
     async def async_release_notes(self) -> str | None:
         """Return the release notes."""
 
-        return self.firmware_update.data.body
-
-    async def async_added_to_hass(self) -> None:
-        """When entity is added to hass.
-
-        Register extra update listener for the firmware update coordinator.
-        """
-        await super().async_added_to_hass()
-        self.async_on_remove(
-            self.firmware_update.async_add_listener(self._handle_coordinator_update)
-        )
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return (
-            self.installed_version is not None
-            and self.firmware_update.last_update_success
-        )
+        return self.coordinator.data.body
diff --git a/homeassistant/components/islamic_prayer_times/config_flow.py b/homeassistant/components/islamic_prayer_times/config_flow.py
index ce911ccc49d..2db89183499 100644
--- a/homeassistant/components/islamic_prayer_times/config_flow.py
+++ b/homeassistant/components/islamic_prayer_times/config_flow.py
@@ -52,7 +52,7 @@ class IslamicPrayerFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> IslamicPrayerOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return IslamicPrayerOptionsFlowHandler()
+        return IslamicPrayerOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -93,6 +93,10 @@ class IslamicPrayerFlowHandler(ConfigFlow, domain=DOMAIN):
 class IslamicPrayerOptionsFlowHandler(OptionsFlow):
     """Handle Islamic Prayer client options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/iss/__init__.py b/homeassistant/components/iss/__init__.py
index dbbcc8b6c51..606263ce769 100644
--- a/homeassistant/components/iss/__init__.py
+++ b/homeassistant/components/iss/__init__.py
@@ -53,7 +53,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=async_update,
         update_interval=timedelta(seconds=60),
diff --git a/homeassistant/components/iss/config_flow.py b/homeassistant/components/iss/config_flow.py
index eaf01a6d094..9cc533f5cc5 100644
--- a/homeassistant/components/iss/config_flow.py
+++ b/homeassistant/components/iss/config_flow.py
@@ -1,7 +1,5 @@
 """Config flow to configure iss component."""
 
-from __future__ import annotations
-
 import voluptuous as vol
 
 from homeassistant.config_entries import (
@@ -25,9 +23,9 @@ class ISSConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> OptionsFlowHandler:
+    ) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(self, user_input=None) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
@@ -44,10 +42,16 @@ class ISSConfigFlow(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Config flow options handler for iss."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+        self.options = dict(config_entry.options)
+
     async def async_step_init(self, user_input=None) -> ConfigFlowResult:
         """Manage the options."""
         if user_input is not None:
-            return self.async_create_entry(data=self.config_entry.options | user_input)
+            self.options.update(user_input)
+            return self.async_create_entry(title="", data=self.options)
 
         return self.async_show_form(
             step_id="init",
diff --git a/homeassistant/components/isy994/config_flow.py b/homeassistant/components/isy994/config_flow.py
index 3575fa99a55..0239926f5e3 100644
--- a/homeassistant/components/isy994/config_flow.py
+++ b/homeassistant/components/isy994/config_flow.py
@@ -140,7 +140,7 @@ class Isy994ConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -314,6 +314,10 @@ class Isy994ConfigFlow(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for ISY/IoX."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/jellyfin/config_flow.py b/homeassistant/components/jellyfin/config_flow.py
index 0c170d2485f..f60d96f3efa 100644
--- a/homeassistant/components/jellyfin/config_flow.py
+++ b/homeassistant/components/jellyfin/config_flow.py
@@ -8,7 +8,11 @@ from typing import Any
 
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
+from homeassistant.config_entries import (
+    ConfigFlow,
+    ConfigFlowResult,
+    OptionsFlowWithConfigEntry,
+)
 from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.util.uuid import random_uuid_hex
@@ -139,12 +143,12 @@ class JellyfinConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: JellyfinConfigEntry,
-    ) -> OptionsFlowHandler:
+    ) -> OptionsFlowWithConfigEntry:
         """Create the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle an option flow for jellyfin."""
 
     async def async_step_init(
diff --git a/homeassistant/components/jewish_calendar/__init__.py b/homeassistant/components/jewish_calendar/__init__.py
index 823e9bd59be..fd238e8d615 100644
--- a/homeassistant/components/jewish_calendar/__init__.py
+++ b/homeassistant/components/jewish_calendar/__init__.py
@@ -5,17 +5,26 @@ from __future__ import annotations
 from functools import partial
 
 from hdate import Location
+import voluptuous as vol
 
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
     CONF_ELEVATION,
     CONF_LANGUAGE,
     CONF_LATITUDE,
+    CONF_LOCATION,
     CONF_LONGITUDE,
+    CONF_NAME,
     CONF_TIME_ZONE,
     Platform,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+from homeassistant.helpers.typing import ConfigType
 
+from .binary_sensor import BINARY_SENSORS
 from .const import (
     CONF_CANDLE_LIGHT_MINUTES,
     CONF_DIASPORA,
@@ -24,15 +33,94 @@ from .const import (
     DEFAULT_DIASPORA,
     DEFAULT_HAVDALAH_OFFSET_MINUTES,
     DEFAULT_LANGUAGE,
+    DEFAULT_NAME,
+    DOMAIN,
 )
-from .entity import JewishCalendarConfigEntry, JewishCalendarData
+from .sensor import INFO_SENSORS, TIME_SENSORS
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
+CONFIG_SCHEMA = vol.Schema(
+    {
+        DOMAIN: vol.All(
+            cv.deprecated(DOMAIN),
+            {
+                vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+                vol.Optional(CONF_DIASPORA, default=DEFAULT_DIASPORA): cv.boolean,
+                vol.Inclusive(CONF_LATITUDE, "coordinates"): cv.latitude,
+                vol.Inclusive(CONF_LONGITUDE, "coordinates"): cv.longitude,
+                vol.Optional(CONF_LANGUAGE, default=DEFAULT_LANGUAGE): vol.In(
+                    ["hebrew", "english"]
+                ),
+                vol.Optional(
+                    CONF_CANDLE_LIGHT_MINUTES, default=DEFAULT_CANDLE_LIGHT
+                ): int,
+                # Default of 0 means use 8.5 degrees / 'three_stars' time.
+                vol.Optional(
+                    CONF_HAVDALAH_OFFSET_MINUTES,
+                    default=DEFAULT_HAVDALAH_OFFSET_MINUTES,
+                ): int,
+            },
+        )
+    },
+    extra=vol.ALLOW_EXTRA,
+)
 
-async def async_setup_entry(
-    hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
-) -> bool:
+
+def get_unique_prefix(
+    location: Location,
+    language: str,
+    candle_lighting_offset: int | None,
+    havdalah_offset: int | None,
+) -> str:
+    """Create a prefix for unique ids."""
+    # location.altitude was unset before 2024.6 when this method
+    # was used to create the unique id. As such it would always
+    # use the default altitude of 754.
+    config_properties = [
+        location.latitude,
+        location.longitude,
+        location.timezone,
+        754,
+        location.diaspora,
+        language,
+        candle_lighting_offset,
+        havdalah_offset,
+    ]
+    prefix = "_".join(map(str, config_properties))
+    return f"{prefix}"
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Jewish Calendar component."""
+    if DOMAIN not in config:
+        return True
+
+    async_create_issue(
+        hass,
+        HOMEASSISTANT_DOMAIN,
+        f"deprecated_yaml_{DOMAIN}",
+        is_fixable=False,
+        issue_domain=DOMAIN,
+        breaks_in_ha_version="2024.12.0",
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+        translation_placeholders={
+            "domain": DOMAIN,
+            "integration_title": DEFAULT_NAME,
+        },
+    )
+
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config[DOMAIN]
+        )
+    )
+
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up a configuration entry for Jewish calendar."""
     language = config_entry.data.get(CONF_LANGUAGE, DEFAULT_LANGUAGE)
     diaspora = config_entry.data.get(CONF_DIASPORA, DEFAULT_DIASPORA)
@@ -55,19 +143,27 @@ async def async_setup_entry(
         )
     )
 
-    config_entry.runtime_data = JewishCalendarData(
-        language,
-        diaspora,
-        location,
-        candle_lighting_offset,
-        havdalah_offset,
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = {
+        CONF_LANGUAGE: language,
+        CONF_DIASPORA: diaspora,
+        CONF_LOCATION: location,
+        CONF_CANDLE_LIGHT_MINUTES: candle_lighting_offset,
+        CONF_HAVDALAH_OFFSET_MINUTES: havdalah_offset,
+    }
+
+    # Update unique ID to be unrelated to user defined options
+    old_prefix = get_unique_prefix(
+        location, language, candle_lighting_offset, havdalah_offset
     )
 
+    ent_reg = er.async_get(hass)
+    entries = er.async_entries_for_config_entry(ent_reg, config_entry.entry_id)
+    if not entries or any(entry.unique_id.startswith(old_prefix) for entry in entries):
+        async_update_unique_ids(ent_reg, config_entry.entry_id, old_prefix)
+
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
-    async def update_listener(
-        hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
-    ) -> None:
+    async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
         # Trigger update of states for all platforms
         await hass.config_entries.async_reload(config_entry.entry_id)
 
@@ -75,8 +171,35 @@ async def async_setup_entry(
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
+    )
+
+    if unload_ok:
+        hass.data[DOMAIN].pop(config_entry.entry_id)
+
+    return unload_ok
+
+
+@callback
+def async_update_unique_ids(
+    ent_reg: er.EntityRegistry, new_prefix: str, old_prefix: str
+) -> None:
+    """Update unique ID to be unrelated to user defined options.
+
+    Introduced with release 2024.6
+    """
+    platform_descriptions = {
+        Platform.BINARY_SENSOR: BINARY_SENSORS,
+        Platform.SENSOR: (*INFO_SENSORS, *TIME_SENSORS),
+    }
+    for platform, descriptions in platform_descriptions.items():
+        for description in descriptions:
+            new_unique_id = f"{new_prefix}-{description.key}"
+            old_unique_id = f"{old_prefix}_{description.key}"
+            if entity_id := ent_reg.async_get_entity_id(
+                platform, DOMAIN, old_unique_id
+            ):
+                ent_reg.async_update_entity(entity_id, new_unique_id=new_unique_id)
diff --git a/homeassistant/components/jewish_calendar/binary_sensor.py b/homeassistant/components/jewish_calendar/binary_sensor.py
index 9fd1371f8a8..060650ee25c 100644
--- a/homeassistant/components/jewish_calendar/binary_sensor.py
+++ b/homeassistant/components/jewish_calendar/binary_sensor.py
@@ -14,13 +14,15 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers import event
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 import homeassistant.util.dt as dt_util
 
-from .entity import JewishCalendarConfigEntry, JewishCalendarEntity
+from .const import DOMAIN
+from .entity import JewishCalendarEntity
 
 
 @dataclass(frozen=True)
@@ -61,12 +63,14 @@ BINARY_SENSORS: tuple[JewishCalendarBinarySensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: JewishCalendarConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Jewish Calendar binary sensors."""
+    entry = hass.data[DOMAIN][config_entry.entry_id]
+
     async_add_entities(
-        JewishCalendarBinarySensor(config_entry, description)
+        JewishCalendarBinarySensor(config_entry, entry, description)
         for description in BINARY_SENSORS
     )
 
diff --git a/homeassistant/components/jewish_calendar/config_flow.py b/homeassistant/components/jewish_calendar/config_flow.py
index a2eadbf57bd..f96699d01bd 100644
--- a/homeassistant/components/jewish_calendar/config_flow.py
+++ b/homeassistant/components/jewish_calendar/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_ELEVATION,
@@ -90,21 +90,32 @@ class JewishCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> JewishCalendarOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowWithConfigEntry:
         """Get the options flow for this handler."""
-        return JewishCalendarOptionsFlowHandler()
+        return JewishCalendarOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the initial step."""
         if user_input is not None:
+            _options = {}
+            if CONF_CANDLE_LIGHT_MINUTES in user_input:
+                _options[CONF_CANDLE_LIGHT_MINUTES] = user_input[
+                    CONF_CANDLE_LIGHT_MINUTES
+                ]
+                del user_input[CONF_CANDLE_LIGHT_MINUTES]
+            if CONF_HAVDALAH_OFFSET_MINUTES in user_input:
+                _options[CONF_HAVDALAH_OFFSET_MINUTES] = user_input[
+                    CONF_HAVDALAH_OFFSET_MINUTES
+                ]
+                del user_input[CONF_HAVDALAH_OFFSET_MINUTES]
             if CONF_LOCATION in user_input:
                 user_input[CONF_LATITUDE] = user_input[CONF_LOCATION][CONF_LATITUDE]
                 user_input[CONF_LONGITUDE] = user_input[CONF_LOCATION][CONF_LONGITUDE]
-            return self.async_create_entry(title=DEFAULT_NAME, data=user_input)
+            return self.async_create_entry(
+                title=DEFAULT_NAME, data=user_input, options=_options
+            )
 
         return self.async_show_form(
             step_id="user",
@@ -113,6 +124,10 @@ class JewishCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
             ),
         )
 
+    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+        """Import a config entry from configuration.yaml."""
+        return await self.async_step_user(import_data)
+
     async def async_step_reconfigure(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -130,7 +145,7 @@ class JewishCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_update_reload_and_abort(reconfigure_entry, data=user_input)
 
 
-class JewishCalendarOptionsFlowHandler(OptionsFlow):
+class JewishCalendarOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle Jewish Calendar options."""
 
     async def async_step_init(
diff --git a/homeassistant/components/jewish_calendar/entity.py b/homeassistant/components/jewish_calendar/entity.py
index ad5ac8e2137..c11925df954 100644
--- a/homeassistant/components/jewish_calendar/entity.py
+++ b/homeassistant/components/jewish_calendar/entity.py
@@ -1,27 +1,18 @@
 """Entity representing a Jewish Calendar sensor."""
 
-from dataclasses import dataclass
-
-from hdate import Location
+from typing import Any
 
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_LANGUAGE, CONF_LOCATION
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import Entity, EntityDescription
 
-from .const import DOMAIN
-
-type JewishCalendarConfigEntry = ConfigEntry[JewishCalendarData]
-
-
-@dataclass
-class JewishCalendarData:
-    """Jewish Calendar runtime dataclass."""
-
-    language: str
-    diaspora: bool
-    location: Location
-    candle_lighting_offset: int
-    havdalah_offset: int
+from .const import (
+    CONF_CANDLE_LIGHT_MINUTES,
+    CONF_DIASPORA,
+    CONF_HAVDALAH_OFFSET_MINUTES,
+    DOMAIN,
+)
 
 
 class JewishCalendarEntity(Entity):
@@ -31,7 +22,8 @@ class JewishCalendarEntity(Entity):
 
     def __init__(
         self,
-        config_entry: JewishCalendarConfigEntry,
+        config_entry: ConfigEntry,
+        data: dict[str, Any],
         description: EntityDescription,
     ) -> None:
         """Initialize a Jewish Calendar entity."""
@@ -40,10 +32,10 @@ class JewishCalendarEntity(Entity):
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, config_entry.entry_id)},
+            name=config_entry.title,
         )
-        data = config_entry.runtime_data
-        self._location = data.location
-        self._hebrew = data.language == "hebrew"
-        self._candle_lighting_offset = data.candle_lighting_offset
-        self._havdalah_offset = data.havdalah_offset
-        self._diaspora = data.diaspora
+        self._location = data[CONF_LOCATION]
+        self._hebrew = data[CONF_LANGUAGE] == "hebrew"
+        self._candle_lighting_offset = data[CONF_CANDLE_LIGHT_MINUTES]
+        self._havdalah_offset = data[CONF_HAVDALAH_OFFSET_MINUTES]
+        self._diaspora = data[CONF_DIASPORA]
diff --git a/homeassistant/components/jewish_calendar/sensor.py b/homeassistant/components/jewish_calendar/sensor.py
index c32647af07c..87b4375b8b2 100644
--- a/homeassistant/components/jewish_calendar/sensor.py
+++ b/homeassistant/components/jewish_calendar/sensor.py
@@ -14,13 +14,15 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import SUN_EVENT_SUNSET, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.sun import get_astral_event_date
 import homeassistant.util.dt as dt_util
 
-from .entity import JewishCalendarConfigEntry, JewishCalendarEntity
+from .const import DOMAIN
+from .entity import JewishCalendarEntity
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -167,15 +169,17 @@ TIME_SENSORS: tuple[SensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: JewishCalendarConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Jewish calendar sensors ."""
+    entry = hass.data[DOMAIN][config_entry.entry_id]
     sensors = [
-        JewishCalendarSensor(config_entry, description) for description in INFO_SENSORS
+        JewishCalendarSensor(config_entry, entry, description)
+        for description in INFO_SENSORS
     ]
     sensors.extend(
-        JewishCalendarTimeSensor(config_entry, description)
+        JewishCalendarTimeSensor(config_entry, entry, description)
         for description in TIME_SENSORS
     )
 
@@ -189,11 +193,12 @@ class JewishCalendarSensor(JewishCalendarEntity, SensorEntity):
 
     def __init__(
         self,
-        config_entry: JewishCalendarConfigEntry,
+        config_entry: ConfigEntry,
+        data: dict[str, Any],
         description: SensorEntityDescription,
     ) -> None:
         """Initialize the Jewish calendar sensor."""
-        super().__init__(config_entry, description)
+        super().__init__(config_entry, data, description)
         self._attrs: dict[str, str] = {}
 
     async def async_update(self) -> None:
diff --git a/homeassistant/components/jewish_calendar/strings.json b/homeassistant/components/jewish_calendar/strings.json
index 1b7b86c0056..e5367b5819e 100644
--- a/homeassistant/components/jewish_calendar/strings.json
+++ b/homeassistant/components/jewish_calendar/strings.json
@@ -27,8 +27,7 @@
       }
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/juicenet/__init__.py b/homeassistant/components/juicenet/__init__.py
index fcfca7f2492..445d04e67ec 100644
--- a/homeassistant/components/juicenet/__init__.py
+++ b/homeassistant/components/juicenet/__init__.py
@@ -83,7 +83,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="JuiceNet",
         update_method=async_update_data,
         update_interval=timedelta(seconds=30),
diff --git a/homeassistant/components/keenetic_ndms2/config_flow.py b/homeassistant/components/keenetic_ndms2/config_flow.py
index d11fedac385..69e81bf292d 100644
--- a/homeassistant/components/keenetic_ndms2/config_flow.py
+++ b/homeassistant/components/keenetic_ndms2/config_flow.py
@@ -55,7 +55,7 @@ class KeeneticFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> KeeneticOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return KeeneticOptionsFlowHandler()
+        return KeeneticOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -138,8 +138,9 @@ class KeeneticFlowHandler(ConfigFlow, domain=DOMAIN):
 class KeeneticOptionsFlowHandler(OptionsFlow):
     """Handle options."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self._interface_options: dict[str, str] = {}
 
     async def async_step_init(
diff --git a/homeassistant/components/kitchen_sink/config_flow.py b/homeassistant/components/kitchen_sink/config_flow.py
index 019d1dddcad..986879e3058 100644
--- a/homeassistant/components/kitchen_sink/config_flow.py
+++ b/homeassistant/components/kitchen_sink/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.core import callback
 
@@ -33,7 +33,7 @@ class KitchenSinkConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
         """Set the config entry up from yaml."""
@@ -54,7 +54,7 @@ class KitchenSinkConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_abort(reason="reauth_successful")
 
 
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle options."""
 
     async def async_step_init(
@@ -68,7 +68,8 @@ class OptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage the options."""
         if user_input is not None:
-            return self.async_create_entry(data=self.config_entry.options | user_input)
+            self.options.update(user_input)
+            return await self._update_options()
 
         return self.async_show_form(
             step_id="options_1",
@@ -94,3 +95,7 @@ class OptionsFlowHandler(OptionsFlow):
                 }
             ),
         )
+
+    async def _update_options(self) -> ConfigFlowResult:
+        """Update config entry options."""
+        return self.async_create_entry(title="", data=self.options)
diff --git a/homeassistant/components/kmtronic/__init__.py b/homeassistant/components/kmtronic/__init__.py
index edec0b32af2..5f93de3c60e 100644
--- a/homeassistant/components/kmtronic/__init__.py
+++ b/homeassistant/components/kmtronic/__init__.py
@@ -44,7 +44,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{MANUFACTURER} {hub.name}",
         update_method=async_update_data,
         update_interval=timedelta(seconds=30),
diff --git a/homeassistant/components/kmtronic/config_flow.py b/homeassistant/components/kmtronic/config_flow.py
index 56b1d4675bc..6bf0b878f72 100644
--- a/homeassistant/components/kmtronic/config_flow.py
+++ b/homeassistant/components/kmtronic/config_flow.py
@@ -66,7 +66,7 @@ class KmtronicConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> KMTronicOptionsFlow:
         """Get the options flow for this handler."""
-        return KMTronicOptionsFlow()
+        return KMTronicOptionsFlow(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -102,6 +102,10 @@ class InvalidAuth(HomeAssistantError):
 class KMTronicOptionsFlow(OptionsFlow):
     """Handle options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/knx/config_flow.py b/homeassistant/components/knx/config_flow.py
index feeb7626577..4a71c600824 100644
--- a/homeassistant/components/knx/config_flow.py
+++ b/homeassistant/components/knx/config_flow.py
@@ -770,6 +770,7 @@ class KNXOptionsFlow(KNXCommonFlow, OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize KNX options flow."""
+        self.config_entry = config_entry
         super().__init__(initial_data=config_entry.data)  # type: ignore[arg-type]
 
     @callback
diff --git a/homeassistant/components/konnected/config_flow.py b/homeassistant/components/konnected/config_flow.py
index 65dd7cf39b3..3f1ef99c6fb 100644
--- a/homeassistant/components/konnected/config_flow.py
+++ b/homeassistant/components/konnected/config_flow.py
@@ -402,10 +402,9 @@ class OptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
-        self.model = config_entry.data[CONF_MODEL]
-        self.current_opt = (
-            config_entry.options or config_entry.data[CONF_DEFAULT_OPTIONS]
-        )
+        self.entry = config_entry
+        self.model = self.entry.data[CONF_MODEL]
+        self.current_opt = self.entry.options or self.entry.data[CONF_DEFAULT_OPTIONS]
 
         # as config proceeds we'll build up new options and then replace what's in the config entry
         self.new_opt: dict[str, Any] = {CONF_IO: {}}
@@ -476,7 +475,7 @@ class OptionsFlowHandler(OptionsFlow):
                 ),
                 description_placeholders={
                     "model": KONN_PANEL_MODEL_NAMES[self.model],
-                    "host": self.config_entry.data[CONF_HOST],
+                    "host": self.entry.data[CONF_HOST],
                 },
                 errors=errors,
             )
@@ -512,7 +511,7 @@ class OptionsFlowHandler(OptionsFlow):
                 ),
                 description_placeholders={
                     "model": KONN_PANEL_MODEL_NAMES[self.model],
-                    "host": self.config_entry.data[CONF_HOST],
+                    "host": self.entry.data[CONF_HOST],
                 },
                 errors=errors,
             )
@@ -572,7 +571,7 @@ class OptionsFlowHandler(OptionsFlow):
                 ),
                 description_placeholders={
                     "model": KONN_PANEL_MODEL_NAMES[self.model],
-                    "host": self.config_entry.data[CONF_HOST],
+                    "host": self.entry.data[CONF_HOST],
                 },
                 errors=errors,
             )
diff --git a/homeassistant/components/kostal_plenticore/sensor.py b/homeassistant/components/kostal_plenticore/sensor.py
index 67de34f2fce..fbbfb03fb3e 100644
--- a/homeassistant/components/kostal_plenticore/sensor.py
+++ b/homeassistant/components/kostal_plenticore/sensor.py
@@ -17,7 +17,6 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
-    EntityCategory,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -748,15 +747,6 @@ SENSOR_PROCESS_DATA = [
         state_class=SensorStateClass.TOTAL_INCREASING,
         formatter="format_energy",
     ),
-    PlenticoreSensorEntityDescription(
-        module_id="scb:event",
-        key="Event:ActiveErrorCnt",
-        name="Active Alarms",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-        icon="mdi:alert",
-        formatter="format_round",
-    ),
     PlenticoreSensorEntityDescription(
         module_id="_virt_",
         key="pv_P",
diff --git a/homeassistant/components/kraken/config_flow.py b/homeassistant/components/kraken/config_flow.py
index 54a817f0a50..67778515273 100644
--- a/homeassistant/components/kraken/config_flow.py
+++ b/homeassistant/components/kraken/config_flow.py
@@ -33,7 +33,7 @@ class KrakenConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> KrakenOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return KrakenOptionsFlowHandler()
+        return KrakenOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -53,6 +53,10 @@ class KrakenConfigFlow(ConfigFlow, domain=DOMAIN):
 class KrakenOptionsFlowHandler(OptionsFlow):
     """Handle Kraken client options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize Kraken options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/kraken/manifest.json b/homeassistant/components/kraken/manifest.json
index fed16a673b5..98347f7681b 100644
--- a/homeassistant/components/kraken/manifest.json
+++ b/homeassistant/components/kraken/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/kraken",
   "iot_class": "cloud_polling",
   "loggers": ["krakenex", "pykrakenapi"],
-  "requirements": ["krakenex==2.2.2", "pykrakenapi==0.1.8"]
+  "requirements": ["krakenex==2.1.0", "pykrakenapi==0.1.8"]
 }
diff --git a/homeassistant/components/lacrosse_view/manifest.json b/homeassistant/components/lacrosse_view/manifest.json
index 453a0855229..1cf8794237d 100644
--- a/homeassistant/components/lacrosse_view/manifest.json
+++ b/homeassistant/components/lacrosse_view/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/lacrosse_view",
   "iot_class": "cloud_polling",
   "loggers": ["lacrosse_view"],
-  "requirements": ["lacrosse-view==1.0.3"]
+  "requirements": ["lacrosse-view==1.0.2"]
 }
diff --git a/homeassistant/components/lamarzocco/__init__.py b/homeassistant/components/lamarzocco/__init__.py
index da513bc8cff..8df7a2f5d0e 100644
--- a/homeassistant/components/lamarzocco/__init__.py
+++ b/homeassistant/components/lamarzocco/__init__.py
@@ -2,12 +2,12 @@
 
 import logging
 
+from lmcloud.client_bluetooth import LaMarzoccoBluetoothClient
+from lmcloud.client_cloud import LaMarzoccoCloudClient
+from lmcloud.client_local import LaMarzoccoLocalClient
+from lmcloud.const import BT_MODEL_PREFIXES, FirmwareType
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
 from packaging import version
-from pylamarzocco.client_bluetooth import LaMarzoccoBluetoothClient
-from pylamarzocco.client_cloud import LaMarzoccoCloudClient
-from pylamarzocco.client_local import LaMarzoccoLocalClient
-from pylamarzocco.const import BT_MODEL_PREFIXES, FirmwareType
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
 
 from homeassistant.components.bluetooth import async_discovered_service_info
 from homeassistant.config_entries import ConfigEntry
@@ -26,7 +26,7 @@ from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import CONF_USE_BLUETOOTH, DOMAIN
-from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
+from .coordinator import LaMarzoccoUpdateCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -41,6 +41,8 @@ PLATFORMS = [
 
 _LOGGER = logging.getLogger(__name__)
 
+type LaMarzoccoConfigEntry = ConfigEntry[LaMarzoccoUpdateCoordinator]
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -> bool:
     """Set up La Marzocco as config entry."""
@@ -101,7 +103,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -
 
     coordinator = LaMarzoccoUpdateCoordinator(
         hass=hass,
-        entry=entry,
         local_client=local_client,
         cloud_client=cloud_client,
         bluetooth_client=bluetooth_client,
diff --git a/homeassistant/components/lamarzocco/binary_sensor.py b/homeassistant/components/lamarzocco/binary_sensor.py
index 444e4d0723b..81ac3672a0f 100644
--- a/homeassistant/components/lamarzocco/binary_sensor.py
+++ b/homeassistant/components/lamarzocco/binary_sensor.py
@@ -3,7 +3,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.models import LaMarzoccoMachineConfig
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -14,7 +14,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .coordinator import LaMarzoccoConfigEntry
+from . import LaMarzoccoConfigEntry
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription
 
 
diff --git a/homeassistant/components/lamarzocco/button.py b/homeassistant/components/lamarzocco/button.py
index ae79e21897f..56fcca98cb3 100644
--- a/homeassistant/components/lamarzocco/button.py
+++ b/homeassistant/components/lamarzocco/button.py
@@ -1,23 +1,21 @@
 """Button platform for La Marzocco espresso machines."""
 
-import asyncio
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from typing import Any
 
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import LaMarzoccoConfigEntry
 from .const import DOMAIN
-from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription
 
-BACKFLUSH_ENABLED_DURATION = 15
-
 
 @dataclass(frozen=True, kw_only=True)
 class LaMarzoccoButtonEntityDescription(
@@ -26,25 +24,14 @@ class LaMarzoccoButtonEntityDescription(
 ):
     """Description of a La Marzocco button."""
 
-    press_fn: Callable[[LaMarzoccoUpdateCoordinator], Coroutine[Any, Any, None]]
-
-
-async def async_backflush_and_update(coordinator: LaMarzoccoUpdateCoordinator) -> None:
-    """Press backflush button."""
-    await coordinator.device.start_backflush()
-    # lib will set state optimistically
-    coordinator.async_set_updated_data(None)
-    # backflush is enabled for 15 seconds
-    # then turns off automatically
-    await asyncio.sleep(BACKFLUSH_ENABLED_DURATION + 1)
-    await coordinator.async_request_refresh()
+    press_fn: Callable[[LaMarzoccoMachine], Coroutine[Any, Any, None]]
 
 
 ENTITIES: tuple[LaMarzoccoButtonEntityDescription, ...] = (
     LaMarzoccoButtonEntityDescription(
         key="start_backflush",
         translation_key="start_backflush",
-        press_fn=async_backflush_and_update,
+        press_fn=lambda machine: machine.start_backflush(),
     ),
 )
 
@@ -72,7 +59,7 @@ class LaMarzoccoButtonEntity(LaMarzoccoEntity, ButtonEntity):
     async def async_press(self) -> None:
         """Press button."""
         try:
-            await self.entity_description.press_fn(self.coordinator)
+            await self.entity_description.press_fn(self.coordinator.device)
         except RequestNotSuccessful as exc:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
@@ -81,3 +68,4 @@ class LaMarzoccoButtonEntity(LaMarzoccoEntity, ButtonEntity):
                     "key": self.entity_description.key,
                 },
             ) from exc
+        await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/lamarzocco/calendar.py b/homeassistant/components/lamarzocco/calendar.py
index 0ec9b55a9a1..8b3240ff7a1 100644
--- a/homeassistant/components/lamarzocco/calendar.py
+++ b/homeassistant/components/lamarzocco/calendar.py
@@ -3,14 +3,15 @@
 from collections.abc import Iterator
 from datetime import datetime, timedelta
 
-from pylamarzocco.models import LaMarzoccoWakeUpSleepEntry
+from lmcloud.models import LaMarzoccoWakeUpSleepEntry
 
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
+from . import LaMarzoccoConfigEntry
+from .coordinator import LaMarzoccoUpdateCoordinator
 from .entity import LaMarzoccoBaseEntity
 
 CALENDAR_KEY = "auto_on_off_schedule"
diff --git a/homeassistant/components/lamarzocco/config_flow.py b/homeassistant/components/lamarzocco/config_flow.py
index 04e705edbdc..438bf7fe6b9 100644
--- a/homeassistant/components/lamarzocco/config_flow.py
+++ b/homeassistant/components/lamarzocco/config_flow.py
@@ -1,22 +1,19 @@
 """Config flow for La Marzocco integration."""
 
-from __future__ import annotations
-
 from collections.abc import Mapping
 import logging
 from typing import Any
 
-from pylamarzocco.client_cloud import LaMarzoccoCloudClient
-from pylamarzocco.client_local import LaMarzoccoLocalClient
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
-from pylamarzocco.models import LaMarzoccoDeviceInfo
+from lmcloud.client_cloud import LaMarzoccoCloudClient
+from lmcloud.client_local import LaMarzoccoLocalClient
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
+from lmcloud.models import LaMarzoccoDeviceInfo
 import voluptuous as vol
 
 from homeassistant.components.bluetooth import (
     BluetoothServiceInfo,
     async_discovered_service_info,
 )
-from homeassistant.components.dhcp import DhcpServiceInfo
 from homeassistant.config_entries import (
     SOURCE_REAUTH,
     SOURCE_RECONFIGURE,
@@ -24,6 +21,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_HOST,
@@ -105,15 +103,6 @@ class LmConfigFlow(ConfigFlow, domain=DOMAIN):
                         errors["base"] = "machine_not_found"
                     else:
                         self._config = data
-                        # if DHCP discovery was used, auto fill machine selection
-                        if CONF_HOST in self._discovered:
-                            return await self.async_step_machine_selection(
-                                user_input={
-                                    CONF_HOST: self._discovered[CONF_HOST],
-                                    CONF_MACHINE: self._discovered[CONF_MACHINE],
-                                }
-                            )
-                        # if Bluetooth discovery was used, only select host
                         return self.async_show_form(
                             step_id="machine_selection",
                             data_schema=vol.Schema(
@@ -269,27 +258,6 @@ class LmConfigFlow(ConfigFlow, domain=DOMAIN):
 
         return await self.async_step_user()
 
-    async def async_step_dhcp(
-        self, discovery_info: DhcpServiceInfo
-    ) -> ConfigFlowResult:
-        """Handle discovery via dhcp."""
-
-        serial = discovery_info.hostname.upper()
-
-        await self.async_set_unique_id(serial)
-        self._abort_if_unique_id_configured()
-
-        _LOGGER.debug(
-            "Discovered La Marzocco machine %s through DHCP at address %s",
-            discovery_info.hostname,
-            discovery_info.ip,
-        )
-
-        self._discovered[CONF_MACHINE] = serial
-        self._discovered[CONF_HOST] = discovery_info.ip
-
-        return await self.async_step_user()
-
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
@@ -340,12 +308,12 @@ class LmConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> LmOptionsFlowHandler:
+    ) -> OptionsFlow:
         """Create the options flow."""
-        return LmOptionsFlowHandler()
+        return LmOptionsFlowHandler(config_entry)
 
 
-class LmOptionsFlowHandler(OptionsFlow):
+class LmOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handles options flow for the component."""
 
     async def async_step_init(
@@ -359,7 +327,7 @@ class LmOptionsFlowHandler(OptionsFlow):
             {
                 vol.Optional(
                     CONF_USE_BLUETOOTH,
-                    default=self.config_entry.options.get(CONF_USE_BLUETOOTH, True),
+                    default=self.options.get(CONF_USE_BLUETOOTH, True),
                 ): cv.boolean,
             }
         )
diff --git a/homeassistant/components/lamarzocco/coordinator.py b/homeassistant/components/lamarzocco/coordinator.py
index 05fee98c599..f255276b192 100644
--- a/homeassistant/components/lamarzocco/coordinator.py
+++ b/homeassistant/components/lamarzocco/coordinator.py
@@ -1,18 +1,16 @@
 """Coordinator for La Marzocco API."""
 
-from __future__ import annotations
-
 from collections.abc import Callable, Coroutine
 from datetime import timedelta
 import logging
 from time import time
 from typing import Any
 
-from pylamarzocco.client_bluetooth import LaMarzoccoBluetoothClient
-from pylamarzocco.client_cloud import LaMarzoccoCloudClient
-from pylamarzocco.client_local import LaMarzoccoLocalClient
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
+from lmcloud.client_bluetooth import LaMarzoccoBluetoothClient
+from lmcloud.client_cloud import LaMarzoccoCloudClient
+from lmcloud.client_local import LaMarzoccoLocalClient
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_MODEL, CONF_NAME, EVENT_HOMEASSISTANT_STOP
@@ -28,30 +26,21 @@ STATISTICS_UPDATE_INTERVAL = 300
 
 _LOGGER = logging.getLogger(__name__)
 
-type LaMarzoccoConfigEntry = ConfigEntry[LaMarzoccoUpdateCoordinator]
-
 
 class LaMarzoccoUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to handle fetching data from the La Marzocco API centrally."""
 
-    config_entry: LaMarzoccoConfigEntry
+    config_entry: ConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
-        entry: LaMarzoccoConfigEntry,
         cloud_client: LaMarzoccoCloudClient,
         local_client: LaMarzoccoLocalClient | None,
         bluetooth_client: LaMarzoccoBluetoothClient | None,
     ) -> None:
         """Initialize coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=entry,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
-        )
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
         self.local_connection_configured = local_client is not None
 
         assert self.config_entry.unique_id
diff --git a/homeassistant/components/lamarzocco/diagnostics.py b/homeassistant/components/lamarzocco/diagnostics.py
index 43ae51ee192..4293fdca615 100644
--- a/homeassistant/components/lamarzocco/diagnostics.py
+++ b/homeassistant/components/lamarzocco/diagnostics.py
@@ -5,12 +5,12 @@ from __future__ import annotations
 from dataclasses import asdict
 from typing import Any, TypedDict
 
-from pylamarzocco.const import FirmwareType
+from lmcloud.const import FirmwareType
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 
-from .coordinator import LaMarzoccoConfigEntry
+from . import LaMarzoccoConfigEntry
 
 TO_REDACT = {
     "serial_number",
diff --git a/homeassistant/components/lamarzocco/entity.py b/homeassistant/components/lamarzocco/entity.py
index 1ea84302a17..f7e6ff9e2b8 100644
--- a/homeassistant/components/lamarzocco/entity.py
+++ b/homeassistant/components/lamarzocco/entity.py
@@ -3,8 +3,8 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from pylamarzocco.const import FirmwareType
-from pylamarzocco.lm_machine import LaMarzoccoMachine
+from lmcloud.const import FirmwareType
+from lmcloud.lm_machine import LaMarzoccoMachine
 
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
diff --git a/homeassistant/components/lamarzocco/icons.json b/homeassistant/components/lamarzocco/icons.json
index 860da12ddd9..bc7d621d91d 100644
--- a/homeassistant/components/lamarzocco/icons.json
+++ b/homeassistant/components/lamarzocco/icons.json
@@ -43,9 +43,6 @@
       "preinfusion_off": {
         "default": "mdi:water"
       },
-      "smart_standby_time": {
-        "default": "mdi:timer"
-      },
       "steam_temp": {
         "default": "mdi:thermometer-water"
       },
@@ -54,13 +51,6 @@
       }
     },
     "select": {
-      "smart_standby_mode": {
-        "default": "mdi:power",
-        "state": {
-          "poweron": "mdi:power",
-          "lastbrewing": "mdi:coffee"
-        }
-      },
       "steam_temp_select": {
         "default": "mdi:thermometer",
         "state": {
@@ -110,12 +100,6 @@
           "off": "mdi:alarm-off"
         }
       },
-      "smart_standby_enabled": {
-        "state": {
-          "on": "mdi:sleep",
-          "off": "mdi:sleep-off"
-        }
-      },
       "steam_boiler": {
         "default": "mdi:water-boiler",
         "state": {
diff --git a/homeassistant/components/lamarzocco/manifest.json b/homeassistant/components/lamarzocco/manifest.json
index 6b226051118..a1da8982cd8 100644
--- a/homeassistant/components/lamarzocco/manifest.json
+++ b/homeassistant/components/lamarzocco/manifest.json
@@ -18,20 +18,9 @@
   "codeowners": ["@zweckj"],
   "config_flow": true,
   "dependencies": ["bluetooth_adapters"],
-  "dhcp": [
-    {
-      "hostname": "gs[0-9][0-9][0-9][0-9][0-9][0-9]"
-    },
-    {
-      "hostname": "lm[0-9][0-9][0-9][0-9][0-9][0-9]"
-    },
-    {
-      "hostname": "mr[0-9][0-9][0-9][0-9][0-9][0-9]"
-    }
-  ],
   "documentation": "https://www.home-assistant.io/integrations/lamarzocco",
   "integration_type": "device",
   "iot_class": "cloud_polling",
-  "loggers": ["pylamarzocco"],
-  "requirements": ["pylamarzocco==1.2.3"]
+  "loggers": ["lmcloud"],
+  "requirements": ["lmcloud==1.2.3"]
 }
diff --git a/homeassistant/components/lamarzocco/number.py b/homeassistant/components/lamarzocco/number.py
index 825c5d6deb0..e607d856193 100644
--- a/homeassistant/components/lamarzocco/number.py
+++ b/homeassistant/components/lamarzocco/number.py
@@ -4,16 +4,16 @@ from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from typing import Any
 
-from pylamarzocco.const import (
+from lmcloud.const import (
     KEYS_PER_MODEL,
     BoilerType,
     MachineModel,
     PhysicalKey,
     PrebrewMode,
 )
-from pylamarzocco.exceptions import RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoMachineConfig
 
 from homeassistant.components.number import (
     NumberDeviceClass,
@@ -31,8 +31,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import LaMarzoccoConfigEntry
 from .const import DOMAIN
-from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
+from .coordinator import LaMarzoccoUpdateCoordinator
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription
 
 
@@ -108,22 +109,6 @@ ENTITIES: tuple[LaMarzoccoNumberEntityDescription, ...] = (
             MachineModel.GS3_MP,
         ),
     ),
-    LaMarzoccoNumberEntityDescription(
-        key="smart_standby_time",
-        translation_key="smart_standby_time",
-        device_class=NumberDeviceClass.DURATION,
-        native_unit_of_measurement=UnitOfTime.MINUTES,
-        native_step=10,
-        native_min_value=10,
-        native_max_value=240,
-        entity_category=EntityCategory.CONFIG,
-        set_value_fn=lambda machine, value: machine.set_smart_standby(
-            enabled=machine.config.smart_standby.enabled,
-            mode=machine.config.smart_standby.mode,
-            minutes=int(value),
-        ),
-        native_value_fn=lambda config: config.smart_standby.minutes,
-    ),
 )
 
 
diff --git a/homeassistant/components/lamarzocco/select.py b/homeassistant/components/lamarzocco/select.py
index 1889ba38d6b..7a410796285 100644
--- a/homeassistant/components/lamarzocco/select.py
+++ b/homeassistant/components/lamarzocco/select.py
@@ -4,10 +4,10 @@ from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from typing import Any
 
-from pylamarzocco.const import MachineModel, PrebrewMode, SmartStandbyMode, SteamLevel
-from pylamarzocco.exceptions import RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.const import MachineModel, PrebrewMode, SteamLevel
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoMachineConfig
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.const import EntityCategory
@@ -15,8 +15,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import LaMarzoccoConfigEntry
 from .const import DOMAIN
-from .coordinator import LaMarzoccoConfigEntry
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription
 
 STEAM_LEVEL_HA_TO_LM = {
@@ -25,7 +25,11 @@ STEAM_LEVEL_HA_TO_LM = {
     "3": SteamLevel.LEVEL_3,
 }
 
-STEAM_LEVEL_LM_TO_HA = {value: key for key, value in STEAM_LEVEL_HA_TO_LM.items()}
+STEAM_LEVEL_LM_TO_HA = {
+    SteamLevel.LEVEL_1: "1",
+    SteamLevel.LEVEL_2: "2",
+    SteamLevel.LEVEL_3: "3",
+}
 
 PREBREW_MODE_HA_TO_LM = {
     "disabled": PrebrewMode.DISABLED,
@@ -33,15 +37,12 @@ PREBREW_MODE_HA_TO_LM = {
     "preinfusion": PrebrewMode.PREINFUSION,
 }
 
-PREBREW_MODE_LM_TO_HA = {value: key for key, value in PREBREW_MODE_HA_TO_LM.items()}
-
-STANDBY_MODE_HA_TO_LM = {
-    "power_on": SmartStandbyMode.POWER_ON,
-    "last_brewing": SmartStandbyMode.LAST_BREWING,
+PREBREW_MODE_LM_TO_HA = {
+    PrebrewMode.DISABLED: "disabled",
+    PrebrewMode.PREBREW: "prebrew",
+    PrebrewMode.PREINFUSION: "preinfusion",
 }
 
-STANDBY_MODE_LM_TO_HA = {value: key for key, value in STANDBY_MODE_HA_TO_LM.items()}
-
 
 @dataclass(frozen=True, kw_only=True)
 class LaMarzoccoSelectEntityDescription(
@@ -82,20 +83,6 @@ ENTITIES: tuple[LaMarzoccoSelectEntityDescription, ...] = (
             MachineModel.LINEA_MINI,
         ),
     ),
-    LaMarzoccoSelectEntityDescription(
-        key="smart_standby_mode",
-        translation_key="smart_standby_mode",
-        entity_category=EntityCategory.CONFIG,
-        options=["power_on", "last_brewing"],
-        select_option_fn=lambda machine, option: machine.set_smart_standby(
-            enabled=machine.config.smart_standby.enabled,
-            mode=STANDBY_MODE_HA_TO_LM[option],
-            minutes=machine.config.smart_standby.minutes,
-        ),
-        current_option_fn=lambda config: STANDBY_MODE_LM_TO_HA[
-            config.smart_standby.mode
-        ],
-    ),
 )
 
 
diff --git a/homeassistant/components/lamarzocco/sensor.py b/homeassistant/components/lamarzocco/sensor.py
index 04b095e798c..225f0a43c5c 100644
--- a/homeassistant/components/lamarzocco/sensor.py
+++ b/homeassistant/components/lamarzocco/sensor.py
@@ -3,8 +3,8 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from pylamarzocco.const import BoilerType, MachineModel, PhysicalKey
-from pylamarzocco.lm_machine import LaMarzoccoMachine
+from lmcloud.const import BoilerType, MachineModel, PhysicalKey
+from lmcloud.lm_machine import LaMarzoccoMachine
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -16,7 +16,7 @@ from homeassistant.const import EntityCategory, UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .coordinator import LaMarzoccoConfigEntry
+from . import LaMarzoccoConfigEntry
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription
 
 
diff --git a/homeassistant/components/lamarzocco/strings.json b/homeassistant/components/lamarzocco/strings.json
index 959dda265a9..6188b9d3d67 100644
--- a/homeassistant/components/lamarzocco/strings.json
+++ b/homeassistant/components/lamarzocco/strings.json
@@ -8,7 +8,6 @@
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "machine_not_found": "Discovered machine not found in given account",
       "no_machines": "No machines found in account",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
@@ -117,9 +116,6 @@
       "preinfusion_off_key": {
         "name": "Preinfusion time Key {key}"
       },
-      "smart_standby_time": {
-        "name": "Smart standby time"
-      },
       "steam_temp": {
         "name": "Steam target temperature"
       },
@@ -136,13 +132,6 @@
           "preinfusion": "Preinfusion"
         }
       },
-      "smart_standby_mode": {
-        "name": "Smart standby mode",
-        "state": {
-          "last_brewing": "Last brewing",
-          "power_on": "Power on"
-        }
-      },
       "steam_temp_select": {
         "name": "Steam level",
         "state": {
@@ -173,9 +162,6 @@
       "auto_on_off": {
         "name": "Auto on/off ({id})"
       },
-      "smart_standby_enabled": {
-        "name": "Smart standby enabled"
-      },
       "steam_boiler": {
         "name": "Steam boiler"
       }
diff --git a/homeassistant/components/lamarzocco/switch.py b/homeassistant/components/lamarzocco/switch.py
index f7690885f05..dda0f0f1d58 100644
--- a/homeassistant/components/lamarzocco/switch.py
+++ b/homeassistant/components/lamarzocco/switch.py
@@ -4,10 +4,10 @@ from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from typing import Any
 
-from pylamarzocco.const import BoilerType
-from pylamarzocco.exceptions import RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.const import BoilerType
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoMachineConfig
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.const import EntityCategory
@@ -15,8 +15,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import LaMarzoccoConfigEntry
 from .const import DOMAIN
-from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
+from .coordinator import LaMarzoccoUpdateCoordinator
 from .entity import LaMarzoccoBaseEntity, LaMarzoccoEntity, LaMarzoccoEntityDescription
 
 
@@ -45,17 +46,6 @@ ENTITIES: tuple[LaMarzoccoSwitchEntityDescription, ...] = (
         control_fn=lambda machine, state: machine.set_steam(state),
         is_on_fn=lambda config: config.boilers[BoilerType.STEAM].enabled,
     ),
-    LaMarzoccoSwitchEntityDescription(
-        key="smart_standby_enabled",
-        translation_key="smart_standby_enabled",
-        entity_category=EntityCategory.CONFIG,
-        control_fn=lambda machine, state: machine.set_smart_standby(
-            enabled=state,
-            mode=machine.config.smart_standby.mode,
-            minutes=machine.config.smart_standby.minutes,
-        ),
-        is_on_fn=lambda config: config.smart_standby.enabled,
-    ),
 )
 
 
diff --git a/homeassistant/components/lamarzocco/update.py b/homeassistant/components/lamarzocco/update.py
index 371ff679bae..0bf8ea3264f 100644
--- a/homeassistant/components/lamarzocco/update.py
+++ b/homeassistant/components/lamarzocco/update.py
@@ -3,8 +3,8 @@
 from dataclasses import dataclass
 from typing import Any
 
-from pylamarzocco.const import FirmwareType
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.const import FirmwareType
+from lmcloud.exceptions import RequestNotSuccessful
 
 from homeassistant.components.update import (
     UpdateDeviceClass,
@@ -17,8 +17,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import LaMarzoccoConfigEntry
 from .const import DOMAIN
-from .coordinator import LaMarzoccoConfigEntry
 from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription
 
 
diff --git a/homeassistant/components/landisgyr_heat_meter/strings.json b/homeassistant/components/landisgyr_heat_meter/strings.json
index 31f08ded79f..4bae2490006 100644
--- a/homeassistant/components/landisgyr_heat_meter/strings.json
+++ b/homeassistant/components/landisgyr_heat_meter/strings.json
@@ -12,9 +12,6 @@
         }
       }
     },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
diff --git a/homeassistant/components/lastfm/config_flow.py b/homeassistant/components/lastfm/config_flow.py
index 0e1f680dd63..c6ea120242d 100644
--- a/homeassistant/components/lastfm/config_flow.py
+++ b/homeassistant/components/lastfm/config_flow.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import callback
@@ -80,7 +80,7 @@ class LastFmConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> LastFmOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return LastFmOptionsFlowHandler()
+        return LastFmOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -155,7 +155,7 @@ class LastFmConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         )
 
 
-class LastFmOptionsFlowHandler(OptionsFlow):
+class LastFmOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """LastFm Options flow handler."""
 
     async def async_step_init(
@@ -163,25 +163,24 @@ class LastFmOptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Initialize form."""
         errors: dict[str, str] = {}
-        options = self.config_entry.options
         if user_input is not None:
             users, errors = validate_lastfm_users(
-                options[CONF_API_KEY], user_input[CONF_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={
-                        **options,
+                        **self.options,
                         CONF_USERS: user_input[CONF_USERS],
                     },
                 )
-        if options[CONF_MAIN_USER]:
+        if self.options[CONF_MAIN_USER]:
             try:
                 main_user, _ = get_lastfm_user(
-                    options[CONF_API_KEY],
-                    options[CONF_MAIN_USER],
+                    self.options[CONF_API_KEY],
+                    self.options[CONF_MAIN_USER],
                 )
                 friends_response = await self.hass.async_add_executor_job(
                     main_user.get_friends
@@ -207,6 +206,6 @@ class LastFmOptionsFlowHandler(OptionsFlow):
                         ),
                     }
                 ),
-                user_input or options,
+                user_input or self.options,
             ),
         )
diff --git a/homeassistant/components/launch_library/__init__.py b/homeassistant/components/launch_library/__init__.py
index 6bfd3bc9adf..66e7eb832fe 100644
--- a/homeassistant/components/launch_library/__init__.py
+++ b/homeassistant/components/launch_library/__init__.py
@@ -51,7 +51,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=async_update,
         update_interval=timedelta(hours=1),
diff --git a/homeassistant/components/lcn/__init__.py b/homeassistant/components/lcn/__init__.py
index eb26ef48e4e..a8d75fe5635 100644
--- a/homeassistant/components/lcn/__init__.py
+++ b/homeassistant/components/lcn/__init__.py
@@ -8,28 +8,23 @@ import logging
 import pypck
 from pypck.connection import PchkConnectionManager
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
     CONF_DEVICE_ID,
-    CONF_DOMAIN,
-    CONF_ENTITIES,
     CONF_IP_ADDRESS,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_USERNAME,
-    Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     ADD_ENTITIES_CALLBACKS,
     CONF_ACKNOWLEDGE,
     CONF_DIM_MODE,
-    CONF_DOMAIN_DATA,
     CONF_SK_NUM_TRIES,
-    CONF_TRANSITION,
     CONNECTION,
     DOMAIN,
     PLATFORMS,
@@ -39,29 +34,40 @@ from .helpers import (
     InputType,
     async_update_config_entry,
     generate_unique_id,
+    import_lcn_config,
     register_lcn_address_devices,
     register_lcn_host_device,
 )
-from .services import register_services
+from .schemas import CONFIG_SCHEMA  # noqa: F401
+from .services import SERVICES
 from .websocket import register_panel_and_ws_api
 
 _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 LCN component."""
-    hass.data.setdefault(DOMAIN, {})
+    if DOMAIN not in config:
+        return True
 
-    await register_services(hass)
-    await register_panel_and_ws_api(hass)
+    # initialize a config_flow for all LCN configurations read from
+    # configuration.yaml
+    config_entries_data = import_lcn_config(config[DOMAIN])
 
+    for config_entry_data in config_entries_data:
+        hass.async_create_task(
+            hass.config_entries.flow.async_init(
+                DOMAIN,
+                context={"source": SOURCE_IMPORT},
+                data=config_entry_data,
+            )
+        )
     return True
 
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up a connection to PCHK host from a config entry."""
+    hass.data.setdefault(DOMAIN, {})
     if config_entry.entry_id in hass.data[DOMAIN]:
         return False
 
@@ -121,6 +127,15 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     )
     lcn_connection.register_for_inputs(input_received)
 
+    # register service calls
+    for service_name, service in SERVICES:
+        if not hass.services.has_service(DOMAIN, service_name):
+            hass.services.async_register(
+                DOMAIN, service_name, service(hass).async_call_service, service.schema
+            )
+
+    await register_panel_and_ws_api(hass)
+
     return True
 
 
@@ -132,25 +147,15 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
         config_entry.minor_version,
     )
 
-    new_data = {**config_entry.data}
-
     if config_entry.version == 1:
-        # update to 1.2  (add acknowledge flag)
+        new_data = {**config_entry.data}
+
         if config_entry.minor_version < 2:
             new_data[CONF_ACKNOWLEDGE] = False
 
-        # update to 2.1  (fix transitions for lights and switches)
-        new_entities_data = [*new_data[CONF_ENTITIES]]
-        for entity in new_entities_data:
-            if entity[CONF_DOMAIN] in [Platform.LIGHT, Platform.SCENE]:
-                if entity[CONF_DOMAIN_DATA][CONF_TRANSITION] is None:
-                    entity[CONF_DOMAIN_DATA][CONF_TRANSITION] = 0
-                entity[CONF_DOMAIN_DATA][CONF_TRANSITION] /= 1000.0
-        new_data[CONF_ENTITIES] = new_entities_data
-
-    hass.config_entries.async_update_entry(
-        config_entry, data=new_data, minor_version=1, version=2
-    )
+        hass.config_entries.async_update_entry(
+            config_entry, data=new_data, minor_version=2, version=1
+        )
 
     _LOGGER.debug(
         "Migration to configuration version %s.%s successful",
@@ -171,6 +176,11 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
         host = hass.data[DOMAIN].pop(config_entry.entry_id)
         await host[CONNECTION].async_close()
 
+    # unregister service calls
+    if unload_ok and not hass.data[DOMAIN]:  # check if this is the last entry to unload
+        for service_name, _ in SERVICES:
+            hass.services.async_remove(DOMAIN, service_name)
+
     return unload_ok
 
 
diff --git a/homeassistant/components/lcn/binary_sensor.py b/homeassistant/components/lcn/binary_sensor.py
index d0ce4815f19..106e74fd060 100644
--- a/homeassistant/components/lcn/binary_sensor.py
+++ b/homeassistant/components/lcn/binary_sensor.py
@@ -5,21 +5,14 @@ from functools import partial
 
 import pypck
 
-from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.binary_sensor import (
     DOMAIN as DOMAIN_BINARY_SENSOR,
     BinarySensorEntity,
 )
-from homeassistant.components.script import scripts_with_entity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DOMAIN, CONF_ENTITIES, CONF_SOURCE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.issue_registry import (
-    IssueSeverity,
-    async_create_issue,
-    async_delete_issue,
-)
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -90,28 +83,11 @@ class LcnRegulatorLockSensor(LcnEntity, BinarySensorEntity):
     async def async_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
         await super().async_added_to_hass()
-
         if not self.device_connection.is_group:
             await self.device_connection.activate_status_request_handler(
                 self.setpoint_variable
             )
 
-        entity_automations = automations_with_entity(self.hass, self.entity_id)
-        entity_scripts = scripts_with_entity(self.hass, self.entity_id)
-        if entity_automations + entity_scripts:
-            async_create_issue(
-                self.hass,
-                DOMAIN,
-                f"deprecated_binary_sensor_{self.entity_id}",
-                breaks_in_ha_version="2025.5.0",
-                is_fixable=False,
-                severity=IssueSeverity.WARNING,
-                translation_key="deprecated_regulatorlock_sensor",
-                translation_placeholders={
-                    "entity": f"{DOMAIN_BINARY_SENSOR}.{self.name.lower().replace(' ', '_')}",
-                },
-            )
-
     async def async_will_remove_from_hass(self) -> None:
         """Run when entity will be removed from hass."""
         await super().async_will_remove_from_hass()
@@ -119,9 +95,6 @@ class LcnRegulatorLockSensor(LcnEntity, BinarySensorEntity):
             await self.device_connection.cancel_status_request_handler(
                 self.setpoint_variable
             )
-        async_delete_issue(
-            self.hass, DOMAIN, f"deprecated_binary_sensor_{self.entity_id}"
-        )
 
     def input_received(self, input_obj: InputType) -> None:
         """Set sensor value when LCN input object (command) is received."""
@@ -183,34 +156,14 @@ class LcnLockKeysSensor(LcnEntity, BinarySensorEntity):
     async def async_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
         await super().async_added_to_hass()
-
         if not self.device_connection.is_group:
             await self.device_connection.activate_status_request_handler(self.source)
 
-        entity_automations = automations_with_entity(self.hass, self.entity_id)
-        entity_scripts = scripts_with_entity(self.hass, self.entity_id)
-        if entity_automations + entity_scripts:
-            async_create_issue(
-                self.hass,
-                DOMAIN,
-                f"deprecated_binary_sensor_{self.entity_id}",
-                breaks_in_ha_version="2025.5.0",
-                is_fixable=False,
-                severity=IssueSeverity.WARNING,
-                translation_key="deprecated_keylock_sensor",
-                translation_placeholders={
-                    "entity": f"{DOMAIN_BINARY_SENSOR}.{self.name.lower().replace(' ', '_')}",
-                },
-            )
-
     async def async_will_remove_from_hass(self) -> None:
         """Run when entity will be removed from hass."""
         await super().async_will_remove_from_hass()
         if not self.device_connection.is_group:
             await self.device_connection.cancel_status_request_handler(self.source)
-        async_delete_issue(
-            self.hass, DOMAIN, f"deprecated_binary_sensor_{self.entity_id}"
-        )
 
     def input_received(self, input_obj: InputType) -> None:
         """Set sensor value when LCN input object (command) is received."""
diff --git a/homeassistant/components/lcn/config_flow.py b/homeassistant/components/lcn/config_flow.py
index 008265e62ae..ca72b1ca53f 100644
--- a/homeassistant/components/lcn/config_flow.py
+++ b/homeassistant/components/lcn/config_flow.py
@@ -9,6 +9,7 @@ import pypck
 import voluptuous as vol
 
 from homeassistant import config_entries
+from homeassistant.config_entries import ConfigFlowResult
 from homeassistant.const import (
     CONF_BASE,
     CONF_DEVICES,
@@ -19,12 +20,14 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_USERNAME,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType
 
 from . import PchkConnectionManager
 from .const import CONF_ACKNOWLEDGE, CONF_DIM_MODE, CONF_SK_NUM_TRIES, DIM_MODES, DOMAIN
+from .helpers import purge_device_registry, purge_entity_registry
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -107,8 +110,57 @@ async def validate_connection(data: ConfigType) -> str | None:
 class LcnFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a LCN config flow."""
 
-    VERSION = 2
-    MINOR_VERSION = 1
+    VERSION = 1
+    MINOR_VERSION = 2
+
+    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+        """Import existing configuration from LCN."""
+        # validate the imported connection parameters
+        if error := await validate_connection(import_data):
+            async_create_issue(
+                self.hass,
+                DOMAIN,
+                error,
+                is_fixable=False,
+                issue_domain=DOMAIN,
+                severity=IssueSeverity.ERROR,
+                translation_key=error,
+                translation_placeholders={
+                    "url": "/config/integrations/dashboard/add?domain=lcn"
+                },
+            )
+            return self.async_abort(reason=error)
+
+        async_create_issue(
+            self.hass,
+            HOMEASSISTANT_DOMAIN,
+            f"deprecated_yaml_{DOMAIN}",
+            breaks_in_ha_version="2024.12.0",
+            is_fixable=False,
+            is_persistent=False,
+            issue_domain=DOMAIN,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_yaml",
+            translation_placeholders={
+                "domain": DOMAIN,
+                "integration_title": "LCN",
+            },
+        )
+
+        # check if we already have a host with the same address configured
+        if entry := get_config_entry(self.hass, import_data):
+            entry.source = config_entries.SOURCE_IMPORT
+            # Cleanup entity and device registry, if we imported from configuration.yaml to
+            # remove orphans when entities were removed from configuration
+            purge_entity_registry(self.hass, entry.entry_id, import_data)
+            purge_device_registry(self.hass, entry.entry_id, import_data)
+
+            self.hass.config_entries.async_update_entry(entry, data=import_data)
+            return self.async_abort(reason="existing_configuration_updated")
+
+        return self.async_create_entry(
+            title=f"{import_data[CONF_HOST]}", data=import_data
+        )
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/lcn/const.py b/homeassistant/components/lcn/const.py
index 97aeeecd8b5..707d0f29ba3 100644
--- a/homeassistant/components/lcn/const.py
+++ b/homeassistant/components/lcn/const.py
@@ -42,7 +42,6 @@ CONF_LED = "led"
 CONF_KEYS = "keys"
 CONF_TIME = "time"
 CONF_TIME_UNIT = "time_unit"
-CONF_LOCK_TIME = "lock_time"
 CONF_TABLE = "table"
 CONF_ROW = "row"
 CONF_TEXT = "text"
diff --git a/homeassistant/components/lcn/helpers.py b/homeassistant/components/lcn/helpers.py
index 6a9c63ea212..7da047682ac 100644
--- a/homeassistant/components/lcn/helpers.py
+++ b/homeassistant/components/lcn/helpers.py
@@ -9,6 +9,7 @@ import re
 from typing import cast
 
 import pypck
+import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -18,12 +19,17 @@ from homeassistant.const import (
     CONF_DEVICES,
     CONF_DOMAIN,
     CONF_ENTITIES,
+    CONF_HOST,
+    CONF_IP_ADDRESS,
     CONF_LIGHTS,
     CONF_NAME,
+    CONF_PASSWORD,
+    CONF_PORT,
     CONF_RESOURCE,
     CONF_SENSORS,
     CONF_SOURCE,
     CONF_SWITCHES,
+    CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -31,13 +37,19 @@ from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     BINSENSOR_PORTS,
+    CONF_ACKNOWLEDGE,
     CONF_CLIMATES,
+    CONF_CONNECTIONS,
+    CONF_DIM_MODE,
+    CONF_DOMAIN_DATA,
     CONF_HARDWARE_SERIAL,
     CONF_HARDWARE_TYPE,
     CONF_OUTPUT,
     CONF_SCENES,
+    CONF_SK_NUM_TRIES,
     CONF_SOFTWARE_SERIAL,
     CONNECTION,
+    DEFAULT_NAME,
     DOMAIN,
     LED_PORTS,
     LOGICOP_PORTS,
@@ -134,6 +146,110 @@ def generate_unique_id(
     return unique_id
 
 
+def import_lcn_config(lcn_config: ConfigType) -> list[ConfigType]:
+    """Convert lcn settings from configuration.yaml to config_entries data.
+
+    Create a list of config_entry data structures like:
+
+    "data": {
+        "host": "pchk",
+        "ip_address": "192.168.2.41",
+        "port": 4114,
+        "username": "lcn",
+        "password": "lcn,
+        "sk_num_tries: 0,
+        "dim_mode: "STEPS200",
+        "acknowledge": False,
+        "devices": [
+            {
+                "address": (0, 7, False)
+                "name": "",
+                "hardware_serial": -1,
+                "software_serial": -1,
+                "hardware_type": -1
+            }, ...
+        ],
+        "entities": [
+            {
+                "address": (0, 7, False)
+                "name": "Light_Output1",
+                "resource": "output1",
+                "domain": "light",
+                "domain_data": {
+                    "output": "OUTPUT1",
+                    "dimmable": True,
+                    "transition": 5000.0
+                }
+            }, ...
+        ]
+    }
+    """
+    data = {}
+    for connection in lcn_config[CONF_CONNECTIONS]:
+        host = {
+            CONF_HOST: connection[CONF_NAME],
+            CONF_IP_ADDRESS: connection[CONF_HOST],
+            CONF_PORT: connection[CONF_PORT],
+            CONF_USERNAME: connection[CONF_USERNAME],
+            CONF_PASSWORD: connection[CONF_PASSWORD],
+            CONF_SK_NUM_TRIES: connection[CONF_SK_NUM_TRIES],
+            CONF_DIM_MODE: connection[CONF_DIM_MODE],
+            CONF_ACKNOWLEDGE: False,
+            CONF_DEVICES: [],
+            CONF_ENTITIES: [],
+        }
+        data[connection[CONF_NAME]] = host
+
+    for confkey, domain_config in lcn_config.items():
+        if confkey == CONF_CONNECTIONS:
+            continue
+        domain = DOMAIN_LOOKUP[confkey]
+        # loop over entities in configuration.yaml
+        for domain_data in domain_config:
+            # remove name and address from domain_data
+            entity_name = domain_data.pop(CONF_NAME)
+            address, host_name = domain_data.pop(CONF_ADDRESS)
+
+            if host_name is None:
+                host_name = DEFAULT_NAME
+
+            # check if we have a new device config
+            for device_config in data[host_name][CONF_DEVICES]:
+                if address == device_config[CONF_ADDRESS]:
+                    break
+            else:  # create new device_config
+                device_config = {
+                    CONF_ADDRESS: address,
+                    CONF_NAME: "",
+                    CONF_HARDWARE_SERIAL: -1,
+                    CONF_SOFTWARE_SERIAL: -1,
+                    CONF_HARDWARE_TYPE: -1,
+                }
+
+                data[host_name][CONF_DEVICES].append(device_config)
+
+            # insert entity config
+            resource = get_resource(domain, domain_data).lower()
+            for entity_config in data[host_name][CONF_ENTITIES]:
+                if (
+                    address == entity_config[CONF_ADDRESS]
+                    and resource == entity_config[CONF_RESOURCE]
+                    and domain == entity_config[CONF_DOMAIN]
+                ):
+                    break
+            else:  # create new entity_config
+                entity_config = {
+                    CONF_ADDRESS: address,
+                    CONF_NAME: entity_name,
+                    CONF_RESOURCE: resource,
+                    CONF_DOMAIN: domain,
+                    CONF_DOMAIN_DATA: domain_data.copy(),
+                }
+                data[host_name][CONF_ENTITIES].append(entity_config)
+
+    return list(data.values())
+
+
 def purge_entity_registry(
     hass: HomeAssistant, entry_id: str, imported_entry_data: ConfigType
 ) -> None:
@@ -320,6 +436,26 @@ def get_device_config(
     return None
 
 
+def has_unique_host_names(hosts: list[ConfigType]) -> list[ConfigType]:
+    """Validate that all connection names are unique.
+
+    Use 'pchk' as default connection_name (or add a numeric suffix if
+    pchk' is already in use.
+    """
+    suffix = 0
+    for host in hosts:
+        if host.get(CONF_NAME) is None:
+            if suffix == 0:
+                host[CONF_NAME] = DEFAULT_NAME
+            else:
+                host[CONF_NAME] = f"{DEFAULT_NAME}{suffix:d}"
+            suffix += 1
+
+    schema = vol.Schema(vol.Unique())
+    schema([host.get(CONF_NAME) for host in hosts])
+    return hosts
+
+
 def is_address(value: str) -> tuple[AddressType, str]:
     """Validate the given address string.
 
diff --git a/homeassistant/components/lcn/light.py b/homeassistant/components/lcn/light.py
index 9ec660325c8..943e3c69acf 100644
--- a/homeassistant/components/lcn/light.py
+++ b/homeassistant/components/lcn/light.py
@@ -90,7 +90,7 @@ class LcnOutputLight(LcnEntity, LightEntity):
         self.output = pypck.lcn_defs.OutputPort[config[CONF_DOMAIN_DATA][CONF_OUTPUT]]
 
         self._transition = pypck.lcn_defs.time_to_ramp_value(
-            config[CONF_DOMAIN_DATA][CONF_TRANSITION] * 1000.0
+            config[CONF_DOMAIN_DATA][CONF_TRANSITION]
         )
         self.dimmable = config[CONF_DOMAIN_DATA][CONF_DIMMABLE]
 
diff --git a/homeassistant/components/lcn/manifest.json b/homeassistant/components/lcn/manifest.json
index 695a35df871..8f6b59e0a04 100644
--- a/homeassistant/components/lcn/manifest.json
+++ b/homeassistant/components/lcn/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/lcn",
   "iot_class": "local_push",
   "loggers": ["pypck"],
-  "requirements": ["pypck==0.7.24", "lcn-frontend==0.2.2"]
+  "requirements": ["pypck==0.7.24", "lcn-frontend==0.1.6"]
 }
diff --git a/homeassistant/components/lcn/scene.py b/homeassistant/components/lcn/scene.py
index 0f40926cf17..241493ec108 100644
--- a/homeassistant/components/lcn/scene.py
+++ b/homeassistant/components/lcn/scene.py
@@ -87,7 +87,7 @@ class LcnScene(LcnEntity, Scene):
             self.transition = None
         else:
             self.transition = pypck.lcn_defs.time_to_ramp_value(
-                config[CONF_DOMAIN_DATA][CONF_TRANSITION] * 1000.0
+                config[CONF_DOMAIN_DATA][CONF_TRANSITION]
             )
 
     async def async_activate(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/lcn/schemas.py b/homeassistant/components/lcn/schemas.py
index c9c91b9843d..0539e83dea8 100644
--- a/homeassistant/components/lcn/schemas.py
+++ b/homeassistant/components/lcn/schemas.py
@@ -4,9 +4,20 @@ import voluptuous as vol
 
 from homeassistant.components.climate import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP
 from homeassistant.const import (
+    CONF_ADDRESS,
+    CONF_BINARY_SENSORS,
+    CONF_COVERS,
+    CONF_HOST,
+    CONF_LIGHTS,
+    CONF_NAME,
+    CONF_PASSWORD,
+    CONF_PORT,
     CONF_SCENE,
+    CONF_SENSORS,
     CONF_SOURCE,
+    CONF_SWITCHES,
     CONF_UNIT_OF_MEASUREMENT,
+    CONF_USERNAME,
     UnitOfTemperature,
 )
 import homeassistant.helpers.config_validation as cv
@@ -14,6 +25,9 @@ from homeassistant.helpers.typing import VolDictType
 
 from .const import (
     BINSENSOR_PORTS,
+    CONF_CLIMATES,
+    CONF_CONNECTIONS,
+    CONF_DIM_MODE,
     CONF_DIMMABLE,
     CONF_LOCKABLE,
     CONF_MAX_TEMP,
@@ -23,8 +37,12 @@ from .const import (
     CONF_OUTPUTS,
     CONF_REGISTER,
     CONF_REVERSE_TIME,
+    CONF_SCENES,
     CONF_SETPOINT,
+    CONF_SK_NUM_TRIES,
     CONF_TRANSITION,
+    DIM_MODES,
+    DOMAIN,
     KEYS,
     LED_PORTS,
     LOGICOP_PORTS,
@@ -38,6 +56,7 @@ from .const import (
     VAR_UNITS,
     VARIABLES,
 )
+from .helpers import has_unique_host_names, is_address
 
 ADDRESS_SCHEMA = vol.Coerce(tuple)
 
@@ -76,7 +95,7 @@ DOMAIN_DATA_LIGHT: VolDictType = {
     vol.Required(CONF_OUTPUT): vol.All(vol.Upper, vol.In(OUTPUT_PORTS + RELAY_PORTS)),
     vol.Optional(CONF_DIMMABLE, default=False): vol.Coerce(bool),
     vol.Optional(CONF_TRANSITION, default=0): vol.All(
-        vol.Coerce(float), vol.Range(min=0.0, max=486.0)
+        vol.Coerce(float), vol.Range(min=0.0, max=486.0), lambda value: value * 1000
     ),
 }
 
@@ -87,8 +106,13 @@ DOMAIN_DATA_SCENE: VolDictType = {
     vol.Optional(CONF_OUTPUTS, default=[]): vol.All(
         cv.ensure_list, [vol.All(vol.Upper, vol.In(OUTPUT_PORTS + RELAY_PORTS))]
     ),
-    vol.Optional(CONF_TRANSITION, default=0): vol.Any(
-        vol.All(vol.Coerce(int), vol.Range(min=0.0, max=486.0))
+    vol.Optional(CONF_TRANSITION, default=None): vol.Any(
+        vol.All(
+            vol.Coerce(int),
+            vol.Range(min=0.0, max=486.0),
+            lambda value: value * 1000,
+        ),
+        None,
     ),
 }
 
@@ -106,8 +130,73 @@ DOMAIN_DATA_SENSOR: VolDictType = {
 
 
 DOMAIN_DATA_SWITCH: VolDictType = {
-    vol.Required(CONF_OUTPUT): vol.All(
-        vol.Upper,
-        vol.In(OUTPUT_PORTS + RELAY_PORTS + SETPOINTS + KEYS),
-    ),
+    vol.Required(CONF_OUTPUT): vol.All(vol.Upper, vol.In(OUTPUT_PORTS + RELAY_PORTS)),
 }
+
+#
+# Configuration
+#
+
+DOMAIN_DATA_BASE: VolDictType = {
+    vol.Required(CONF_NAME): cv.string,
+    vol.Required(CONF_ADDRESS): is_address,
+}
+
+BINARY_SENSORS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_BINARY_SENSOR})
+
+CLIMATES_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_CLIMATE})
+
+COVERS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_COVER})
+
+LIGHTS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_LIGHT})
+
+SCENES_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_SCENE})
+
+SENSORS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_SENSOR})
+
+SWITCHES_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_SWITCH})
+
+CONNECTION_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_PORT): cv.port,
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_SK_NUM_TRIES, default=0): cv.positive_int,
+        vol.Optional(CONF_DIM_MODE, default="steps50"): vol.All(
+            vol.Upper, vol.In(DIM_MODES)
+        ),
+        vol.Optional(CONF_NAME): cv.string,
+    }
+)
+
+CONFIG_SCHEMA = vol.Schema(
+    vol.All(
+        cv.deprecated(DOMAIN),
+        {
+            DOMAIN: vol.Schema(
+                {
+                    vol.Required(CONF_CONNECTIONS): vol.All(
+                        cv.ensure_list, has_unique_host_names, [CONNECTION_SCHEMA]
+                    ),
+                    vol.Optional(CONF_BINARY_SENSORS): vol.All(
+                        cv.ensure_list, [BINARY_SENSORS_SCHEMA]
+                    ),
+                    vol.Optional(CONF_CLIMATES): vol.All(
+                        cv.ensure_list, [CLIMATES_SCHEMA]
+                    ),
+                    vol.Optional(CONF_COVERS): vol.All(cv.ensure_list, [COVERS_SCHEMA]),
+                    vol.Optional(CONF_LIGHTS): vol.All(cv.ensure_list, [LIGHTS_SCHEMA]),
+                    vol.Optional(CONF_SCENES): vol.All(cv.ensure_list, [SCENES_SCHEMA]),
+                    vol.Optional(CONF_SENSORS): vol.All(
+                        cv.ensure_list, [SENSORS_SCHEMA]
+                    ),
+                    vol.Optional(CONF_SWITCHES): vol.All(
+                        cv.ensure_list, [SWITCHES_SCHEMA]
+                    ),
+                },
+            )
+        },
+    ),
+    extra=vol.ALLOW_EXTRA,
+)
diff --git a/homeassistant/components/lcn/sensor.py b/homeassistant/components/lcn/sensor.py
index ada0857742c..5a360d44b8c 100644
--- a/homeassistant/components/lcn/sensor.py
+++ b/homeassistant/components/lcn/sensor.py
@@ -126,11 +126,7 @@ class LcnVariableSensor(LcnEntity, SensorEntity):
         ):
             return
 
-        is_regulator = self.variable.name in SETPOINTS
-        self._attr_native_value = input_obj.get_value().to_var_unit(
-            self.unit, is_regulator
-        )
-
+        self._attr_native_value = input_obj.get_value().to_var_unit(self.unit)
         self.async_write_ha_state()
 
 
diff --git a/homeassistant/components/lcn/services.py b/homeassistant/components/lcn/services.py
index 92f5863c47e..611a7353bcd 100644
--- a/homeassistant/components/lcn/services.py
+++ b/homeassistant/components/lcn/services.py
@@ -429,11 +429,3 @@ SERVICES = (
     (LcnService.DYN_TEXT, DynText),
     (LcnService.PCK, Pck),
 )
-
-
-async def register_services(hass: HomeAssistant) -> None:
-    """Register services for LCN."""
-    for service_name, service in SERVICES:
-        hass.services.async_register(
-            DOMAIN, service_name, service(hass).async_call_service, service.schema
-        )
diff --git a/homeassistant/components/lcn/strings.json b/homeassistant/components/lcn/strings.json
index 088a3654500..9b5ce8c9cc0 100644
--- a/homeassistant/components/lcn/strings.json
+++ b/homeassistant/components/lcn/strings.json
@@ -63,13 +63,17 @@
     }
   },
   "issues": {
-    "deprecated_regulatorlock_sensor": {
-      "title": "Deprecated LCN regulator lock binary sensor",
-      "description": "Your LCN regulator lock binary sensor entity `{entity}` is beeing used in automations or scripts. A regulator lock switch entity is available and should be used going forward.\n\nPlease adjust your automations or scripts to fix this issue."
+    "authentication_error": {
+      "title": "Authentication failed.",
+      "description": "Configuring LCN using YAML is being removed but there was an error importing your YAML configuration.\n\nEnsure username and password are correct.\n\nConsider removing the LCN YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
     },
-    "deprecated_keylock_sensor": {
-      "title": "Deprecated LCN key lock binary sensor",
-      "description": "Your LCN key lock binary sensor entity `{entity}` is beeing used in automations or scripts. A key lock switch entity is available and should be used going forward.\n\nPlease adjust your automations or scripts to fix this issue."
+    "license_error": {
+      "title": "Maximum number of connections was reached.",
+      "description": "Configuring LCN using YAML is being removed but there was an error importing your YAML configuration.\n\nEnsure sufficient PCHK licenses are registered and restart Home Assistant.\n\nConsider removing the LCN YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+    },
+    "connection_refused": {
+      "title": "Unable to connect to PCHK.",
+      "description": "Configuring LCN using YAML is being removed but there was an error importing your YAML configuration.\n\nEnsure the connection (IP and port) to the LCN bus coupler is correct.\n\nConsider removing the LCN YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
     }
   },
   "services": {
diff --git a/homeassistant/components/lcn/switch.py b/homeassistant/components/lcn/switch.py
index dd940bd38b3..6ad5977855e 100644
--- a/homeassistant/components/lcn/switch.py
+++ b/homeassistant/components/lcn/switch.py
@@ -19,8 +19,6 @@ from .const import (
     CONF_OUTPUT,
     DOMAIN,
     OUTPUT_PORTS,
-    RELAY_PORTS,
-    SETPOINTS,
 )
 from .entity import LcnEntity
 from .helpers import InputType
@@ -34,18 +32,12 @@ def add_lcn_switch_entities(
     entity_configs: Iterable[ConfigType],
 ) -> None:
     """Add entities for this domain."""
-    entities: list[
-        LcnOutputSwitch | LcnRelaySwitch | LcnRegulatorLockSwitch | LcnKeyLockSwitch
-    ] = []
+    entities: list[LcnOutputSwitch | LcnRelaySwitch] = []
     for entity_config in entity_configs:
         if entity_config[CONF_DOMAIN_DATA][CONF_OUTPUT] in OUTPUT_PORTS:
             entities.append(LcnOutputSwitch(entity_config, config_entry))
-        elif entity_config[CONF_DOMAIN_DATA][CONF_OUTPUT] in RELAY_PORTS:
+        else:  # in RELAY_PORTS
             entities.append(LcnRelaySwitch(entity_config, config_entry))
-        elif entity_config[CONF_DOMAIN_DATA][CONF_OUTPUT] in SETPOINTS:
-            entities.append(LcnRegulatorLockSwitch(entity_config, config_entry))
-        else:  # in KEYS
-            entities.append(LcnKeyLockSwitch(entity_config, config_entry))
 
     async_add_entities(entities)
 
@@ -172,118 +164,3 @@ class LcnRelaySwitch(LcnEntity, SwitchEntity):
 
         self._attr_is_on = input_obj.get_state(self.output.value)
         self.async_write_ha_state()
-
-
-class LcnRegulatorLockSwitch(LcnEntity, SwitchEntity):
-    """Representation of a LCN switch for regulator locks."""
-
-    _attr_is_on = False
-
-    def __init__(self, config: ConfigType, config_entry: ConfigEntry) -> None:
-        """Initialize the LCN switch."""
-        super().__init__(config, config_entry)
-
-        self.setpoint_variable = pypck.lcn_defs.Var[
-            config[CONF_DOMAIN_DATA][CONF_OUTPUT]
-        ]
-        self.reg_id = pypck.lcn_defs.Var.to_set_point_id(self.setpoint_variable)
-
-    async def async_added_to_hass(self) -> None:
-        """Run when entity about to be added to hass."""
-        await super().async_added_to_hass()
-        if not self.device_connection.is_group:
-            await self.device_connection.activate_status_request_handler(
-                self.setpoint_variable
-            )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Run when entity will be removed from hass."""
-        await super().async_will_remove_from_hass()
-        if not self.device_connection.is_group:
-            await self.device_connection.cancel_status_request_handler(
-                self.setpoint_variable
-            )
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the entity on."""
-        if not await self.device_connection.lock_regulator(self.reg_id, True):
-            return
-        self._attr_is_on = True
-        self.async_write_ha_state()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the entity off."""
-        if not await self.device_connection.lock_regulator(self.reg_id, False):
-            return
-        self._attr_is_on = False
-        self.async_write_ha_state()
-
-    def input_received(self, input_obj: InputType) -> None:
-        """Set switch state when LCN input object (command) is received."""
-        if (
-            not isinstance(input_obj, pypck.inputs.ModStatusVar)
-            or input_obj.get_var() != self.setpoint_variable
-        ):
-            return
-
-        self._attr_is_on = input_obj.get_value().is_locked_regulator()
-        self.async_write_ha_state()
-
-
-class LcnKeyLockSwitch(LcnEntity, SwitchEntity):
-    """Representation of a LCN switch for key locks."""
-
-    _attr_is_on = False
-
-    def __init__(self, config: ConfigType, config_entry: ConfigEntry) -> None:
-        """Initialize the LCN switch."""
-        super().__init__(config, config_entry)
-
-        self.key = pypck.lcn_defs.Key[config[CONF_DOMAIN_DATA][CONF_OUTPUT]]
-        self.table_id = ord(self.key.name[0]) - 65
-        self.key_id = int(self.key.name[1]) - 1
-
-    async def async_added_to_hass(self) -> None:
-        """Run when entity about to be added to hass."""
-        await super().async_added_to_hass()
-        if not self.device_connection.is_group:
-            await self.device_connection.activate_status_request_handler(self.key)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Run when entity will be removed from hass."""
-        await super().async_will_remove_from_hass()
-        if not self.device_connection.is_group:
-            await self.device_connection.cancel_status_request_handler(self.key)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the entity on."""
-        states = [pypck.lcn_defs.KeyLockStateModifier.NOCHANGE] * 8
-        states[self.key_id] = pypck.lcn_defs.KeyLockStateModifier.ON
-
-        if not await self.device_connection.lock_keys(self.table_id, states):
-            return
-
-        self._attr_is_on = True
-        self.async_write_ha_state()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the entity off."""
-        states = [pypck.lcn_defs.KeyLockStateModifier.NOCHANGE] * 8
-        states[self.key_id] = pypck.lcn_defs.KeyLockStateModifier.OFF
-
-        if not await self.device_connection.lock_keys(self.table_id, states):
-            return
-
-        self._attr_is_on = False
-        self.async_write_ha_state()
-
-    def input_received(self, input_obj: InputType) -> None:
-        """Set switch state when LCN input object (command) is received."""
-        if (
-            not isinstance(input_obj, pypck.inputs.ModStatusKeyLocks)
-            or self.key not in pypck.lcn_defs.Key
-        ):
-            return
-
-        self._attr_is_on = input_obj.get_state(self.table_id, self.key_id)
-        self.async_write_ha_state()
diff --git a/homeassistant/components/led_ble/__init__.py b/homeassistant/components/led_ble/__init__.py
index 84d7369d706..d09f88b145a 100644
--- a/homeassistant/components/led_ble/__init__.py
+++ b/homeassistant/components/led_ble/__init__.py
@@ -66,7 +66,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=led_ble.name,
         update_method=_async_update,
         update_interval=timedelta(seconds=UPDATE_SECONDS),
diff --git a/homeassistant/components/lektrico/__init__.py b/homeassistant/components/lektrico/__init__.py
index 475b6132541..0691bfef72a 100644
--- a/homeassistant/components/lektrico/__init__.py
+++ b/homeassistant/components/lektrico/__init__.py
@@ -12,11 +12,9 @@ from .coordinator import LektricoDeviceDataUpdateCoordinator
 
 # List the platforms that charger supports.
 CHARGERS_PLATFORMS: list[Platform] = [
-    Platform.BINARY_SENSOR,
     Platform.BUTTON,
     Platform.NUMBER,
     Platform.SENSOR,
-    Platform.SWITCH,
 ]
 
 # List the platforms that load balancer device supports.
diff --git a/homeassistant/components/lektrico/binary_sensor.py b/homeassistant/components/lektrico/binary_sensor.py
deleted file mode 100644
index d0a3e39690c..00000000000
--- a/homeassistant/components/lektrico/binary_sensor.py
+++ /dev/null
@@ -1,139 +0,0 @@
-"""Support for Lektrico binary sensors entities."""
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
-from .entity import LektricoEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class LektricoBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Describes Lektrico binary sensor entity."""
-
-    value_fn: Callable[[dict[str, Any]], bool]
-
-
-BINARY_SENSORS: tuple[LektricoBinarySensorEntityDescription, ...] = (
-    LektricoBinarySensorEntityDescription(
-        key="state_e_activated",
-        translation_key="state_e_activated",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["state_e_activated"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="overtemp",
-        translation_key="overtemp",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["overtemp"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="critical_temp",
-        translation_key="critical_temp",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["critical_temp"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="overcurrent",
-        translation_key="overcurrent",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["overcurrent"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="meter_fault",
-        translation_key="meter_fault",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["meter_fault"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="undervoltage",
-        translation_key="undervoltage",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["undervoltage_error"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="overvoltage",
-        translation_key="overvoltage",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["overvoltage_error"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="rcd_error",
-        translation_key="rcd_error",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["rcd_error"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="cp_diode_failure",
-        translation_key="cp_diode_failure",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["cp_diode_failure"]),
-    ),
-    LektricoBinarySensorEntityDescription(
-        key="contactor_failure",
-        translation_key="contactor_failure",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda data: bool(data["contactor_failure"]),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Lektrico binary sensor entities based on a config entry."""
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        LektricoBinarySensor(
-            description,
-            coordinator,
-            f"{entry.data[CONF_TYPE]}_{entry.data[ATTR_SERIAL_NUMBER]}",
-        )
-        for description in BINARY_SENSORS
-    )
-
-
-class LektricoBinarySensor(LektricoEntity, BinarySensorEntity):
-    """Defines a Lektrico binary sensor entity."""
-
-    entity_description: LektricoBinarySensorEntityDescription
-
-    def __init__(
-        self,
-        description: LektricoBinarySensorEntityDescription,
-        coordinator: LektricoDeviceDataUpdateCoordinator,
-        device_name: str,
-    ) -> None:
-        """Initialize Lektrico binary sensor."""
-        super().__init__(coordinator, device_name)
-        self.entity_description = description
-        self._coordinator = coordinator
-        self._attr_unique_id = f"{coordinator.serial_number}_{description.key}"
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the binary sensor."""
-        return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/lektrico/manifest.json b/homeassistant/components/lektrico/manifest.json
index d34915d66ba..d96b8cc4b69 100644
--- a/homeassistant/components/lektrico/manifest.json
+++ b/homeassistant/components/lektrico/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/lektrico",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["lektricowifi==0.0.43"],
+  "requirements": ["lektricowifi==0.0.42"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/lektrico/sensor.py b/homeassistant/components/lektrico/sensor.py
index d55d91c4cd4..a26a3676d8b 100644
--- a/homeassistant/components/lektrico/sensor.py
+++ b/homeassistant/components/lektrico/sensor.py
@@ -62,13 +62,11 @@ SENSORS_FOR_CHARGERS: tuple[LektricoSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.ENUM,
         options=[
             "available",
-            "charging",
             "connected",
-            "error",
-            "locked",
             "need_auth",
             "paused",
-            "paused_by_scheduler",
+            "charging",
+            "error",
             "updating_firmware",
         ],
         translation_key="state",
diff --git a/homeassistant/components/lektrico/strings.json b/homeassistant/components/lektrico/strings.json
index e24700c9b09..b749ea23490 100644
--- a/homeassistant/components/lektrico/strings.json
+++ b/homeassistant/components/lektrico/strings.json
@@ -22,38 +22,6 @@
     }
   },
   "entity": {
-    "binary_sensor": {
-      "state_e_activated": {
-        "name": "Ev error"
-      },
-      "overtemp": {
-        "name": "Thermal throttling"
-      },
-      "critical_temp": {
-        "name": "Overheating"
-      },
-      "overcurrent": {
-        "name": "Overcurrent"
-      },
-      "meter_fault": {
-        "name": "Metering error"
-      },
-      "undervoltage": {
-        "name": "Undervoltage"
-      },
-      "overvoltage": {
-        "name": "Overvoltage"
-      },
-      "rcd_error": {
-        "name": "Rcd error"
-      },
-      "cp_diode_failure": {
-        "name": "Ev diode short"
-      },
-      "contactor_failure": {
-        "name": "Relay contacts welded"
-      }
-    },
     "button": {
       "charge_start": {
         "name": "Charge start"
@@ -86,13 +54,11 @@
         "name": "State",
         "state": {
           "available": "Available",
-          "charging": "Charging",
           "connected": "Connected",
-          "error": "Error",
-          "locked": "Locked",
           "need_auth": "Waiting for authentication",
           "paused": "Paused",
-          "paused_by_scheduler": "Paused by scheduler",
+          "charging": "Charging",
+          "error": "Error",
           "updating_firmware": "Updating firmware"
         }
       },
@@ -160,17 +126,6 @@
       "pf_l3": {
         "name": "Power factor L3"
       }
-    },
-    "switch": {
-      "authentication": {
-        "name": "Authentication"
-      },
-      "force_single_phase": {
-        "name": "Force single phase"
-      },
-      "lock": {
-        "name": "Lock"
-      }
     }
   }
 }
diff --git a/homeassistant/components/lektrico/switch.py b/homeassistant/components/lektrico/switch.py
deleted file mode 100644
index 0fdfbd2ad41..00000000000
--- a/homeassistant/components/lektrico/switch.py
+++ /dev/null
@@ -1,116 +0,0 @@
-"""Support for Lektrico switch entities."""
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from typing import Any
-
-from lektricowifi import Device
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
-from .entity import LektricoEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class LektricoSwitchEntityDescription(SwitchEntityDescription):
-    """Describes Lektrico switch entity."""
-
-    value_fn: Callable[[dict[str, Any]], bool]
-    set_value_fn: Callable[[Device, dict[Any, Any], bool], Coroutine[Any, Any, Any]]
-
-
-SWITCHS_FOR_ALL_CHARGERS: tuple[LektricoSwitchEntityDescription, ...] = (
-    LektricoSwitchEntityDescription(
-        key="authentication",
-        translation_key="authentication",
-        entity_category=EntityCategory.CONFIG,
-        value_fn=lambda data: bool(data["require_auth"]),
-        set_value_fn=lambda device, data, value: device.set_auth(not value),
-    ),
-    LektricoSwitchEntityDescription(
-        key="lock",
-        translation_key="lock",
-        entity_category=EntityCategory.CONFIG,
-        value_fn=lambda data: str(data["charger_state"]) == "locked",
-        set_value_fn=lambda device, data, value: device.set_charger_locked(value),
-    ),
-)
-
-
-SWITCHS_FOR_3_PHASE_CHARGERS: tuple[LektricoSwitchEntityDescription, ...] = (
-    LektricoSwitchEntityDescription(
-        key="force_single_phase",
-        translation_key="force_single_phase",
-        entity_category=EntityCategory.CONFIG,
-        value_fn=lambda data: data["relay_mode"] == 1,
-        set_value_fn=lambda device, data, value: (
-            device.set_relay_mode(data["dynamic_current"], 1)
-            if value
-            else device.set_relay_mode(data["dynamic_current"], 3)
-        ),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: LektricoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Lektrico switch entities based on a config entry."""
-    coordinator = entry.runtime_data
-
-    switchs_to_be_used: tuple[LektricoSwitchEntityDescription, ...]
-    if coordinator.device_type == Device.TYPE_3P22K:
-        switchs_to_be_used = SWITCHS_FOR_ALL_CHARGERS + SWITCHS_FOR_3_PHASE_CHARGERS
-    else:
-        switchs_to_be_used = SWITCHS_FOR_ALL_CHARGERS
-
-    async_add_entities(
-        LektricoSwitch(
-            description,
-            coordinator,
-            f"{entry.data[CONF_TYPE]}_{entry.data[ATTR_SERIAL_NUMBER]}",
-        )
-        for description in switchs_to_be_used
-    )
-
-
-class LektricoSwitch(LektricoEntity, SwitchEntity):
-    """Defines a Lektrico switch entity."""
-
-    entity_description: LektricoSwitchEntityDescription
-
-    def __init__(
-        self,
-        description: LektricoSwitchEntityDescription,
-        coordinator: LektricoDeviceDataUpdateCoordinator,
-        device_name: str,
-    ) -> None:
-        """Initialize Lektrico switch."""
-        super().__init__(coordinator, device_name)
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.serial_number}_{description.key}"
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the switch."""
-        return self.entity_description.value_fn(self.coordinator.data)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        await self.entity_description.set_value_fn(
-            self.coordinator.device, self.coordinator.data, True
-        )
-        await self.coordinator.async_request_refresh()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        await self.entity_description.set_value_fn(
-            self.coordinator.device, self.coordinator.data, False
-        )
-        await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/lg_thinq/__init__.py b/homeassistant/components/lg_thinq/__init__.py
deleted file mode 100644
index a8d3fe175ef..00000000000
--- a/homeassistant/components/lg_thinq/__init__.py
+++ /dev/null
@@ -1,166 +0,0 @@
-"""Support for LG ThinQ Connect device."""
-
-from __future__ import annotations
-
-import asyncio
-from dataclasses import dataclass, field
-import logging
-
-from thinqconnect import ThinQApi, ThinQAPIException
-from thinqconnect.integration import async_get_ha_bridge_list
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_ACCESS_TOKEN,
-    CONF_COUNTRY,
-    EVENT_HOMEASSISTANT_STOP,
-    Platform,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.event import async_track_time_interval
-
-from .const import CONF_CONNECT_CLIENT_ID, MQTT_SUBSCRIPTION_INTERVAL
-from .coordinator import DeviceDataUpdateCoordinator, async_setup_device_coordinator
-from .mqtt import ThinQMQTT
-
-
-@dataclass(kw_only=True)
-class ThinqData:
-    """A class that holds runtime data."""
-
-    coordinators: dict[str, DeviceDataUpdateCoordinator] = field(default_factory=dict)
-    mqtt_client: ThinQMQTT | None = None
-
-
-type ThinqConfigEntry = ConfigEntry[ThinqData]
-
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.CLIMATE,
-    Platform.EVENT,
-    Platform.FAN,
-    Platform.NUMBER,
-    Platform.SELECT,
-    Platform.SENSOR,
-    Platform.SWITCH,
-    Platform.VACUUM,
-]
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ThinqConfigEntry) -> bool:
-    """Set up an entry."""
-    entry.runtime_data = ThinqData()
-
-    access_token = entry.data[CONF_ACCESS_TOKEN]
-    client_id = entry.data[CONF_CONNECT_CLIENT_ID]
-    country_code = entry.data[CONF_COUNTRY]
-
-    thinq_api = ThinQApi(
-        session=async_get_clientsession(hass),
-        access_token=access_token,
-        country_code=country_code,
-        client_id=client_id,
-    )
-
-    # Setup coordinators and register devices.
-    await async_setup_coordinators(hass, entry, thinq_api)
-
-    # Set up all platforms for this device/entry.
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    # Set up MQTT connection.
-    await async_setup_mqtt(hass, entry, thinq_api, client_id)
-
-    # Clean up devices they are no longer in use.
-    async_cleanup_device_registry(hass, entry)
-
-    return True
-
-
-async def async_setup_coordinators(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    thinq_api: ThinQApi,
-) -> None:
-    """Set up coordinators and register devices."""
-    # Get a list of ha bridge.
-    try:
-        bridge_list = await async_get_ha_bridge_list(thinq_api)
-    except ThinQAPIException as exc:
-        raise ConfigEntryNotReady(exc.message) from exc
-
-    if not bridge_list:
-        return
-
-    # Setup coordinator per device.
-    task_list = [
-        hass.async_create_task(async_setup_device_coordinator(hass, bridge))
-        for bridge in bridge_list
-    ]
-    task_result = await asyncio.gather(*task_list)
-    for coordinator in task_result:
-        entry.runtime_data.coordinators[coordinator.unique_id] = coordinator
-
-
-@callback
-def async_cleanup_device_registry(hass: HomeAssistant, entry: ThinqConfigEntry) -> None:
-    """Clean up device registry."""
-    new_device_unique_ids = [
-        coordinator.unique_id
-        for coordinator in entry.runtime_data.coordinators.values()
-    ]
-    device_registry = dr.async_get(hass)
-    existing_entries = dr.async_entries_for_config_entry(
-        device_registry, entry.entry_id
-    )
-
-    # Remove devices that are no longer exist.
-    for old_entry in existing_entries:
-        old_unique_id = next(iter(old_entry.identifiers))[1]
-        if old_unique_id not in new_device_unique_ids:
-            device_registry.async_remove_device(old_entry.id)
-            _LOGGER.debug("Remove device_registry: device_id=%s", old_entry.id)
-
-
-async def async_setup_mqtt(
-    hass: HomeAssistant, entry: ThinqConfigEntry, thinq_api: ThinQApi, client_id: str
-) -> None:
-    """Set up MQTT connection."""
-    mqtt_client = ThinQMQTT(hass, thinq_api, client_id, entry.runtime_data.coordinators)
-    entry.runtime_data.mqtt_client = mqtt_client
-
-    # Try to connect.
-    result = await mqtt_client.async_connect()
-    if not result:
-        _LOGGER.error("Failed to set up mqtt connection")
-        return
-
-    # Ready to subscribe.
-    await mqtt_client.async_start_subscribes()
-
-    entry.async_on_unload(
-        async_track_time_interval(
-            hass,
-            mqtt_client.async_refresh_subscribe,
-            MQTT_SUBSCRIPTION_INTERVAL,
-            cancel_on_shutdown=True,
-        )
-    )
-    entry.async_on_unload(
-        hass.bus.async_listen_once(
-            EVENT_HOMEASSISTANT_STOP, mqtt_client.async_disconnect
-        )
-    )
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ThinqConfigEntry) -> bool:
-    """Unload the entry."""
-    if entry.runtime_data.mqtt_client:
-        await entry.runtime_data.mqtt_client.async_disconnect()
-
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/lg_thinq/binary_sensor.py b/homeassistant/components/lg_thinq/binary_sensor.py
deleted file mode 100644
index 845bf8c3079..00000000000
--- a/homeassistant/components/lg_thinq/binary_sensor.py
+++ /dev/null
@@ -1,181 +0,0 @@
-"""Support for binary sensor entities."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-import logging
-
-from thinqconnect import DeviceType
-from thinqconnect.devices.const import Property as ThinQProperty
-from thinqconnect.integration import ActiveMode
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ThinqConfigEntry
-from .entity import ThinQEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class ThinQBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Describes ThinQ sensor entity."""
-
-    on_key: str | None = None
-
-
-BINARY_SENSOR_DESC: dict[ThinQProperty, ThinQBinarySensorEntityDescription] = {
-    ThinQProperty.RINSE_REFILL: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.RINSE_REFILL,
-        translation_key=ThinQProperty.RINSE_REFILL,
-    ),
-    ThinQProperty.ECO_FRIENDLY_MODE: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.ECO_FRIENDLY_MODE,
-        translation_key=ThinQProperty.ECO_FRIENDLY_MODE,
-    ),
-    ThinQProperty.POWER_SAVE_ENABLED: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.POWER_SAVE_ENABLED,
-        translation_key=ThinQProperty.POWER_SAVE_ENABLED,
-    ),
-    ThinQProperty.REMOTE_CONTROL_ENABLED: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.REMOTE_CONTROL_ENABLED,
-        translation_key=ThinQProperty.REMOTE_CONTROL_ENABLED,
-    ),
-    ThinQProperty.SABBATH_MODE: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.SABBATH_MODE,
-        translation_key=ThinQProperty.SABBATH_MODE,
-    ),
-    ThinQProperty.DOOR_STATE: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.DOOR_STATE,
-        device_class=BinarySensorDeviceClass.DOOR,
-        on_key="open",
-    ),
-    ThinQProperty.MACHINE_CLEAN_REMINDER: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.MACHINE_CLEAN_REMINDER,
-        translation_key=ThinQProperty.MACHINE_CLEAN_REMINDER,
-        on_key="mcreminder_on",
-    ),
-    ThinQProperty.SIGNAL_LEVEL: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.SIGNAL_LEVEL,
-        translation_key=ThinQProperty.SIGNAL_LEVEL,
-        on_key="signallevel_on",
-    ),
-    ThinQProperty.CLEAN_LIGHT_REMINDER: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.CLEAN_LIGHT_REMINDER,
-        translation_key=ThinQProperty.CLEAN_LIGHT_REMINDER,
-        on_key="cleanlreminder_on",
-    ),
-    ThinQProperty.HOOD_OPERATION_MODE: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.HOOD_OPERATION_MODE,
-        translation_key="operation_mode",
-        on_key="power_on",
-    ),
-    ThinQProperty.WATER_HEATER_OPERATION_MODE: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.WATER_HEATER_OPERATION_MODE,
-        translation_key="operation_mode",
-        on_key="power_on",
-    ),
-    ThinQProperty.ONE_TOUCH_FILTER: ThinQBinarySensorEntityDescription(
-        key=ThinQProperty.ONE_TOUCH_FILTER,
-        translation_key=ThinQProperty.ONE_TOUCH_FILTER,
-        on_key="on",
-    ),
-}
-
-DEVICE_TYPE_BINARY_SENSOR_MAP: dict[
-    DeviceType, tuple[ThinQBinarySensorEntityDescription, ...]
-] = {
-    DeviceType.COOKTOP: (BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],),
-    DeviceType.DISH_WASHER: (
-        BINARY_SENSOR_DESC[ThinQProperty.DOOR_STATE],
-        BINARY_SENSOR_DESC[ThinQProperty.RINSE_REFILL],
-        BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],
-        BINARY_SENSOR_DESC[ThinQProperty.MACHINE_CLEAN_REMINDER],
-        BINARY_SENSOR_DESC[ThinQProperty.SIGNAL_LEVEL],
-        BINARY_SENSOR_DESC[ThinQProperty.CLEAN_LIGHT_REMINDER],
-    ),
-    DeviceType.DRYER: (BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],),
-    DeviceType.HOOD: (BINARY_SENSOR_DESC[ThinQProperty.HOOD_OPERATION_MODE],),
-    DeviceType.OVEN: (BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],),
-    DeviceType.REFRIGERATOR: (
-        BINARY_SENSOR_DESC[ThinQProperty.DOOR_STATE],
-        BINARY_SENSOR_DESC[ThinQProperty.ECO_FRIENDLY_MODE],
-        BINARY_SENSOR_DESC[ThinQProperty.POWER_SAVE_ENABLED],
-        BINARY_SENSOR_DESC[ThinQProperty.SABBATH_MODE],
-    ),
-    DeviceType.KIMCHI_REFRIGERATOR: (
-        BINARY_SENSOR_DESC[ThinQProperty.ONE_TOUCH_FILTER],
-    ),
-    DeviceType.STYLER: (BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],),
-    DeviceType.WASHCOMBO_MAIN: (
-        BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],
-    ),
-    DeviceType.WASHCOMBO_MINI: (
-        BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],
-    ),
-    DeviceType.WASHER: (BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],),
-    DeviceType.WASHTOWER_DRYER: (
-        BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],
-    ),
-    DeviceType.WASHTOWER: (BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],),
-    DeviceType.WASHTOWER_WASHER: (
-        BINARY_SENSOR_DESC[ThinQProperty.REMOTE_CONTROL_ENABLED],
-    ),
-    DeviceType.WATER_HEATER: (
-        BINARY_SENSOR_DESC[ThinQProperty.WATER_HEATER_OPERATION_MODE],
-    ),
-    DeviceType.WINE_CELLAR: (BINARY_SENSOR_DESC[ThinQProperty.SABBATH_MODE],),
-}
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for binary sensor platform."""
-    entities: list[ThinQBinarySensorEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_BINARY_SENSOR_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQBinarySensorEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(
-                        description.key, ActiveMode.READ_ONLY
-                    )
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQBinarySensorEntity(ThinQEntity, BinarySensorEntity):
-    """Represent a thinq binary sensor platform."""
-
-    entity_description: ThinQBinarySensorEntityDescription
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        if (key := self.entity_description.on_key) is not None:
-            self._attr_is_on = self.data.value == key
-        else:
-            self._attr_is_on = self.data.is_on
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s -> %s",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.value,
-            self.is_on,
-        )
diff --git a/homeassistant/components/lg_thinq/climate.py b/homeassistant/components/lg_thinq/climate.py
deleted file mode 100644
index 9ead57ab7b0..00000000000
--- a/homeassistant/components/lg_thinq/climate.py
+++ /dev/null
@@ -1,334 +0,0 @@
-"""Support for climate entities."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-import logging
-from typing import Any
-
-from thinqconnect import DeviceType
-from thinqconnect.integration import ExtendedProperty
-
-from homeassistant.components.climate import (
-    ATTR_TARGET_TEMP_HIGH,
-    ATTR_TARGET_TEMP_LOW,
-    FAN_OFF,
-    ClimateEntity,
-    ClimateEntityDescription,
-    ClimateEntityFeature,
-    HVACMode,
-)
-from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.temperature import display_temp
-
-from . import ThinqConfigEntry
-from .coordinator import DeviceDataUpdateCoordinator
-from .entity import ThinQEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class ThinQClimateEntityDescription(ClimateEntityDescription):
-    """Describes ThinQ climate entity."""
-
-    min_temp: float | None = None
-    max_temp: float | None = None
-    step: float | None = None
-
-
-DEVIE_TYPE_CLIMATE_MAP: dict[DeviceType, tuple[ThinQClimateEntityDescription, ...]] = {
-    DeviceType.AIR_CONDITIONER: (
-        ThinQClimateEntityDescription(
-            key=ExtendedProperty.CLIMATE_AIR_CONDITIONER,
-            name=None,
-            translation_key=ExtendedProperty.CLIMATE_AIR_CONDITIONER,
-        ),
-    ),
-    DeviceType.SYSTEM_BOILER: (
-        ThinQClimateEntityDescription(
-            key=ExtendedProperty.CLIMATE_SYSTEM_BOILER,
-            name=None,
-            min_temp=16,
-            max_temp=30,
-            step=1,
-        ),
-    ),
-}
-
-STR_TO_HVAC: dict[str, HVACMode] = {
-    "air_dry": HVACMode.DRY,
-    "auto": HVACMode.AUTO,
-    "cool": HVACMode.COOL,
-    "fan": HVACMode.FAN_ONLY,
-    "heat": HVACMode.HEAT,
-}
-
-HVAC_TO_STR: dict[HVACMode, str] = {
-    HVACMode.AUTO: "auto",
-    HVACMode.COOL: "cool",
-    HVACMode.DRY: "air_dry",
-    HVACMode.FAN_ONLY: "fan",
-    HVACMode.HEAT: "heat",
-}
-
-THINQ_PRESET_MODE: list[str] = ["air_clean", "aroma", "energy_saving"]
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for climate platform."""
-    entities: list[ThinQClimateEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVIE_TYPE_CLIMATE_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQClimateEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(description.key)
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQClimateEntity(ThinQEntity, ClimateEntity):
-    """Represent a thinq climate platform."""
-
-    entity_description: ThinQClimateEntityDescription
-
-    def __init__(
-        self,
-        coordinator: DeviceDataUpdateCoordinator,
-        entity_description: ThinQClimateEntityDescription,
-        property_id: str,
-    ) -> None:
-        """Initialize a climate entity."""
-        super().__init__(coordinator, entity_description, property_id)
-
-        self._attr_supported_features = (
-            ClimateEntityFeature.TARGET_TEMPERATURE
-            | ClimateEntityFeature.TURN_ON
-            | ClimateEntityFeature.TURN_OFF
-        )
-        self._attr_hvac_modes = [HVACMode.OFF]
-        self._attr_hvac_mode = HVACMode.OFF
-        self._attr_preset_modes = []
-        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
-        self._requested_hvac_mode: str | None = None
-
-        # Set up HVAC modes.
-        for mode in self.data.hvac_modes:
-            if mode in STR_TO_HVAC:
-                self._attr_hvac_modes.append(STR_TO_HVAC[mode])
-            elif mode in THINQ_PRESET_MODE:
-                self._attr_preset_modes.append(mode)
-                self._attr_supported_features |= ClimateEntityFeature.PRESET_MODE
-
-        # Set up fan modes.
-        self._attr_fan_modes = self.data.fan_modes
-        if self.fan_modes:
-            self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
-
-        # Supports target temperature range.
-        if self.data.support_temperature_range:
-            self._attr_supported_features |= (
-                ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-            )
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        # Update fan, hvac and preset mode.
-        if self.data.is_on:
-            if self.supported_features & ClimateEntityFeature.FAN_MODE:
-                self._attr_fan_mode = self.data.fan_mode
-
-            hvac_mode = self._requested_hvac_mode or self.data.hvac_mode
-            if hvac_mode in STR_TO_HVAC:
-                self._attr_hvac_mode = STR_TO_HVAC.get(hvac_mode)
-                self._attr_preset_mode = None
-            elif hvac_mode in THINQ_PRESET_MODE:
-                self._attr_preset_mode = hvac_mode
-        else:
-            if self.supported_features & ClimateEntityFeature.FAN_MODE:
-                self._attr_fan_mode = FAN_OFF
-
-            self._attr_hvac_mode = HVACMode.OFF
-            self._attr_preset_mode = None
-
-        self.reset_requested_hvac_mode()
-        self._attr_current_humidity = self.data.humidity
-        self._attr_current_temperature = self.data.current_temp
-
-        if (max_temp := self.entity_description.max_temp) is not None or (
-            max_temp := self.data.max
-        ) is not None:
-            self._attr_max_temp = max_temp
-        if (min_temp := self.entity_description.min_temp) is not None or (
-            min_temp := self.data.min
-        ) is not None:
-            self._attr_min_temp = min_temp
-        if (step := self.entity_description.step) is not None or (
-            step := self.data.step
-        ) is not None:
-            self._attr_target_temperature_step = step
-
-        # Update target temperatures.
-        if (
-            self.supported_features & ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-            and self.hvac_mode == HVACMode.AUTO
-        ):
-            self._attr_target_temperature = None
-            self._attr_target_temperature_high = self.data.target_temp_high
-            self._attr_target_temperature_low = self.data.target_temp_low
-        else:
-            self._attr_target_temperature = self.data.target_temp
-            self._attr_target_temperature_high = None
-            self._attr_target_temperature_low = None
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s/%s -> %s/%s, hvac:%s, unit:%s, step:%s",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.current_temp,
-            self.data.target_temp,
-            self.current_temperature,
-            self.target_temperature,
-            self.hvac_mode,
-            self.temperature_unit,
-            self.target_temperature_step,
-        )
-
-    def reset_requested_hvac_mode(self) -> None:
-        """Cancel request to set hvac mode."""
-        self._requested_hvac_mode = None
-
-    async def async_turn_on(self) -> None:
-        """Turn the entity on."""
-        _LOGGER.debug(
-            "[%s:%s] async_turn_on", self.coordinator.device_name, self.property_id
-        )
-        await self.async_call_api(self.coordinator.api.async_turn_on(self.property_id))
-
-    async def async_turn_off(self) -> None:
-        """Turn the entity off."""
-        _LOGGER.debug(
-            "[%s:%s] async_turn_off", self.coordinator.device_name, self.property_id
-        )
-        await self.async_call_api(self.coordinator.api.async_turn_off(self.property_id))
-
-    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
-        """Set new target hvac mode."""
-        if hvac_mode == HVACMode.OFF:
-            await self.async_turn_off()
-            return
-
-        # If device is off, turn on first.
-        if not self.data.is_on:
-            await self.async_turn_on()
-
-        # When we request hvac mode while turning on the device, the previously set
-        # hvac mode is displayed first and then switches to the requested hvac mode.
-        # To prevent this, set the requested hvac mode here so that it will be set
-        # immediately on the next update.
-        self._requested_hvac_mode = HVAC_TO_STR.get(hvac_mode)
-
-        _LOGGER.debug(
-            "[%s:%s] async_set_hvac_mode: %s",
-            self.coordinator.device_name,
-            self.property_id,
-            hvac_mode,
-        )
-        await self.async_call_api(
-            self.coordinator.api.async_set_hvac_mode(
-                self.property_id, self._requested_hvac_mode
-            ),
-            self.reset_requested_hvac_mode,
-        )
-
-    async def async_set_preset_mode(self, preset_mode: str) -> None:
-        """Set new preset mode."""
-        _LOGGER.debug(
-            "[%s:%s] async_set_preset_mode: %s",
-            self.coordinator.device_name,
-            self.property_id,
-            preset_mode,
-        )
-        await self.async_call_api(
-            self.coordinator.api.async_set_hvac_mode(self.property_id, preset_mode)
-        )
-
-    async def async_set_fan_mode(self, fan_mode: str) -> None:
-        """Set new target fan mode."""
-        _LOGGER.debug(
-            "[%s:%s] async_set_fan_mode: %s",
-            self.coordinator.device_name,
-            self.property_id,
-            fan_mode,
-        )
-        await self.async_call_api(
-            self.coordinator.api.async_set_fan_mode(self.property_id, fan_mode)
-        )
-
-    def _round_by_step(self, temperature: float) -> float:
-        """Round the value by step."""
-        if (
-            target_temp := display_temp(
-                self.coordinator.hass,
-                temperature,
-                self.coordinator.hass.config.units.temperature_unit,
-                self.target_temperature_step or 1,
-            )
-        ) is not None:
-            return target_temp
-
-        return temperature
-
-    async def async_set_temperature(self, **kwargs: Any) -> None:
-        """Set new target temperature."""
-        _LOGGER.debug(
-            "[%s:%s] async_set_temperature: %s",
-            self.coordinator.device_name,
-            self.property_id,
-            kwargs,
-        )
-
-        if (temperature := kwargs.get(ATTR_TEMPERATURE)) is not None:
-            if (
-                target_temp := self._round_by_step(temperature)
-            ) != self.target_temperature:
-                await self.async_call_api(
-                    self.coordinator.api.async_set_target_temperature(
-                        self.property_id, target_temp
-                    )
-                )
-
-        if (temperature_low := kwargs.get(ATTR_TARGET_TEMP_LOW)) is not None:
-            if (
-                target_temp_low := self._round_by_step(temperature_low)
-            ) != self.target_temperature_low:
-                await self.async_call_api(
-                    self.coordinator.api.async_set_target_temperature_low(
-                        self.property_id, target_temp_low
-                    )
-                )
-
-        if (temperature_high := kwargs.get(ATTR_TARGET_TEMP_HIGH)) is not None:
-            if (
-                target_temp_high := self._round_by_step(temperature_high)
-            ) != self.target_temperature_high:
-                await self.async_call_api(
-                    self.coordinator.api.async_set_target_temperature_high(
-                        self.property_id, target_temp_high
-                    )
-                )
diff --git a/homeassistant/components/lg_thinq/config_flow.py b/homeassistant/components/lg_thinq/config_flow.py
deleted file mode 100644
index cdb41916688..00000000000
--- a/homeassistant/components/lg_thinq/config_flow.py
+++ /dev/null
@@ -1,103 +0,0 @@
-"""Config flow for LG ThinQ."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-import uuid
-
-from thinqconnect import ThinQApi, ThinQAPIException
-from thinqconnect.country import Country
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_COUNTRY
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import CountrySelector, CountrySelectorConfig
-
-from .const import (
-    CLIENT_PREFIX,
-    CONF_CONNECT_CLIENT_ID,
-    DEFAULT_COUNTRY,
-    DOMAIN,
-    THINQ_DEFAULT_NAME,
-    THINQ_PAT_URL,
-)
-
-SUPPORTED_COUNTRIES = [country.value for country in Country]
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class ThinQFlowHandler(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow."""
-
-    VERSION = 1
-
-    def _get_default_country_code(self) -> str:
-        """Get the default country code based on config."""
-        country = self.hass.config.country
-        if country is not None and country in SUPPORTED_COUNTRIES:
-            return country
-
-        return DEFAULT_COUNTRY
-
-    async def _validate_and_create_entry(
-        self, access_token: str, country_code: str
-    ) -> ConfigFlowResult:
-        """Create an entry for the flow."""
-        connect_client_id = f"{CLIENT_PREFIX}-{uuid.uuid4()!s}"
-
-        # To verify PAT, create an api to retrieve the device list.
-        await ThinQApi(
-            session=async_get_clientsession(self.hass),
-            access_token=access_token,
-            country_code=country_code,
-            client_id=connect_client_id,
-        ).async_get_device_list()
-
-        # If verification is success, create entry.
-        return self.async_create_entry(
-            title=THINQ_DEFAULT_NAME,
-            data={
-                CONF_ACCESS_TOKEN: access_token,
-                CONF_CONNECT_CLIENT_ID: connect_client_id,
-                CONF_COUNTRY: country_code,
-            },
-        )
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initiated by the user."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            access_token = user_input[CONF_ACCESS_TOKEN]
-            country_code = user_input[CONF_COUNTRY]
-
-            # Check if PAT is already configured.
-            await self.async_set_unique_id(access_token)
-            self._abort_if_unique_id_configured()
-
-            try:
-                return await self._validate_and_create_entry(access_token, country_code)
-            except ThinQAPIException:
-                errors["base"] = "token_unauthorized"
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_ACCESS_TOKEN): cv.string,
-                    vol.Required(
-                        CONF_COUNTRY, default=self._get_default_country_code()
-                    ): CountrySelector(
-                        CountrySelectorConfig(countries=SUPPORTED_COUNTRIES)
-                    ),
-                }
-            ),
-            description_placeholders={"pat_url": THINQ_PAT_URL},
-            errors=errors,
-        )
diff --git a/homeassistant/components/lg_thinq/const.py b/homeassistant/components/lg_thinq/const.py
deleted file mode 100644
index a65dee715db..00000000000
--- a/homeassistant/components/lg_thinq/const.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""Constants for LG ThinQ."""
-
-from datetime import timedelta
-from typing import Final
-
-# Config flow
-DOMAIN = "lg_thinq"
-COMPANY = "LGE"
-DEFAULT_COUNTRY: Final = "US"
-THINQ_DEFAULT_NAME: Final = "LG ThinQ"
-THINQ_PAT_URL: Final = "https://connect-pat.lgthinq.com"
-CLIENT_PREFIX: Final = "home-assistant"
-CONF_CONNECT_CLIENT_ID: Final = "connect_client_id"
-
-# MQTT
-MQTT_SUBSCRIPTION_INTERVAL: Final = timedelta(days=1)
-
-# MQTT: Message types
-DEVICE_PUSH_MESSAGE: Final = "DEVICE_PUSH"
-DEVICE_STATUS_MESSAGE: Final = "DEVICE_STATUS"
diff --git a/homeassistant/components/lg_thinq/coordinator.py b/homeassistant/components/lg_thinq/coordinator.py
deleted file mode 100644
index 0ba859b1228..00000000000
--- a/homeassistant/components/lg_thinq/coordinator.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""DataUpdateCoordinator for the LG ThinQ device."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from thinqconnect import ThinQAPIException
-from thinqconnect.integration import HABridge
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class DeviceDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
-    """LG Device's Data Update Coordinator."""
-
-    def __init__(self, hass: HomeAssistant, ha_bridge: HABridge) -> None:
-        """Initialize data coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=f"{DOMAIN}_{ha_bridge.device.device_id}",
-        )
-
-        self.data = {}
-        self.api = ha_bridge
-        self.device_id = ha_bridge.device.device_id
-        self.sub_id = ha_bridge.sub_id
-
-        alias = ha_bridge.device.alias
-
-        # The device name is usually set to 'alias'.
-        # But, if the sub_id exists, it will be set to 'alias {sub_id}'.
-        # e.g. alias='MyWashTower', sub_id='dryer' then 'MyWashTower dryer'.
-        self.device_name = f"{alias} {self.sub_id}" if self.sub_id else alias
-
-        # The unique id is usually set to 'device_id'.
-        # But, if the sub_id exists, it will be set to 'device_id_{sub_id}'.
-        # e.g. device_id='TQSXXXX', sub_id='dryer' then 'TQSXXXX_dryer'.
-        self.unique_id = (
-            f"{self.device_id}_{self.sub_id}" if self.sub_id else self.device_id
-        )
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Request to the server to update the status from full response data."""
-        try:
-            return await self.api.fetch_data()
-        except ThinQAPIException as e:
-            raise UpdateFailed(e) from e
-
-    def refresh_status(self) -> None:
-        """Refresh current status."""
-        self.async_set_updated_data(self.data)
-
-    def handle_update_status(self, status: dict[str, Any]) -> None:
-        """Handle the status received from the mqtt connection."""
-        data = self.api.update_status(status)
-        if data is not None:
-            self.async_set_updated_data(data)
-
-    def handle_notification_message(self, message: str | None) -> None:
-        """Handle the status received from the mqtt connection."""
-        data = self.api.update_notification(message)
-        if data is not None:
-            self.async_set_updated_data(data)
-
-
-async def async_setup_device_coordinator(
-    hass: HomeAssistant, ha_bridge: HABridge
-) -> DeviceDataUpdateCoordinator:
-    """Create DeviceDataUpdateCoordinator and device_api per device."""
-    coordinator = DeviceDataUpdateCoordinator(hass, ha_bridge)
-    await coordinator.async_refresh()
-
-    _LOGGER.debug("Setup device's coordinator: %s", coordinator.device_name)
-    return coordinator
diff --git a/homeassistant/components/lg_thinq/entity.py b/homeassistant/components/lg_thinq/entity.py
deleted file mode 100644
index f31b535dcaf..00000000000
--- a/homeassistant/components/lg_thinq/entity.py
+++ /dev/null
@@ -1,114 +0,0 @@
-"""Base class for ThinQ entities."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-import logging
-from typing import Any
-
-from thinqconnect import ThinQAPIException
-from thinqconnect.devices.const import Location
-from thinqconnect.integration import PropertyState
-
-from homeassistant.const import UnitOfTemperature
-from homeassistant.core import callback
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import COMPANY, DOMAIN
-from .coordinator import DeviceDataUpdateCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-
-EMPTY_STATE = PropertyState()
-
-UNIT_CONVERSION_MAP: dict[str, str] = {
-    "F": UnitOfTemperature.FAHRENHEIT,
-    "C": UnitOfTemperature.CELSIUS,
-}
-
-
-class ThinQEntity(CoordinatorEntity[DeviceDataUpdateCoordinator]):
-    """The base implementation of all lg thinq entities."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: DeviceDataUpdateCoordinator,
-        entity_description: EntityDescription,
-        property_id: str,
-    ) -> None:
-        """Initialize an entity."""
-        super().__init__(coordinator)
-
-        self.entity_description = entity_description
-        self.property_id = property_id
-        self.location = self.coordinator.api.get_location_for_idx(self.property_id)
-
-        self._attr_device_info = dr.DeviceInfo(
-            identifiers={(DOMAIN, coordinator.unique_id)},
-            manufacturer=COMPANY,
-            model=coordinator.api.device.model_name,
-            name=coordinator.device_name,
-        )
-        self._attr_unique_id = f"{coordinator.unique_id}_{self.property_id}"
-        if self.location is not None and self.location not in (
-            Location.MAIN,
-            Location.OVEN,
-            coordinator.sub_id,
-        ):
-            self._attr_translation_placeholders = {"location": self.location}
-            self._attr_translation_key = (
-                f"{entity_description.translation_key}_for_location"
-            )
-
-    @property
-    def data(self) -> PropertyState:
-        """Return the state data of entity."""
-        return self.coordinator.data.get(self.property_id, EMPTY_STATE)
-
-    def _get_unit_of_measurement(self, unit: str | None) -> str | None:
-        """Convert thinq unit string to HA unit string."""
-        if unit is None:
-            return None
-
-        return UNIT_CONVERSION_MAP.get(unit)
-
-    def _update_status(self) -> None:
-        """Update status itself.
-
-        All inherited classes can update their own status in here.
-        """
-
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        self._update_status()
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self) -> None:
-        """Call when entity is added to hass."""
-        await super().async_added_to_hass()
-        self._handle_coordinator_update()
-
-    async def async_call_api(
-        self,
-        target: Coroutine[Any, Any, Any],
-        on_fail_method: Callable[[], None] | None = None,
-    ) -> None:
-        """Call the given api and handle exception."""
-        try:
-            await target
-        except ThinQAPIException as exc:
-            if on_fail_method:
-                on_fail_method()
-            raise ServiceValidationError(
-                exc.message, translation_domain=DOMAIN, translation_key=exc.code
-            ) from exc
-        except ValueError as exc:
-            if on_fail_method:
-                on_fail_method()
-            raise ServiceValidationError(exc) from exc
diff --git a/homeassistant/components/lg_thinq/event.py b/homeassistant/components/lg_thinq/event.py
deleted file mode 100644
index b963cba37cc..00000000000
--- a/homeassistant/components/lg_thinq/event.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""Support for event entity."""
-
-from __future__ import annotations
-
-import logging
-
-from thinqconnect import DeviceType
-from thinqconnect.integration import ActiveMode, ThinQPropertyEx
-
-from homeassistant.components.event import EventEntity, EventEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ThinqConfigEntry
-from .coordinator import DeviceDataUpdateCoordinator
-from .entity import ThinQEntity
-
-NOTIFICATION_EVENT_DESC = EventEntityDescription(
-    key=ThinQPropertyEx.NOTIFICATION,
-    translation_key=ThinQPropertyEx.NOTIFICATION,
-)
-ERROR_EVENT_DESC = EventEntityDescription(
-    key=ThinQPropertyEx.ERROR,
-    translation_key=ThinQPropertyEx.ERROR,
-)
-ALL_EVENTS: tuple[EventEntityDescription, ...] = (
-    ERROR_EVENT_DESC,
-    NOTIFICATION_EVENT_DESC,
-)
-DEVICE_TYPE_EVENT_MAP: dict[DeviceType, tuple[EventEntityDescription, ...]] = {
-    DeviceType.AIR_CONDITIONER: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.AIR_PURIFIER_FAN: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.AIR_PURIFIER: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.DEHUMIDIFIER: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.DISH_WASHER: ALL_EVENTS,
-    DeviceType.DRYER: ALL_EVENTS,
-    DeviceType.HUMIDIFIER: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.KIMCHI_REFRIGERATOR: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.MICROWAVE_OVEN: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.OVEN: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.REFRIGERATOR: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.ROBOT_CLEANER: ALL_EVENTS,
-    DeviceType.STICK_CLEANER: (NOTIFICATION_EVENT_DESC,),
-    DeviceType.STYLER: ALL_EVENTS,
-    DeviceType.WASHCOMBO_MAIN: ALL_EVENTS,
-    DeviceType.WASHCOMBO_MINI: ALL_EVENTS,
-    DeviceType.WASHER: ALL_EVENTS,
-    DeviceType.WASHTOWER_DRYER: ALL_EVENTS,
-    DeviceType.WASHTOWER: ALL_EVENTS,
-    DeviceType.WASHTOWER_WASHER: ALL_EVENTS,
-    DeviceType.WINE_CELLAR: (NOTIFICATION_EVENT_DESC,),
-}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for event platform."""
-    entities: list[ThinQEventEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_EVENT_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQEventEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(
-                        description.key, ActiveMode.READ_ONLY
-                    )
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQEventEntity(ThinQEntity, EventEntity):
-    """Represent an thinq event platform."""
-
-    def __init__(
-        self,
-        coordinator: DeviceDataUpdateCoordinator,
-        entity_description: EventEntityDescription,
-        property_id: str,
-    ) -> None:
-        """Initialize an event platform."""
-        super().__init__(coordinator, entity_description, property_id)
-
-        # For event types.
-        self._attr_event_types = self.data.options
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s, event_types=%s",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.value,
-            self.event_types,
-        )
-        # Handle an event.
-        if (value := self.data.value) is not None and value in self.event_types:
-            self._async_handle_update(value)
-
-    def _async_handle_update(self, value: str) -> None:
-        """Handle the event."""
-        self._trigger_event(value)
-        self.async_write_ha_state()
diff --git a/homeassistant/components/lg_thinq/fan.py b/homeassistant/components/lg_thinq/fan.py
deleted file mode 100644
index edcadf2598a..00000000000
--- a/homeassistant/components/lg_thinq/fan.py
+++ /dev/null
@@ -1,153 +0,0 @@
-"""Support for fan entities."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from thinqconnect import DeviceType
-from thinqconnect.integration import ExtendedProperty
-
-from homeassistant.components.fan import (
-    FanEntity,
-    FanEntityDescription,
-    FanEntityFeature,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.percentage import (
-    ordered_list_item_to_percentage,
-    percentage_to_ordered_list_item,
-)
-
-from . import ThinqConfigEntry
-from .coordinator import DeviceDataUpdateCoordinator
-from .entity import ThinQEntity
-
-DEVICE_TYPE_FAN_MAP: dict[DeviceType, tuple[FanEntityDescription, ...]] = {
-    DeviceType.CEILING_FAN: (
-        FanEntityDescription(
-            key=ExtendedProperty.FAN,
-            name=None,
-        ),
-    ),
-}
-
-FOUR_STEP_SPEEDS = ["low", "mid", "high", "turbo"]
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for fan platform."""
-    entities: list[ThinQFanEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_FAN_MAP.get(coordinator.api.device.device_type)
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQFanEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(description.key)
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQFanEntity(ThinQEntity, FanEntity):
-    """Represent a thinq fan platform."""
-
-    def __init__(
-        self,
-        coordinator: DeviceDataUpdateCoordinator,
-        entity_description: FanEntityDescription,
-        property_id: str,
-    ) -> None:
-        """Initialize fan platform."""
-        super().__init__(coordinator, entity_description, property_id)
-
-        self._ordered_named_fan_speeds = []
-        self._attr_supported_features = (
-            FanEntityFeature.SET_SPEED
-            | FanEntityFeature.TURN_ON
-            | FanEntityFeature.TURN_OFF
-        )
-        if (fan_modes := self.data.fan_modes) is not None:
-            self._attr_speed_count = len(fan_modes)
-            if self.speed_count == 4:
-                self._ordered_named_fan_speeds = FOUR_STEP_SPEEDS
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        # Update power on state.
-        self._attr_is_on = self.data.is_on
-
-        # Update fan speed.
-        if (
-            self.data.is_on
-            and (mode := self.data.fan_mode) in self._ordered_named_fan_speeds
-        ):
-            self._attr_percentage = ordered_list_item_to_percentage(
-                self._ordered_named_fan_speeds, mode
-            )
-        else:
-            self._attr_percentage = 0
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s -> %s (percentage=%s)",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.is_on,
-            self.is_on,
-            self.percentage,
-        )
-
-    async def async_set_percentage(self, percentage: int) -> None:
-        """Set the speed percentage of the fan."""
-        if percentage == 0:
-            await self.async_turn_off()
-            return
-        try:
-            value = percentage_to_ordered_list_item(
-                self._ordered_named_fan_speeds, percentage
-            )
-        except ValueError:
-            _LOGGER.exception("Failed to async_set_percentage")
-            return
-
-        _LOGGER.debug(
-            "[%s:%s] async_set_percentage. percentage=%s, value=%s",
-            self.coordinator.device_name,
-            self.property_id,
-            percentage,
-            value,
-        )
-        await self.async_call_api(
-            self.coordinator.api.async_set_fan_mode(self.property_id, value)
-        )
-
-    async def async_turn_on(
-        self,
-        percentage: int | None = None,
-        preset_mode: str | None = None,
-        **kwargs: Any,
-    ) -> None:
-        """Turn on the fan."""
-        _LOGGER.debug(
-            "[%s:%s] async_turn_on", self.coordinator.device_name, self.property_id
-        )
-        await self.async_call_api(self.coordinator.api.async_turn_on(self.property_id))
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the fan off."""
-        _LOGGER.debug(
-            "[%s:%s] async_turn_off", self.coordinator.device_name, self.property_id
-        )
-        await self.async_call_api(self.coordinator.api.async_turn_off(self.property_id))
diff --git a/homeassistant/components/lg_thinq/icons.json b/homeassistant/components/lg_thinq/icons.json
deleted file mode 100644
index 87cf04e0c1a..00000000000
--- a/homeassistant/components/lg_thinq/icons.json
+++ /dev/null
@@ -1,407 +0,0 @@
-{
-  "entity": {
-    "switch": {
-      "auto_mode": {
-        "default": "mdi:cogs"
-      },
-      "express_mode": {
-        "default": "mdi:snowflake-variant"
-      },
-      "hot_water_mode": {
-        "default": "mdi:list-status"
-      },
-      "humidity_warm_mode": {
-        "default": "mdi:heat-wave"
-      },
-      "hygiene_dry_mode": {
-        "default": "mdi:format-list-bulleted"
-      },
-      "mood_lamp_state": {
-        "default": "mdi:lamp"
-      },
-      "operation_power": {
-        "default": "mdi:power"
-      },
-      "optimal_humidity": {
-        "default": "mdi:water-percent"
-      },
-      "power_save_enabled": {
-        "default": "mdi:hydro-power"
-      },
-      "rapid_freeze": {
-        "default": "mdi:snowflake"
-      },
-      "sleep_mode": {
-        "default": "mdi:format-list-bulleted"
-      },
-      "uv_nano": {
-        "default": "mdi:air-filter"
-      },
-      "warm_mode": {
-        "default": "mdi:heat-wave"
-      }
-    },
-    "binary_sensor": {
-      "eco_friendly_mode": {
-        "default": "mdi:sprout"
-      },
-      "power_save_enabled": {
-        "default": "mdi:meter-electric"
-      },
-      "remote_control_enabled": {
-        "default": "mdi:remote"
-      },
-      "remote_control_enabled_for_location": {
-        "default": "mdi:remote"
-      },
-      "rinse_refill": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "sabbath_mode": {
-        "default": "mdi:food-off-outline"
-      },
-      "machine_clean_reminder": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "signal_level": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "clean_light_reminder": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "operation_mode": {
-        "default": "mdi:power"
-      },
-      "one_touch_filter": {
-        "default": "mdi:air-filter"
-      }
-    },
-    "climate": {
-      "climate_air_conditioner": {
-        "state_attributes": {
-          "fan_mode": {
-            "state": {
-              "slow": "mdi:fan-chevron-down",
-              "low": "mdi:fan-speed-1",
-              "mid": "mdi:fan-speed-2",
-              "high": "mdi:fan-speed-3",
-              "power": "mdi:fan-chevron-up",
-              "auto": "mdi:fan-auto"
-            }
-          }
-        }
-      }
-    },
-    "event": {
-      "error": {
-        "default": "mdi:alert-circle-outline"
-      },
-      "notification": {
-        "default": "mdi:message-badge-outline"
-      }
-    },
-    "number": {
-      "target_temperature": {
-        "default": "mdi:thermometer"
-      },
-      "target_temperature_for_location": {
-        "default": "mdi:thermometer"
-      },
-      "light_status": {
-        "default": "mdi:television-ambient-light"
-      },
-      "fan_speed": {
-        "default": "mdi:wind-power-outline"
-      },
-      "lamp_brightness": {
-        "default": "mdi:alarm-light-outline"
-      },
-      "wind_temperature": {
-        "default": "mdi:thermometer"
-      },
-      "relative_hour_to_start": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "relative_hour_to_start_for_location": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "relative_hour_to_start_wm": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "relative_hour_to_start_wm_for_location": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "relative_hour_to_stop": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "relative_hour_to_stop_for_location": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "relative_hour_to_stop_wm": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "relative_hour_to_stop_wm_for_location": {
-        "default": "mdi:timer-edit-outline"
-      },
-      "sleep_timer_relative_hour_to_stop": {
-        "default": "mdi:bed-clock"
-      },
-      "sleep_timer_relative_hour_to_stop_for_location": {
-        "default": "mdi:bed-clock"
-      }
-    },
-    "select": {
-      "wind_strength": {
-        "default": "mdi:wind-power-outline"
-      },
-      "monitoring_enabled": {
-        "default": "mdi:monitor-eye"
-      },
-      "current_job_mode": {
-        "default": "mdi:format-list-bulleted"
-      },
-      "operation_mode": {
-        "default": "mdi:gesture-tap-button"
-      },
-      "operation_mode_for_location": {
-        "default": "mdi:gesture-tap-button"
-      },
-      "air_clean_operation_mode": {
-        "default": "mdi:air-filter"
-      },
-      "cook_mode": {
-        "default": "mdi:chef-hat"
-      },
-      "cook_mode_for_location": {
-        "default": "mdi:chef-hat"
-      },
-      "light_brightness": {
-        "default": "mdi:list-status"
-      },
-      "wind_angle": {
-        "default": "mdi:rotate-360"
-      },
-      "display_light": {
-        "default": "mdi:brightness-6"
-      },
-      "fresh_air_filter": {
-        "default": "mdi:air-filter"
-      },
-      "hygiene_dry_mode": {
-        "default": "mdi:format-list-bulleted"
-      }
-    },
-    "sensor": {
-      "odor_level": {
-        "default": "mdi:scent"
-      },
-      "current_temperature": {
-        "default": "mdi:thermometer"
-      },
-      "temperature": {
-        "default": "mdi:thermometer"
-      },
-      "total_pollution_level": {
-        "default": "mdi:air-filter"
-      },
-      "monitoring_enabled": {
-        "default": "mdi:monitor-eye"
-      },
-      "growth_mode": {
-        "default": "mdi:sprout-outline"
-      },
-      "growth_mode_for_location": {
-        "default": "mdi:sprout-outline"
-      },
-      "wind_volume": {
-        "default": "mdi:wind-power-outline"
-      },
-      "wind_volume_for_location": {
-        "default": "mdi:wind-power-outline"
-      },
-      "brightness": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "brightness_for_location": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "duration": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "duration_for_location": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "day_target_temperature": {
-        "default": "mdi:thermometer"
-      },
-      "day_target_temperature_for_location": {
-        "default": "mdi:thermometer"
-      },
-      "night_target_temperature": {
-        "default": "mdi:thermometer"
-      },
-      "night_target_temperature_for_location": {
-        "default": "mdi:thermometer"
-      },
-      "temperature_state": {
-        "default": "mdi:thermometer"
-      },
-      "temperature_state_for_location": {
-        "default": "mdi:thermometer"
-      },
-      "current_state": {
-        "default": "mdi:list-status"
-      },
-      "current_state_for_location": {
-        "default": "mdi:list-status"
-      },
-      "fresh_air_filter": {
-        "default": "mdi:air-filter"
-      },
-      "filter_lifetime": {
-        "default": "mdi:air-filter"
-      },
-      "used_time": {
-        "default": "mdi:air-filter"
-      },
-      "current_job_mode": {
-        "default": "mdi:dots-circle"
-      },
-      "current_job_mode_stick_cleaner": {
-        "default": "mdi:dots-circle"
-      },
-      "personalization_mode": {
-        "default": "mdi:dots-circle"
-      },
-      "current_dish_washing_course": {
-        "default": "mdi:format-list-checks"
-      },
-      "rinse_level": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "softening_level": {
-        "default": "mdi:tune-vertical-variant"
-      },
-      "cock_state": {
-        "default": "mdi:air-filter"
-      },
-      "sterilizing_state": {
-        "default": "mdi:water-alert-outline"
-      },
-      "water_type": {
-        "default": "mdi:water"
-      },
-      "target_temperature": {
-        "default": "mdi:thermometer"
-      },
-      "target_temperature_for_location": {
-        "default": "mdi:thermometer"
-      },
-      "elapsed_day_state": {
-        "default": "mdi:calendar-range-outline"
-      },
-      "elapsed_day_total": {
-        "default": "mdi:calendar-range-outline"
-      },
-      "recipe_name": {
-        "default": "mdi:information-box-outline"
-      },
-      "wort_info": {
-        "default": "mdi:information-box-outline"
-      },
-      "yeast_info": {
-        "default": "mdi:information-box-outline"
-      },
-      "hop_oil_info": {
-        "default": "mdi:information-box-outline"
-      },
-      "flavor_info": {
-        "default": "mdi:information-box-outline"
-      },
-      "beer_remain": {
-        "default": "mdi:glass-mug-variant"
-      },
-      "battery_level": {
-        "default": "mdi:battery-medium"
-      },
-      "relative_to_start": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "relative_to_start_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "relative_to_start_wm": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "relative_to_start_wm_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "relative_to_stop": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "relative_to_stop_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "relative_to_stop_wm": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "relative_to_stop_wm_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "sleep_timer_relative_to_stop": {
-        "default": "mdi:bed-clock"
-      },
-      "sleep_timer_relative_to_stop_for_location": {
-        "default": "mdi:bed-clock"
-      },
-      "absolute_to_start": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "absolute_to_start_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "absolute_to_stop": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "absolute_to_stop_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "remain": {
-        "default": "mdi:timer-sand"
-      },
-      "remain_for_location": {
-        "default": "mdi:timer-sand"
-      },
-      "running": {
-        "default": "mdi:timer-play-outline"
-      },
-      "running_for_location": {
-        "default": "mdi:timer-play-outline"
-      },
-      "total": {
-        "default": "mdi:timer-play-outline"
-      },
-      "total_for_location": {
-        "default": "mdi:timer-play-outline"
-      },
-      "target": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "target_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "light_start": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "light_start_for_location": {
-        "default": "mdi:clock-time-three-outline"
-      },
-      "power_level": {
-        "default": "mdi:radiator"
-      },
-      "power_level_for_location": {
-        "default": "mdi:radiator"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/lg_thinq/manifest.json b/homeassistant/components/lg_thinq/manifest.json
deleted file mode 100644
index 665a5a9e179..00000000000
--- a/homeassistant/components/lg_thinq/manifest.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "domain": "lg_thinq",
-  "name": "LG ThinQ",
-  "codeowners": ["@LG-ThinQ-Integration"],
-  "config_flow": true,
-  "dependencies": [],
-  "documentation": "https://www.home-assistant.io/integrations/lg_thinq/",
-  "iot_class": "cloud_push",
-  "loggers": ["thinqconnect"],
-  "requirements": ["thinqconnect==1.0.0"]
-}
diff --git a/homeassistant/components/lg_thinq/mqtt.py b/homeassistant/components/lg_thinq/mqtt.py
deleted file mode 100644
index 30d1302e458..00000000000
--- a/homeassistant/components/lg_thinq/mqtt.py
+++ /dev/null
@@ -1,186 +0,0 @@
-"""Support for LG ThinQ Connect API."""
-
-from __future__ import annotations
-
-import asyncio
-from datetime import datetime
-import json
-import logging
-from typing import Any
-
-from thinqconnect import (
-    DeviceType,
-    ThinQApi,
-    ThinQAPIErrorCodes,
-    ThinQAPIException,
-    ThinQMQTTClient,
-)
-
-from homeassistant.core import Event, HomeAssistant
-
-from .const import DEVICE_PUSH_MESSAGE, DEVICE_STATUS_MESSAGE
-from .coordinator import DeviceDataUpdateCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class ThinQMQTT:
-    """A class that implements MQTT connection."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        thinq_api: ThinQApi,
-        client_id: str,
-        coordinators: dict[str, DeviceDataUpdateCoordinator],
-    ) -> None:
-        """Initialize a mqtt."""
-        self.hass = hass
-        self.thinq_api = thinq_api
-        self.client_id = client_id
-        self.coordinators = coordinators
-        self.client: ThinQMQTTClient | None = None
-
-    async def async_connect(self) -> bool:
-        """Create a mqtt client and then try to connect."""
-        try:
-            self.client = await ThinQMQTTClient(
-                self.thinq_api, self.client_id, self.on_message_received
-            )
-            if self.client is None:
-                return False
-
-            # Connect to server and create certificate.
-            return await self.client.async_prepare_mqtt()
-        except (ThinQAPIException, TypeError, ValueError):
-            _LOGGER.exception("Failed to connect")
-            return False
-
-    async def async_disconnect(self, event: Event | None = None) -> None:
-        """Unregister client and disconnects handlers."""
-        await self.async_end_subscribes()
-
-        if self.client is not None:
-            try:
-                await self.client.async_disconnect()
-            except (ThinQAPIException, TypeError, ValueError):
-                _LOGGER.exception("Failed to disconnect")
-
-    def _get_failed_device_count(
-        self, results: list[dict | BaseException | None]
-    ) -> int:
-        """Check if there exists errors while performing tasks and then return count."""
-        # Note that result code '1207' means 'Already subscribed push'
-        # and is not actually fail.
-        return sum(
-            isinstance(result, (TypeError, ValueError))
-            or (
-                isinstance(result, ThinQAPIException)
-                and result.code != ThinQAPIErrorCodes.ALREADY_SUBSCRIBED_PUSH
-            )
-            for result in results
-        )
-
-    async def async_refresh_subscribe(self, now: datetime | None = None) -> None:
-        """Update event subscribes."""
-        _LOGGER.debug("async_refresh_subscribe: now=%s", now)
-
-        tasks = [
-            self.hass.async_create_task(
-                self.thinq_api.async_post_event_subscribe(coordinator.device_id)
-            )
-            for coordinator in self.coordinators.values()
-        ]
-        if tasks:
-            results = await asyncio.gather(*tasks, return_exceptions=True)
-            if (count := self._get_failed_device_count(results)) > 0:
-                _LOGGER.error("Failed to refresh subscription on %s devices", count)
-
-    async def async_start_subscribes(self) -> None:
-        """Start push/event subscribes."""
-        _LOGGER.debug("async_start_subscribes")
-
-        if self.client is None:
-            _LOGGER.error("Failed to start subscription: No client")
-            return
-
-        tasks = [
-            self.hass.async_create_task(
-                self.thinq_api.async_post_push_subscribe(coordinator.device_id)
-            )
-            for coordinator in self.coordinators.values()
-        ]
-        tasks.extend(
-            self.hass.async_create_task(
-                self.thinq_api.async_post_event_subscribe(coordinator.device_id)
-            )
-            for coordinator in self.coordinators.values()
-        )
-        if tasks:
-            results = await asyncio.gather(*tasks, return_exceptions=True)
-            if (count := self._get_failed_device_count(results)) > 0:
-                _LOGGER.error("Failed to start subscription on %s devices", count)
-
-        await self.client.async_connect_mqtt()
-
-    async def async_end_subscribes(self) -> None:
-        """Start push/event unsubscribes."""
-        _LOGGER.debug("async_end_subscribes")
-
-        tasks = [
-            self.hass.async_create_task(
-                self.thinq_api.async_delete_push_subscribe(coordinator.device_id)
-            )
-            for coordinator in self.coordinators.values()
-        ]
-        tasks.extend(
-            self.hass.async_create_task(
-                self.thinq_api.async_delete_event_subscribe(coordinator.device_id)
-            )
-            for coordinator in self.coordinators.values()
-        )
-        if tasks:
-            results = await asyncio.gather(*tasks, return_exceptions=True)
-            if (count := self._get_failed_device_count(results)) > 0:
-                _LOGGER.error("Failed to end subscription on %s devices", count)
-
-    def on_message_received(
-        self,
-        topic: str,
-        payload: bytes,
-        dup: bool,
-        qos: Any,
-        retain: bool,
-        **kwargs: dict,
-    ) -> None:
-        """Handle the received message that matching the topic."""
-        decoded = payload.decode()
-        try:
-            message = json.loads(decoded)
-        except ValueError:
-            _LOGGER.error("Failed to parse message: payload=%s", decoded)
-            return
-
-        asyncio.run_coroutine_threadsafe(
-            self.async_handle_device_event(message), self.hass.loop
-        ).result()
-
-    async def async_handle_device_event(self, message: dict) -> None:
-        """Handle received mqtt message."""
-        _LOGGER.debug("async_handle_device_event: message=%s", message)
-        unique_id = (
-            f"{message["deviceId"]}_{list(message["report"].keys())[0]}"
-            if message["deviceType"] == DeviceType.WASHTOWER
-            else message["deviceId"]
-        )
-        coordinator = self.coordinators.get(unique_id)
-        if coordinator is None:
-            _LOGGER.error("Failed to handle device event: No device")
-            return
-
-        push_type = message.get("pushType")
-
-        if push_type == DEVICE_STATUS_MESSAGE:
-            coordinator.handle_update_status(message.get("report", {}))
-        elif push_type == DEVICE_PUSH_MESSAGE:
-            coordinator.handle_notification_message(message.get("pushCode"))
diff --git a/homeassistant/components/lg_thinq/number.py b/homeassistant/components/lg_thinq/number.py
deleted file mode 100644
index 634c1a8fe84..00000000000
--- a/homeassistant/components/lg_thinq/number.py
+++ /dev/null
@@ -1,224 +0,0 @@
-"""Support for number entities."""
-
-from __future__ import annotations
-
-import logging
-
-from thinqconnect import DeviceType
-from thinqconnect.devices.const import Property as ThinQProperty
-from thinqconnect.integration import ActiveMode, TimerProperty
-
-from homeassistant.components.number import (
-    NumberDeviceClass,
-    NumberEntity,
-    NumberEntityDescription,
-    NumberMode,
-)
-from homeassistant.const import PERCENTAGE, UnitOfTemperature, UnitOfTime
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ThinqConfigEntry
-from .entity import ThinQEntity
-
-NUMBER_DESC: dict[ThinQProperty, NumberEntityDescription] = {
-    ThinQProperty.FAN_SPEED: NumberEntityDescription(
-        key=ThinQProperty.FAN_SPEED,
-        translation_key=ThinQProperty.FAN_SPEED,
-    ),
-    ThinQProperty.LAMP_BRIGHTNESS: NumberEntityDescription(
-        key=ThinQProperty.LAMP_BRIGHTNESS,
-        translation_key=ThinQProperty.LAMP_BRIGHTNESS,
-    ),
-    ThinQProperty.LIGHT_STATUS: NumberEntityDescription(
-        key=ThinQProperty.LIGHT_STATUS,
-        native_unit_of_measurement=PERCENTAGE,
-        translation_key=ThinQProperty.LIGHT_STATUS,
-    ),
-    ThinQProperty.TARGET_HUMIDITY: NumberEntityDescription(
-        key=ThinQProperty.TARGET_HUMIDITY,
-        device_class=NumberDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
-        translation_key=ThinQProperty.TARGET_HUMIDITY,
-    ),
-    ThinQProperty.TARGET_TEMPERATURE: NumberEntityDescription(
-        key=ThinQProperty.TARGET_TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        translation_key=ThinQProperty.TARGET_TEMPERATURE,
-    ),
-    ThinQProperty.WIND_TEMPERATURE: NumberEntityDescription(
-        key=ThinQProperty.WIND_TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        translation_key=ThinQProperty.WIND_TEMPERATURE,
-    ),
-}
-TIMER_NUMBER_DESC: dict[ThinQProperty, NumberEntityDescription] = {
-    ThinQProperty.RELATIVE_HOUR_TO_START: NumberEntityDescription(
-        key=ThinQProperty.RELATIVE_HOUR_TO_START,
-        native_unit_of_measurement=UnitOfTime.HOURS,
-        translation_key=ThinQProperty.RELATIVE_HOUR_TO_START,
-    ),
-    TimerProperty.RELATIVE_HOUR_TO_START_WM: NumberEntityDescription(
-        key=ThinQProperty.RELATIVE_HOUR_TO_START,
-        native_min_value=0,
-        native_unit_of_measurement=UnitOfTime.HOURS,
-        translation_key=TimerProperty.RELATIVE_HOUR_TO_START_WM,
-    ),
-    ThinQProperty.RELATIVE_HOUR_TO_STOP: NumberEntityDescription(
-        key=ThinQProperty.RELATIVE_HOUR_TO_STOP,
-        native_unit_of_measurement=UnitOfTime.HOURS,
-        translation_key=ThinQProperty.RELATIVE_HOUR_TO_STOP,
-    ),
-    TimerProperty.RELATIVE_HOUR_TO_STOP_WM: NumberEntityDescription(
-        key=ThinQProperty.RELATIVE_HOUR_TO_STOP,
-        native_min_value=0,
-        native_unit_of_measurement=UnitOfTime.HOURS,
-        translation_key=TimerProperty.RELATIVE_HOUR_TO_STOP_WM,
-    ),
-    ThinQProperty.SLEEP_TIMER_RELATIVE_HOUR_TO_STOP: NumberEntityDescription(
-        key=ThinQProperty.SLEEP_TIMER_RELATIVE_HOUR_TO_STOP,
-        native_unit_of_measurement=UnitOfTime.HOURS,
-        translation_key=ThinQProperty.SLEEP_TIMER_RELATIVE_HOUR_TO_STOP,
-    ),
-}
-WASHER_NUMBERS: tuple[NumberEntityDescription, ...] = (
-    TIMER_NUMBER_DESC[TimerProperty.RELATIVE_HOUR_TO_START_WM],
-    TIMER_NUMBER_DESC[TimerProperty.RELATIVE_HOUR_TO_STOP_WM],
-)
-
-DEVICE_TYPE_NUMBER_MAP: dict[DeviceType, tuple[NumberEntityDescription, ...]] = {
-    DeviceType.AIR_CONDITIONER: (
-        TIMER_NUMBER_DESC[ThinQProperty.RELATIVE_HOUR_TO_START],
-        TIMER_NUMBER_DESC[ThinQProperty.RELATIVE_HOUR_TO_STOP],
-        TIMER_NUMBER_DESC[ThinQProperty.SLEEP_TIMER_RELATIVE_HOUR_TO_STOP],
-    ),
-    DeviceType.AIR_PURIFIER_FAN: (
-        NUMBER_DESC[ThinQProperty.WIND_TEMPERATURE],
-        TIMER_NUMBER_DESC[ThinQProperty.SLEEP_TIMER_RELATIVE_HOUR_TO_STOP],
-    ),
-    DeviceType.DRYER: WASHER_NUMBERS,
-    DeviceType.HOOD: (
-        NUMBER_DESC[ThinQProperty.LAMP_BRIGHTNESS],
-        NUMBER_DESC[ThinQProperty.FAN_SPEED],
-    ),
-    DeviceType.HUMIDIFIER: (
-        NUMBER_DESC[ThinQProperty.TARGET_HUMIDITY],
-        TIMER_NUMBER_DESC[ThinQProperty.SLEEP_TIMER_RELATIVE_HOUR_TO_STOP],
-    ),
-    DeviceType.MICROWAVE_OVEN: (
-        NUMBER_DESC[ThinQProperty.LAMP_BRIGHTNESS],
-        NUMBER_DESC[ThinQProperty.FAN_SPEED],
-    ),
-    DeviceType.OVEN: (NUMBER_DESC[ThinQProperty.TARGET_TEMPERATURE],),
-    DeviceType.REFRIGERATOR: (NUMBER_DESC[ThinQProperty.TARGET_TEMPERATURE],),
-    DeviceType.STYLER: (TIMER_NUMBER_DESC[TimerProperty.RELATIVE_HOUR_TO_STOP_WM],),
-    DeviceType.WASHCOMBO_MAIN: WASHER_NUMBERS,
-    DeviceType.WASHCOMBO_MINI: WASHER_NUMBERS,
-    DeviceType.WASHER: WASHER_NUMBERS,
-    DeviceType.WASHTOWER_DRYER: WASHER_NUMBERS,
-    DeviceType.WASHTOWER: WASHER_NUMBERS,
-    DeviceType.WASHTOWER_WASHER: WASHER_NUMBERS,
-    DeviceType.WATER_HEATER: (
-        NumberEntityDescription(
-            key=ThinQProperty.TARGET_TEMPERATURE,
-            native_max_value=60,
-            native_min_value=35,
-            native_step=1,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            translation_key=ThinQProperty.TARGET_TEMPERATURE,
-        ),
-    ),
-    DeviceType.WINE_CELLAR: (
-        NUMBER_DESC[ThinQProperty.LIGHT_STATUS],
-        NUMBER_DESC[ThinQProperty.TARGET_TEMPERATURE],
-    ),
-}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for number platform."""
-    entities: list[ThinQNumberEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_NUMBER_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQNumberEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(
-                        description.key, ActiveMode.READ_WRITE
-                    )
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQNumberEntity(ThinQEntity, NumberEntity):
-    """Represent a thinq number platform."""
-
-    _attr_mode = NumberMode.BOX
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        self._attr_native_value = self.data.value
-
-        # Update unit.
-        if (
-            unit_of_measurement := self._get_unit_of_measurement(self.data.unit)
-        ) is not None:
-            self._attr_native_unit_of_measurement = unit_of_measurement
-
-        # Undate range.
-        if (
-            self.entity_description.native_min_value is None
-            and (min_value := self.data.min) is not None
-        ):
-            self._attr_native_min_value = min_value
-
-        if (
-            self.entity_description.native_max_value is None
-            and (max_value := self.data.max) is not None
-        ):
-            self._attr_native_max_value = max_value
-
-        if (
-            self.entity_description.native_step is None
-            and (step := self.data.step) is not None
-        ):
-            self._attr_native_step = step
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s -> %s, unit:%s, min:%s, max:%s, step:%s",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.value,
-            self.native_value,
-            self.native_unit_of_measurement,
-            self.native_min_value,
-            self.native_max_value,
-            self.native_step,
-        )
-
-    async def async_set_native_value(self, value: float) -> None:
-        """Change to new number value."""
-        if self.step.is_integer():
-            value = int(value)
-        _LOGGER.debug(
-            "[%s:%s] async_set_native_value: %s",
-            self.coordinator.device_name,
-            self.property_id,
-            value,
-        )
-
-        await self.async_call_api(self.coordinator.api.post(self.property_id, value))
diff --git a/homeassistant/components/lg_thinq/select.py b/homeassistant/components/lg_thinq/select.py
deleted file mode 100644
index e555d616ca3..00000000000
--- a/homeassistant/components/lg_thinq/select.py
+++ /dev/null
@@ -1,207 +0,0 @@
-"""Support for select entities."""
-
-from __future__ import annotations
-
-import logging
-
-from thinqconnect import DeviceType
-from thinqconnect.devices.const import Property as ThinQProperty
-from thinqconnect.integration import ActiveMode
-
-from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ThinqConfigEntry
-from .coordinator import DeviceDataUpdateCoordinator
-from .entity import ThinQEntity
-
-SELECT_DESC: dict[ThinQProperty, SelectEntityDescription] = {
-    ThinQProperty.MONITORING_ENABLED: SelectEntityDescription(
-        key=ThinQProperty.MONITORING_ENABLED,
-        translation_key=ThinQProperty.MONITORING_ENABLED,
-    ),
-    ThinQProperty.COOK_MODE: SelectEntityDescription(
-        key=ThinQProperty.COOK_MODE,
-        translation_key=ThinQProperty.COOK_MODE,
-    ),
-    ThinQProperty.DISPLAY_LIGHT: SelectEntityDescription(
-        key=ThinQProperty.DISPLAY_LIGHT,
-        translation_key=ThinQProperty.DISPLAY_LIGHT,
-    ),
-    ThinQProperty.CURRENT_JOB_MODE: SelectEntityDescription(
-        key=ThinQProperty.CURRENT_JOB_MODE,
-        translation_key=ThinQProperty.CURRENT_JOB_MODE,
-    ),
-    ThinQProperty.FRESH_AIR_FILTER: SelectEntityDescription(
-        key=ThinQProperty.FRESH_AIR_FILTER,
-        translation_key=ThinQProperty.FRESH_AIR_FILTER,
-    ),
-}
-AIR_FLOW_SELECT_DESC: dict[ThinQProperty, SelectEntityDescription] = {
-    ThinQProperty.WIND_STRENGTH: SelectEntityDescription(
-        key=ThinQProperty.WIND_STRENGTH,
-        translation_key=ThinQProperty.WIND_STRENGTH,
-    ),
-    ThinQProperty.WIND_ANGLE: SelectEntityDescription(
-        key=ThinQProperty.WIND_ANGLE,
-        translation_key=ThinQProperty.WIND_ANGLE,
-    ),
-}
-OPERATION_SELECT_DESC: dict[ThinQProperty, SelectEntityDescription] = {
-    ThinQProperty.AIR_CLEAN_OPERATION_MODE: SelectEntityDescription(
-        key=ThinQProperty.AIR_CLEAN_OPERATION_MODE,
-        translation_key="air_clean_operation_mode",
-    ),
-    ThinQProperty.DISH_WASHER_OPERATION_MODE: SelectEntityDescription(
-        key=ThinQProperty.DISH_WASHER_OPERATION_MODE,
-        translation_key="operation_mode",
-    ),
-    ThinQProperty.DRYER_OPERATION_MODE: SelectEntityDescription(
-        key=ThinQProperty.DRYER_OPERATION_MODE,
-        translation_key="operation_mode",
-    ),
-    ThinQProperty.HYGIENE_DRY_MODE: SelectEntityDescription(
-        key=ThinQProperty.HYGIENE_DRY_MODE,
-        translation_key=ThinQProperty.HYGIENE_DRY_MODE,
-    ),
-    ThinQProperty.LIGHT_BRIGHTNESS: SelectEntityDescription(
-        key=ThinQProperty.LIGHT_BRIGHTNESS,
-        translation_key=ThinQProperty.LIGHT_BRIGHTNESS,
-    ),
-    ThinQProperty.OVEN_OPERATION_MODE: SelectEntityDescription(
-        key=ThinQProperty.OVEN_OPERATION_MODE,
-        translation_key="operation_mode",
-    ),
-    ThinQProperty.STYLER_OPERATION_MODE: SelectEntityDescription(
-        key=ThinQProperty.STYLER_OPERATION_MODE,
-        translation_key="operation_mode",
-    ),
-    ThinQProperty.WASHER_OPERATION_MODE: SelectEntityDescription(
-        key=ThinQProperty.WASHER_OPERATION_MODE,
-        translation_key="operation_mode",
-    ),
-}
-
-DEVICE_TYPE_SELECT_MAP: dict[DeviceType, tuple[SelectEntityDescription, ...]] = {
-    DeviceType.AIR_CONDITIONER: (
-        SELECT_DESC[ThinQProperty.MONITORING_ENABLED],
-        OPERATION_SELECT_DESC[ThinQProperty.AIR_CLEAN_OPERATION_MODE],
-    ),
-    DeviceType.AIR_PURIFIER_FAN: (
-        AIR_FLOW_SELECT_DESC[ThinQProperty.WIND_STRENGTH],
-        AIR_FLOW_SELECT_DESC[ThinQProperty.WIND_ANGLE],
-        SELECT_DESC[ThinQProperty.DISPLAY_LIGHT],
-        SELECT_DESC[ThinQProperty.CURRENT_JOB_MODE],
-    ),
-    DeviceType.AIR_PURIFIER: (
-        AIR_FLOW_SELECT_DESC[ThinQProperty.WIND_STRENGTH],
-        SELECT_DESC[ThinQProperty.CURRENT_JOB_MODE],
-    ),
-    DeviceType.DEHUMIDIFIER: (AIR_FLOW_SELECT_DESC[ThinQProperty.WIND_STRENGTH],),
-    DeviceType.DISH_WASHER: (
-        OPERATION_SELECT_DESC[ThinQProperty.DISH_WASHER_OPERATION_MODE],
-    ),
-    DeviceType.DRYER: (OPERATION_SELECT_DESC[ThinQProperty.DRYER_OPERATION_MODE],),
-    DeviceType.HUMIDIFIER: (
-        AIR_FLOW_SELECT_DESC[ThinQProperty.WIND_STRENGTH],
-        SELECT_DESC[ThinQProperty.DISPLAY_LIGHT],
-        SELECT_DESC[ThinQProperty.CURRENT_JOB_MODE],
-        OPERATION_SELECT_DESC[ThinQProperty.HYGIENE_DRY_MODE],
-    ),
-    DeviceType.OVEN: (
-        SELECT_DESC[ThinQProperty.COOK_MODE],
-        OPERATION_SELECT_DESC[ThinQProperty.OVEN_OPERATION_MODE],
-    ),
-    DeviceType.REFRIGERATOR: (SELECT_DESC[ThinQProperty.FRESH_AIR_FILTER],),
-    DeviceType.STYLER: (OPERATION_SELECT_DESC[ThinQProperty.STYLER_OPERATION_MODE],),
-    DeviceType.WASHCOMBO_MAIN: (
-        OPERATION_SELECT_DESC[ThinQProperty.WASHER_OPERATION_MODE],
-    ),
-    DeviceType.WASHCOMBO_MINI: (
-        OPERATION_SELECT_DESC[ThinQProperty.WASHER_OPERATION_MODE],
-    ),
-    DeviceType.WASHER: (OPERATION_SELECT_DESC[ThinQProperty.WASHER_OPERATION_MODE],),
-    DeviceType.WASHTOWER_DRYER: (
-        OPERATION_SELECT_DESC[ThinQProperty.WASHER_OPERATION_MODE],
-    ),
-    DeviceType.WASHTOWER: (
-        OPERATION_SELECT_DESC[ThinQProperty.DRYER_OPERATION_MODE],
-        OPERATION_SELECT_DESC[ThinQProperty.WASHER_OPERATION_MODE],
-    ),
-    DeviceType.WASHTOWER_WASHER: (
-        OPERATION_SELECT_DESC[ThinQProperty.WASHER_OPERATION_MODE],
-    ),
-    DeviceType.WATER_HEATER: (SELECT_DESC[ThinQProperty.CURRENT_JOB_MODE],),
-    DeviceType.WINE_CELLAR: (OPERATION_SELECT_DESC[ThinQProperty.LIGHT_BRIGHTNESS],),
-}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for select platform."""
-    entities: list[ThinQSelectEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_SELECT_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQSelectEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(
-                        description.key, ActiveMode.WRITABLE
-                    )
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQSelectEntity(ThinQEntity, SelectEntity):
-    """Represent a thinq select platform."""
-
-    def __init__(
-        self,
-        coordinator: DeviceDataUpdateCoordinator,
-        entity_description: SelectEntityDescription,
-        property_id: str,
-    ) -> None:
-        """Initialize a select entity."""
-        super().__init__(coordinator, entity_description, property_id)
-
-        self._attr_options = self.data.options if self.data.options is not None else []
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        if self.data.value:
-            self._attr_current_option = str(self.data.value)
-        else:
-            self._attr_current_option = None
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s -> %s, options:%s",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.value,
-            self.current_option,
-            self.options,
-        )
-
-    async def async_select_option(self, option: str) -> None:
-        """Change the selected option."""
-        _LOGGER.debug(
-            "[%s:%s] async_select_option: %s",
-            self.coordinator.device_name,
-            self.property_id,
-            option,
-        )
-        await self.async_call_api(self.coordinator.api.post(self.property_id, option))
diff --git a/homeassistant/components/lg_thinq/sensor.py b/homeassistant/components/lg_thinq/sensor.py
deleted file mode 100644
index 99b4df8176e..00000000000
--- a/homeassistant/components/lg_thinq/sensor.py
+++ /dev/null
@@ -1,447 +0,0 @@
-"""Support for sensor entities."""
-
-from __future__ import annotations
-
-import logging
-
-from thinqconnect import DeviceType
-from thinqconnect.devices.const import Property as ThinQProperty
-from thinqconnect.integration import ActiveMode, ThinQPropertyEx, TimerProperty
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
-    UnitOfTemperature,
-    UnitOfTime,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ThinqConfigEntry
-from .coordinator import DeviceDataUpdateCoordinator
-from .entity import ThinQEntity
-
-AIR_QUALITY_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.PM1: SensorEntityDescription(
-        key=ThinQProperty.PM1,
-        device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    ThinQProperty.PM2: SensorEntityDescription(
-        key=ThinQProperty.PM2,
-        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    ThinQProperty.PM10: SensorEntityDescription(
-        key=ThinQProperty.PM10,
-        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    ThinQProperty.HUMIDITY: SensorEntityDescription(
-        key=ThinQProperty.HUMIDITY,
-        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    ThinQProperty.MONITORING_ENABLED: SensorEntityDescription(
-        key=ThinQProperty.MONITORING_ENABLED,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.MONITORING_ENABLED,
-    ),
-    ThinQProperty.TEMPERATURE: SensorEntityDescription(
-        key=ThinQProperty.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key=ThinQProperty.TEMPERATURE,
-    ),
-    ThinQProperty.ODOR_LEVEL: SensorEntityDescription(
-        key=ThinQProperty.ODOR_LEVEL,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.ODOR_LEVEL,
-    ),
-    ThinQProperty.TOTAL_POLLUTION_LEVEL: SensorEntityDescription(
-        key=ThinQProperty.TOTAL_POLLUTION_LEVEL,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.TOTAL_POLLUTION_LEVEL,
-    ),
-}
-BATTERY_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.BATTERY_PERCENT: SensorEntityDescription(
-        key=ThinQProperty.BATTERY_PERCENT,
-        translation_key=ThinQProperty.BATTERY_LEVEL,
-    ),
-}
-DISH_WASHING_COURSE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.CURRENT_DISH_WASHING_COURSE: SensorEntityDescription(
-        key=ThinQProperty.CURRENT_DISH_WASHING_COURSE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.CURRENT_DISH_WASHING_COURSE,
-    )
-}
-FILTER_INFO_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.FILTER_LIFETIME: SensorEntityDescription(
-        key=ThinQProperty.FILTER_LIFETIME,
-        native_unit_of_measurement=UnitOfTime.HOURS,
-        translation_key=ThinQProperty.FILTER_LIFETIME,
-    ),
-}
-HUMIDITY_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.CURRENT_HUMIDITY: SensorEntityDescription(
-        key=ThinQProperty.CURRENT_HUMIDITY,
-        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    )
-}
-JOB_MODE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.CURRENT_JOB_MODE: SensorEntityDescription(
-        key=ThinQProperty.CURRENT_JOB_MODE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.CURRENT_JOB_MODE,
-    ),
-    ThinQPropertyEx.CURRENT_JOB_MODE_STICK_CLEANER: SensorEntityDescription(
-        key=ThinQProperty.CURRENT_JOB_MODE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQPropertyEx.CURRENT_JOB_MODE_STICK_CLEANER,
-    ),
-    ThinQProperty.PERSONALIZATION_MODE: SensorEntityDescription(
-        key=ThinQProperty.PERSONALIZATION_MODE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.PERSONALIZATION_MODE,
-    ),
-}
-LIGHT_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.BRIGHTNESS: SensorEntityDescription(
-        key=ThinQProperty.BRIGHTNESS,
-        translation_key=ThinQProperty.BRIGHTNESS,
-    ),
-    ThinQProperty.DURATION: SensorEntityDescription(
-        key=ThinQProperty.DURATION,
-        native_unit_of_measurement=UnitOfTime.HOURS,
-        translation_key=ThinQProperty.DURATION,
-    ),
-}
-POWER_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.POWER_LEVEL: SensorEntityDescription(
-        key=ThinQProperty.POWER_LEVEL,
-        translation_key=ThinQProperty.POWER_LEVEL,
-    )
-}
-PREFERENCE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.RINSE_LEVEL: SensorEntityDescription(
-        key=ThinQProperty.RINSE_LEVEL,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.RINSE_LEVEL,
-    ),
-    ThinQProperty.SOFTENING_LEVEL: SensorEntityDescription(
-        key=ThinQProperty.SOFTENING_LEVEL,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.SOFTENING_LEVEL,
-    ),
-}
-RECIPE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.RECIPE_NAME: SensorEntityDescription(
-        key=ThinQProperty.RECIPE_NAME,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.RECIPE_NAME,
-    ),
-    ThinQProperty.WORT_INFO: SensorEntityDescription(
-        key=ThinQProperty.WORT_INFO,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.WORT_INFO,
-    ),
-    ThinQProperty.YEAST_INFO: SensorEntityDescription(
-        key=ThinQProperty.YEAST_INFO,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.YEAST_INFO,
-    ),
-    ThinQProperty.HOP_OIL_INFO: SensorEntityDescription(
-        key=ThinQProperty.HOP_OIL_INFO,
-        translation_key=ThinQProperty.HOP_OIL_INFO,
-    ),
-    ThinQProperty.FLAVOR_INFO: SensorEntityDescription(
-        key=ThinQProperty.FLAVOR_INFO,
-        translation_key=ThinQProperty.FLAVOR_INFO,
-    ),
-    ThinQProperty.BEER_REMAIN: SensorEntityDescription(
-        key=ThinQProperty.BEER_REMAIN,
-        native_unit_of_measurement=PERCENTAGE,
-        translation_key=ThinQProperty.BEER_REMAIN,
-    ),
-}
-REFRIGERATION_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.FRESH_AIR_FILTER: SensorEntityDescription(
-        key=ThinQProperty.FRESH_AIR_FILTER,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.FRESH_AIR_FILTER,
-    ),
-}
-RUN_STATE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.CURRENT_STATE: SensorEntityDescription(
-        key=ThinQProperty.CURRENT_STATE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.CURRENT_STATE,
-    ),
-    ThinQProperty.COCK_STATE: SensorEntityDescription(
-        key=ThinQProperty.COCK_STATE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.COCK_STATE,
-    ),
-    ThinQProperty.STERILIZING_STATE: SensorEntityDescription(
-        key=ThinQProperty.STERILIZING_STATE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.STERILIZING_STATE,
-    ),
-    ThinQProperty.GROWTH_MODE: SensorEntityDescription(
-        key=ThinQProperty.GROWTH_MODE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.GROWTH_MODE,
-    ),
-    ThinQProperty.WIND_VOLUME: SensorEntityDescription(
-        key=ThinQProperty.WIND_VOLUME,
-        device_class=SensorDeviceClass.WIND_SPEED,
-        translation_key=ThinQProperty.WIND_VOLUME,
-    ),
-}
-TEMPERATURE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.TARGET_TEMPERATURE: SensorEntityDescription(
-        key=ThinQProperty.TARGET_TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        translation_key=ThinQProperty.TARGET_TEMPERATURE,
-    ),
-    ThinQProperty.DAY_TARGET_TEMPERATURE: SensorEntityDescription(
-        key=ThinQProperty.DAY_TARGET_TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key=ThinQProperty.DAY_TARGET_TEMPERATURE,
-    ),
-    ThinQProperty.NIGHT_TARGET_TEMPERATURE: SensorEntityDescription(
-        key=ThinQProperty.NIGHT_TARGET_TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key=ThinQProperty.NIGHT_TARGET_TEMPERATURE,
-    ),
-    ThinQProperty.TEMPERATURE_STATE: SensorEntityDescription(
-        key=ThinQProperty.TEMPERATURE_STATE,
-        device_class=SensorDeviceClass.ENUM,
-        translation_key=ThinQProperty.TEMPERATURE_STATE,
-    ),
-    ThinQProperty.CURRENT_TEMPERATURE: SensorEntityDescription(
-        key=ThinQProperty.CURRENT_TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key=ThinQProperty.CURRENT_TEMPERATURE,
-    ),
-}
-WATER_FILTER_INFO_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.USED_TIME: SensorEntityDescription(
-        key=ThinQProperty.USED_TIME,
-        native_unit_of_measurement=UnitOfTime.MONTHS,
-        translation_key=ThinQProperty.USED_TIME,
-    ),
-}
-WATER_INFO_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
-    ThinQProperty.WATER_TYPE: SensorEntityDescription(
-        key=ThinQProperty.WATER_TYPE,
-        translation_key=ThinQProperty.WATER_TYPE,
-    ),
-}
-
-WASHER_SENSORS: tuple[SensorEntityDescription, ...] = (
-    RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-)
-DEVICE_TYPE_SENSOR_MAP: dict[DeviceType, tuple[SensorEntityDescription, ...]] = {
-    DeviceType.AIR_CONDITIONER: (
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM1],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM2],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM10],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.HUMIDITY],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.ODOR_LEVEL],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.TOTAL_POLLUTION_LEVEL],
-        FILTER_INFO_SENSOR_DESC[ThinQProperty.FILTER_LIFETIME],
-    ),
-    DeviceType.AIR_PURIFIER_FAN: (
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM1],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM2],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM10],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.HUMIDITY],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.TEMPERATURE],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.MONITORING_ENABLED],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.ODOR_LEVEL],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.TOTAL_POLLUTION_LEVEL],
-    ),
-    DeviceType.AIR_PURIFIER: (
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM1],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM2],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM10],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.HUMIDITY],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.MONITORING_ENABLED],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.ODOR_LEVEL],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.TOTAL_POLLUTION_LEVEL],
-        JOB_MODE_SENSOR_DESC[ThinQProperty.CURRENT_JOB_MODE],
-        JOB_MODE_SENSOR_DESC[ThinQProperty.PERSONALIZATION_MODE],
-    ),
-    DeviceType.COOKTOP: (
-        RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-        POWER_SENSOR_DESC[ThinQProperty.POWER_LEVEL],
-    ),
-    DeviceType.DEHUMIDIFIER: (
-        JOB_MODE_SENSOR_DESC[ThinQProperty.CURRENT_JOB_MODE],
-        HUMIDITY_SENSOR_DESC[ThinQProperty.CURRENT_HUMIDITY],
-    ),
-    DeviceType.DISH_WASHER: (
-        DISH_WASHING_COURSE_SENSOR_DESC[ThinQProperty.CURRENT_DISH_WASHING_COURSE],
-        PREFERENCE_SENSOR_DESC[ThinQProperty.RINSE_LEVEL],
-        PREFERENCE_SENSOR_DESC[ThinQProperty.SOFTENING_LEVEL],
-        RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-    ),
-    DeviceType.DRYER: WASHER_SENSORS,
-    DeviceType.HOME_BREW: (
-        RECIPE_SENSOR_DESC[ThinQProperty.RECIPE_NAME],
-        RECIPE_SENSOR_DESC[ThinQProperty.WORT_INFO],
-        RECIPE_SENSOR_DESC[ThinQProperty.YEAST_INFO],
-        RECIPE_SENSOR_DESC[ThinQProperty.HOP_OIL_INFO],
-        RECIPE_SENSOR_DESC[ThinQProperty.FLAVOR_INFO],
-        RECIPE_SENSOR_DESC[ThinQProperty.BEER_REMAIN],
-        RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-    ),
-    DeviceType.HUMIDIFIER: (
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM1],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM2],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.PM10],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.HUMIDITY],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.TEMPERATURE],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.MONITORING_ENABLED],
-        AIR_QUALITY_SENSOR_DESC[ThinQProperty.TOTAL_POLLUTION_LEVEL],
-    ),
-    DeviceType.KIMCHI_REFRIGERATOR: (
-        REFRIGERATION_SENSOR_DESC[ThinQProperty.FRESH_AIR_FILTER],
-        SensorEntityDescription(
-            key=ThinQProperty.TARGET_TEMPERATURE,
-            translation_key=ThinQProperty.TARGET_TEMPERATURE,
-        ),
-    ),
-    DeviceType.MICROWAVE_OVEN: (RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],),
-    DeviceType.OVEN: (
-        RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-        TEMPERATURE_SENSOR_DESC[ThinQProperty.TARGET_TEMPERATURE],
-    ),
-    DeviceType.PLANT_CULTIVATOR: (
-        LIGHT_SENSOR_DESC[ThinQProperty.BRIGHTNESS],
-        LIGHT_SENSOR_DESC[ThinQProperty.DURATION],
-        RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-        RUN_STATE_SENSOR_DESC[ThinQProperty.GROWTH_MODE],
-        RUN_STATE_SENSOR_DESC[ThinQProperty.WIND_VOLUME],
-        TEMPERATURE_SENSOR_DESC[ThinQProperty.DAY_TARGET_TEMPERATURE],
-        TEMPERATURE_SENSOR_DESC[ThinQProperty.NIGHT_TARGET_TEMPERATURE],
-        TEMPERATURE_SENSOR_DESC[ThinQProperty.TEMPERATURE_STATE],
-    ),
-    DeviceType.REFRIGERATOR: (
-        REFRIGERATION_SENSOR_DESC[ThinQProperty.FRESH_AIR_FILTER],
-        WATER_FILTER_INFO_SENSOR_DESC[ThinQProperty.USED_TIME],
-    ),
-    DeviceType.ROBOT_CLEANER: (
-        RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-        JOB_MODE_SENSOR_DESC[ThinQProperty.CURRENT_JOB_MODE],
-    ),
-    DeviceType.STICK_CLEANER: (
-        BATTERY_SENSOR_DESC[ThinQProperty.BATTERY_PERCENT],
-        JOB_MODE_SENSOR_DESC[ThinQPropertyEx.CURRENT_JOB_MODE_STICK_CLEANER],
-        RUN_STATE_SENSOR_DESC[ThinQProperty.CURRENT_STATE],
-    ),
-    DeviceType.STYLER: WASHER_SENSORS,
-    DeviceType.WASHCOMBO_MAIN: WASHER_SENSORS,
-    DeviceType.WASHCOMBO_MINI: WASHER_SENSORS,
-    DeviceType.WASHER: WASHER_SENSORS,
-    DeviceType.WASHTOWER_DRYER: WASHER_SENSORS,
-    DeviceType.WASHTOWER: WASHER_SENSORS,
-    DeviceType.WASHTOWER_WASHER: WASHER_SENSORS,
-    DeviceType.WATER_HEATER: (
-        TEMPERATURE_SENSOR_DESC[ThinQProperty.CURRENT_TEMPERATURE],
-    ),
-    DeviceType.WATER_PURIFIER: (
-        RUN_STATE_SENSOR_DESC[ThinQProperty.COCK_STATE],
-        RUN_STATE_SENSOR_DESC[ThinQProperty.STERILIZING_STATE],
-        WATER_INFO_SENSOR_DESC[ThinQProperty.WATER_TYPE],
-    ),
-}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for sensor platform."""
-    entities: list[ThinQSensorEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_SENSOR_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQSensorEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(
-                        description.key,
-                        (
-                            ActiveMode.READABLE
-                            if (
-                                coordinator.api.device.device_type == DeviceType.COOKTOP
-                                or isinstance(description.key, TimerProperty)
-                            )
-                            else ActiveMode.READ_ONLY
-                        ),
-                    )
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQSensorEntity(ThinQEntity, SensorEntity):
-    """Represent a thinq sensor platform."""
-
-    def __init__(
-        self,
-        coordinator: DeviceDataUpdateCoordinator,
-        entity_description: SensorEntityDescription,
-        property_id: str,
-    ) -> None:
-        """Initialize a sensor entity."""
-        super().__init__(coordinator, entity_description, property_id)
-
-        if entity_description.device_class == SensorDeviceClass.ENUM:
-            self._attr_options = self.data.options
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        self._attr_native_value = self.data.value
-
-        if (data_unit := self._get_unit_of_measurement(self.data.unit)) is not None:
-            # For different from description's unit
-            self._attr_native_unit_of_measurement = data_unit
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s -> %s, options:%s, unit:%s",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.value,
-            self.native_value,
-            self.options,
-            self.native_unit_of_measurement,
-        )
diff --git a/homeassistant/components/lg_thinq/strings.json b/homeassistant/components/lg_thinq/strings.json
deleted file mode 100644
index 277e3db3df0..00000000000
--- a/homeassistant/components/lg_thinq/strings.json
+++ /dev/null
@@ -1,992 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
-    },
-    "error": {
-      "token_unauthorized": "The token is invalid or unauthorized."
-    },
-    "step": {
-      "user": {
-        "title": "Connect to ThinQ",
-        "description": "Please enter a ThinQ [PAT(Personal Access Token)]({pat_url}) created with your LG ThinQ account.",
-        "data": {
-          "access_token": "Personal Access Token",
-          "country": "Country"
-        }
-      }
-    }
-  },
-  "entity": {
-    "switch": {
-      "auto_mode": {
-        "name": "Auto mode"
-      },
-      "express_mode": {
-        "name": "Ice plus"
-      },
-      "hot_water_mode": {
-        "name": "Hot water"
-      },
-      "humidity_warm_mode": {
-        "name": "Warm mist"
-      },
-      "hygiene_dry_mode": {
-        "name": "Drying mode"
-      },
-      "mood_lamp_state": {
-        "name": "Mood light"
-      },
-      "operation_power": {
-        "name": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::high%]"
-      },
-      "optimal_humidity": {
-        "name": "Ventilation"
-      },
-      "power_save_enabled": {
-        "name": "Energy saving"
-      },
-      "rapid_freeze": {
-        "name": "Quick freeze"
-      },
-      "sleep_mode": {
-        "name": "Sleep mode"
-      },
-      "uv_nano": {
-        "name": "UVnano"
-      },
-      "warm_mode": {
-        "name": "Heating"
-      }
-    },
-    "binary_sensor": {
-      "eco_friendly_mode": {
-        "name": "Eco friendly"
-      },
-      "power_save_enabled": {
-        "name": "Power saving mode"
-      },
-      "remote_control_enabled": {
-        "name": "Remote start"
-      },
-      "remote_control_enabled_for_location": {
-        "name": "{location} remote start"
-      },
-      "rinse_refill": {
-        "name": "Rinse refill needed"
-      },
-      "sabbath_mode": {
-        "name": "Sabbath"
-      },
-      "machine_clean_reminder": {
-        "name": "Machine clean reminder"
-      },
-      "signal_level": {
-        "name": "Chime sound"
-      },
-      "clean_light_reminder": {
-        "name": "Clean indicator light"
-      },
-      "operation_mode": {
-        "name": "[%key:component::binary_sensor::entity_component::power::name%]"
-      },
-      "one_touch_filter": {
-        "name": "Fresh air filter"
-      }
-    },
-    "climate": {
-      "climate_air_conditioner": {
-        "state_attributes": {
-          "fan_mode": {
-            "state": {
-              "slow": "Slow",
-              "low": "Low",
-              "mid": "Medium",
-              "high": "High",
-              "power": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::high%]",
-              "auto": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]"
-            }
-          },
-          "preset_mode": {
-            "state": {
-              "air_clean": "Air purify",
-              "aroma": "Aroma",
-              "energy_saving": "Energy saving"
-            }
-          }
-        }
-      }
-    },
-    "event": {
-      "error": {
-        "name": "Error",
-        "state_attributes": {
-          "event_type": {
-            "state": {
-              "block_error": "Cleaning has stopped. Check for obstacles",
-              "brush_error": "Moving brush has a problem",
-              "bubble_error": "Bubble error",
-              "child_lock_active_error": "Child lock",
-              "cliff_error": "Fall prevention sensor has an error",
-              "clutch_error": "Clutch error",
-              "compressor_error": "Compressor error",
-              "dispensing_error": "Dispensor error",
-              "door_close_error": "Door closed error",
-              "door_lock_error": "Door lock error",
-              "door_open_error": "Door open",
-              "door_sensor_error": "Door sensor error",
-              "drainmotor_error": "Drain error",
-              "dust_full_error": "Dust bin is full and needs to be emptied",
-              "empty_water_alert_error": "Empty water",
-              "fan_motor_error": "Fan lock error",
-              "filter_clogging_error": "Filter error",
-              "frozen_error": "Freezing detection error",
-              "heater_circuit_error": "Heater circuit failure",
-              "high_power_supply_error": "Power supply error",
-              "high_temperature_detection_error": "High-temperature error",
-              "inner_lid_open_error": "Lid open error",
-              "ir_sensor_error": "IR sensor error",
-              "le_error": "LE error",
-              "le2_error": "LE2 error",
-              "left_wheel_error": "Left wheel has a problem",
-              "locked_motor_error": "Driver motor error",
-              "mop_error": "Cannot operate properly without the mop attached",
-              "motor_error": "Motor trouble",
-              "motor_lock_error": "Motor lock error",
-              "move_error": "The wheels are not touching the floor",
-              "need_water_drain": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::empty_water_alert_error%]",
-              "need_water_replenishment": "Fill water",
-              "no_battery_error": "Robot cleaner's battery is low",
-              "no_dust_bin_error": "Dust bin is not installed",
-              "no_filter_error": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::filter_clogging_error%]",
-              "out_of_balance_error": "Out of balance load",
-              "overfill_error": "Overfill error",
-              "part_malfunction_error": "AIE error",
-              "power_code_connection_error": "Power cord connection error",
-              "power_fail_error": "Power failure",
-              "right_wheel_error": "Right wheel has a problem",
-              "stack_error": "Stacking error",
-              "steam_heat_error": "Steam heater error",
-              "suction_blocked_error": "Suction motor is clogged",
-              "temperature_sensor_error": "Thermistor error",
-              "time_to_run_the_tub_clean_cycle_error": "Tub clean recommendation",
-              "timeout_error": "Timeout error",
-              "turbidity_sensor_error": "Turbidity sensor error",
-              "unable_to_lock_error": "Door lock error",
-              "unbalanced_load_error": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::out_of_balance_error%]",
-              "unknown_error": "Product requires attention",
-              "vibration_sensor_error": "Vibration sensor error",
-              "water_drain_error": "Water drain error",
-              "water_leakage_error": "Water leakage problem",
-              "water_leaks_error": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::water_leakage_error%]",
-              "water_level_sensor_error": "Water sensor error",
-              "water_supply_error": "Water supply error"
-            }
-          }
-        }
-      },
-      "notification": {
-        "name": "Notification",
-        "state_attributes": {
-          "event_type": {
-            "state": {
-              "charging_is_complete": "Charging is completed",
-              "cleaning_is_complete": "Cycle is finished",
-              "cleaning_is_completed": "Cleaning is completed",
-              "cleaning_is_failed": "Cleaning has failed",
-              "cooking_is_complete": "Turned off",
-              "door_is_open": "The door is open",
-              "drying_failed": "An error has occurred in the dryer",
-              "drying_is_complete": "Drying is completed",
-              "error_during_cleaning": "Cleaning stopped due to an error",
-              "error_during_washing": "An error has occurred in the washing machine",
-              "error_has_occurred": "An error has occurred",
-              "frozen_is_complete": "Ice plus is done",
-              "homeguard_is_stopped": "Home guard has stopped",
-              "lack_of_water": "There is no water in the water tank",
-              "motion_is_detected": "Photograph is sent as movement is detected during home guard",
-              "need_to_check_location": "Location check is required",
-              "pollution_is_high": "Air status is rapidly becoming bad",
-              "preheating_is_complete": "Preheating is done",
-              "rinse_is_not_enough": "Add rinse aid for better drying performance",
-              "salt_refill_is_needed": "Add salt for better softening performance",
-              "scheduled_cleaning_starts": "Scheduled cleaning starts",
-              "styling_is_complete": "Styling is completed",
-              "time_to_change_filter": "It is time to replace the filter",
-              "time_to_change_water_filter": "You need to replace water filter",
-              "time_to_clean": "Need to selfcleaning",
-              "time_to_clean_filter": "It is time to clean the filter",
-              "timer_is_complete": "Timer has been completed",
-              "washing_is_complete": "Washing is completed",
-              "water_is_full": "Water is full",
-              "water_leak_has_occurred": "The dishwasher has detected a water leak"
-            }
-          }
-        }
-      }
-    },
-    "number": {
-      "target_temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
-      "target_temperature_for_location": {
-        "name": "{location} temperature"
-      },
-      "light_status": {
-        "name": "Light"
-      },
-      "fan_speed": {
-        "name": "Fan"
-      },
-      "lamp_brightness": {
-        "name": "[%key:component::lg_thinq::entity::number::light_status::name%]"
-      },
-      "wind_temperature": {
-        "name": "Wind temperature"
-      },
-      "relative_hour_to_start": {
-        "name": "Schedule turn-on"
-      },
-      "relative_hour_to_start_for_location": {
-        "name": "{location} schedule turn-on"
-      },
-      "relative_hour_to_start_wm": {
-        "name": "Delay starts in"
-      },
-      "relative_hour_to_start_wm_for_location": {
-        "name": "{location} delay starts in"
-      },
-      "relative_hour_to_stop": {
-        "name": "Schedule turn-off"
-      },
-      "relative_hour_to_stop_for_location": {
-        "name": "{location} schedule turn-off"
-      },
-      "relative_hour_to_stop_wm": {
-        "name": "Delay ends in"
-      },
-      "relative_hour_to_stop_wm_for_location": {
-        "name": "{location} delay ends in"
-      },
-      "sleep_timer_relative_hour_to_stop": {
-        "name": "Sleep timer"
-      },
-      "sleep_timer_relative_hour_to_stop_for_location": {
-        "name": "{location} sleep timer"
-      },
-      "target_humidity": {
-        "name": "Target humidity"
-      }
-    },
-    "sensor": {
-      "odor_level": {
-        "name": "Odor",
-        "state": {
-          "invalid": "Invalid",
-          "weak": "Weak",
-          "normal": "Normal",
-          "strong": "Strong",
-          "very_strong": "Very strong"
-        }
-      },
-      "current_temperature": {
-        "name": "Current temperature"
-      },
-      "temperature": {
-        "name": "Temperature"
-      },
-      "total_pollution_level": {
-        "name": "Overall air quality",
-        "state": {
-          "invalid": "Invalid",
-          "good": "Good",
-          "normal": "Moderate",
-          "bad": "Unhealthy",
-          "very_bad": "Poor"
-        }
-      },
-      "monitoring_enabled": {
-        "name": "Air quality sensor",
-        "state": {
-          "on_working": "Turns on with product",
-          "always": "Always on"
-        }
-      },
-      "growth_mode": {
-        "name": "Mode",
-        "state": {
-          "standard": "Auto",
-          "ext_leaf": "Vegetables",
-          "ext_herb": "Herbs",
-          "ext_flower": "Flowers",
-          "ext_expert": "Custom growing mode"
-        }
-      },
-      "growth_mode_for_location": {
-        "name": "{location} mode",
-        "state": {
-          "standard": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]",
-          "ext_leaf": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::ext_leaf%]",
-          "ext_herb": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::ext_herb%]",
-          "ext_flower": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::ext_flower%]",
-          "ext_expert": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::ext_expert%]"
-        }
-      },
-      "wind_volume_for_location": {
-        "name": "{location} wind speed"
-      },
-      "brightness": {
-        "name": "Lighting intensity"
-      },
-      "brightness_for_location": {
-        "name": "{location} lighting intensity"
-      },
-      "duration": {
-        "name": "Lighting duration"
-      },
-      "duration_for_location": {
-        "name": "{location} lighting duration"
-      },
-      "day_target_temperature": {
-        "name": "Day growth temperature"
-      },
-      "day_target_temperature_for_location": {
-        "name": "{location} day growth temperature"
-      },
-      "night_target_temperature": {
-        "name": "Night growth temperature"
-      },
-      "night_target_temperature_for_location": {
-        "name": "{location} night growth temperature"
-      },
-      "temperature_state": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]",
-        "state": {
-          "high": "High",
-          "normal": "Good",
-          "low": "Low"
-        }
-      },
-      "temperature_state_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::target_temperature_for_location::name%]",
-        "state": {
-          "high": "[%key:component::lg_thinq::entity::sensor::temperature_state::state::high%]",
-          "normal": "[%key:component::lg_thinq::entity::sensor::temperature_state::state::normal%]",
-          "low": "[%key:component::lg_thinq::entity::sensor::temperature_state::state::low%]"
-        }
-      },
-      "current_state": {
-        "name": "Current status",
-        "state": {
-          "add_drain": "Filling",
-          "as_pop_up": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::unknown_error%]",
-          "cancel": "Cancel",
-          "carbonation": "Carbonation",
-          "change_condition": "Settings Change",
-          "charging": "Charging",
-          "charging_complete": "Charging completed",
-          "checking_turbidity": "Detecting soil level",
-          "cleaning": "Cleaning",
-          "cleaning_is_done": "Cleaning is done",
-          "complete": "Done",
-          "cook": "Cooking",
-          "cook_complete": "[%key:component::lg_thinq::entity::sensor::current_state::state::complete%]",
-          "cooking_in_progress": "[%key:component::lg_thinq::entity::sensor::current_state::state::cook%]",
-          "cool_down": "Cool down",
-          "cooling": "Cooling",
-          "detecting": "Detecting",
-          "detergent_amount": "Providing the info about the amount of detergent",
-          "diagnosis": "Smart diagnosis is in progress",
-          "dispensing": "Auto dispensing",
-          "display_loadsize": "Load size",
-          "done": "[%key:component::lg_thinq::entity::sensor::current_state::state::complete%]",
-          "drying": "Drying",
-          "during_aging": "Aging",
-          "during_fermentation": "Fermentation",
-          "end": "Finished",
-          "end_cooling": "[%key:component::lg_thinq::entity::sensor::current_state::state::drying%]",
-          "error": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::unknown_error%]",
-          "extracting_capsule": "Capsule brewing",
-          "extraction_mode": "Storing",
-          "firmware": "Updating firmware",
-          "fota": "Updating",
-          "frozen_prevent_initial": "Freeze protection standby",
-          "frozen_prevent_running": "Freeze protection in progress",
-          "frozen_prevent_pause": "Freeze protection paused",
-          "homing": "Moving",
-          "initial": "[%key:common::state::standby%]",
-          "initializing": "[%key:common::state::standby%]",
-          "lock": "Control lock",
-          "macrosector": "Remote is in use",
-          "melting": "Wort dissolving",
-          "monitoring_detecting": "HomeGuard is active",
-          "monitoring_moving": "Going to the starting point",
-          "monitoring_positioning": "Setting homeguard start point",
-          "night_dry": "Night dry",
-          "oven_setting": "Cooktop connected",
-          "pause": "[%key:common::state::paused%]",
-          "paused": "[%key:common::state::paused%]",
-          "power_fail": "Power fail",
-          "power_on": "[%key:common::state::on%]",
-          "power_off": "[%key:common::state::off%]",
-          "preference": "Setting",
-          "preheat": "Preheating",
-          "preheat_complete": "[%key:component::lg_thinq::entity::event::notification::state_attributes::event_type::state::preheating_is_complete%]",
-          "preheating": "[%key:component::lg_thinq::entity::sensor::current_state::state::preheat%]",
-          "preheating_is_done": "[%key:component::lg_thinq::entity::event::notification::state_attributes::event_type::state::preheating_is_complete%]",
-          "prepareing_fermentation": "Preparing now",
-          "presteam": "Ready to steam",
-          "prewash": "Prewashing",
-          "proofing": "Proofing",
-          "refreshing": "Refreshing",
-          "reservation": "[%key:component::lg_thinq::entity::sensor::current_state::state::macrosector%]",
-          "reserved": "Delay set",
-          "rinse_hold": "Waiting to rinse",
-          "rinsing": "Rinsing",
-          "running": "Running",
-          "running_end": "Complete",
-          "setdate": "[%key:component::lg_thinq::entity::sensor::current_state::state::macrosector%]",
-          "shoes_module": "Drying shoes",
-          "sleep": "In sleep mode",
-          "smart_grid_run": "Running smart grid",
-          "soaking": "Soak",
-          "softening": "Softener",
-          "spinning": "Spinning",
-          "stay": "Refresh",
-          "standby": "[%key:common::state::standby%]",
-          "steam": "Refresh",
-          "steam_softening": "Steam softening",
-          "sterilize": "Sterilize",
-          "temperature_stabilization": "Temperature adjusting",
-          "working": "[%key:component::lg_thinq::entity::sensor::current_state::state::cleaning%]",
-          "wrinkle_care": "Wrinkle care"
-        }
-      },
-      "current_state_for_location": {
-        "name": "{location} current status",
-        "state": {
-          "add_drain": "[%key:component::lg_thinq::entity::sensor::current_state::state::add_drain%]",
-          "as_pop_up": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::unknown_error%]",
-          "cancel": "[%key:component::lg_thinq::entity::sensor::current_state::state::cancel%]",
-          "carbonation": "[%key:component::lg_thinq::entity::sensor::current_state::state::carbonation%]",
-          "change_condition": "[%key:component::lg_thinq::entity::sensor::current_state::state::change_condition%]",
-          "charging": "[%key:component::lg_thinq::entity::sensor::current_state::state::charging%]",
-          "charging_complete": "[%key:component::lg_thinq::entity::sensor::current_state::state::charging_complete%]",
-          "checking_turbidity": "[%key:component::lg_thinq::entity::sensor::current_state::state::checking_turbidity%]",
-          "cleaning": "[%key:component::lg_thinq::entity::sensor::current_state::state::cleaning%]",
-          "cleaning_is_done": "[%key:component::lg_thinq::entity::sensor::current_state::state::cleaning_is_done%]",
-          "complete": "[%key:component::lg_thinq::entity::sensor::current_state::state::complete%]",
-          "cook": "[%key:component::lg_thinq::entity::sensor::current_state::state::cook%]",
-          "cook_complete": "[%key:component::lg_thinq::entity::sensor::current_state::state::complete%]",
-          "cooking_in_progress": "[%key:component::lg_thinq::entity::sensor::current_state::state::cook%]",
-          "cool_down": "[%key:component::lg_thinq::entity::sensor::current_state::state::cool_down%]",
-          "cooling": "[%key:component::lg_thinq::entity::sensor::current_state::state::cooling%]",
-          "detecting": "[%key:component::lg_thinq::entity::sensor::current_state::state::detecting%]",
-          "detergent_amount": "[%key:component::lg_thinq::entity::sensor::current_state::state::detergent_amount%]",
-          "diagnosis": "[%key:component::lg_thinq::entity::sensor::current_state::state::diagnosis%]",
-          "dispensing": "[%key:component::lg_thinq::entity::sensor::current_state::state::dispensing%]",
-          "display_loadsize": "[%key:component::lg_thinq::entity::sensor::current_state::state::display_loadsize%]",
-          "done": "[%key:component::lg_thinq::entity::sensor::current_state::state::complete%]",
-          "drying": "[%key:component::lg_thinq::entity::sensor::current_state::state::drying%]",
-          "during_aging": "[%key:component::lg_thinq::entity::sensor::current_state::state::during_aging%]",
-          "during_fermentation": "[%key:component::lg_thinq::entity::sensor::current_state::state::during_fermentation%]",
-          "end": "[%key:component::lg_thinq::entity::sensor::current_state::state::end%]",
-          "end_cooling": "[%key:component::lg_thinq::entity::sensor::current_state::state::drying%]",
-          "error": "[%key:component::lg_thinq::entity::event::error::state_attributes::event_type::state::unknown_error%]",
-          "extracting_capsule": "[%key:component::lg_thinq::entity::sensor::current_state::state::extracting_capsule%]",
-          "extraction_mode": "[%key:component::lg_thinq::entity::sensor::current_state::state::extraction_mode%]",
-          "firmware": "[%key:component::lg_thinq::entity::sensor::current_state::state::firmware%]",
-          "fota": "[%key:component::lg_thinq::entity::sensor::current_state::state::fota%]",
-          "frozen_prevent_initial": "[%key:component::lg_thinq::entity::sensor::current_state::state::frozen_prevent_initial%]",
-          "frozen_prevent_running": "[%key:component::lg_thinq::entity::sensor::current_state::state::frozen_prevent_running%]",
-          "frozen_prevent_pause": "[%key:component::lg_thinq::entity::sensor::current_state::state::frozen_prevent_pause%]",
-          "homing": "[%key:component::lg_thinq::entity::sensor::current_state::state::homing%]",
-          "initial": "[%key:common::state::standby%]",
-          "initializing": "[%key:common::state::standby%]",
-          "lock": "[%key:component::lg_thinq::entity::sensor::current_state::state::lock%]",
-          "macrosector": "[%key:component::lg_thinq::entity::sensor::current_state::state::macrosector%]",
-          "melting": "[%key:component::lg_thinq::entity::sensor::current_state::state::melting%]",
-          "monitoring_detecting": "[%key:component::lg_thinq::entity::sensor::current_state::state::monitoring_detecting%]",
-          "monitoring_moving": "[%key:component::lg_thinq::entity::sensor::current_state::state::monitoring_moving%]",
-          "monitoring_positioning": "[%key:component::lg_thinq::entity::sensor::current_state::state::monitoring_positioning%]",
-          "night_dry": "[%key:component::lg_thinq::entity::sensor::current_state::state::night_dry%]",
-          "oven_setting": "[%key:component::lg_thinq::entity::sensor::current_state::state::oven_setting%]",
-          "pause": "[%key:common::state::paused%]",
-          "paused": "[%key:common::state::paused%]",
-          "power_fail": "[%key:component::lg_thinq::entity::sensor::current_state::state::power_fail%]",
-          "power_on": "[%key:common::state::on%]",
-          "power_off": "[%key:common::state::off%]",
-          "preference": "[%key:component::lg_thinq::entity::sensor::current_state::state::preference%]",
-          "preheat": "[%key:component::lg_thinq::entity::sensor::current_state::state::preheat%]",
-          "preheat_complete": "[%key:component::lg_thinq::entity::event::notification::state_attributes::event_type::state::preheating_is_complete%]",
-          "preheating": "[%key:component::lg_thinq::entity::sensor::current_state::state::preheat%]",
-          "preheating_is_done": "[%key:component::lg_thinq::entity::event::notification::state_attributes::event_type::state::preheating_is_complete%]",
-          "prepareing_fermentation": "[%key:component::lg_thinq::entity::sensor::current_state::state::prepareing_fermentation%]",
-          "presteam": "[%key:component::lg_thinq::entity::sensor::current_state::state::presteam%]",
-          "prewash": "[%key:component::lg_thinq::entity::sensor::current_state::state::prewash%]",
-          "proofing": "[%key:component::lg_thinq::entity::sensor::current_state::state::proofing%]",
-          "refreshing": "[%key:component::lg_thinq::entity::sensor::current_state::state::refreshing%]",
-          "reservation": "[%key:component::lg_thinq::entity::sensor::current_state::state::macrosector%]",
-          "reserved": "[%key:component::lg_thinq::entity::sensor::current_state::state::reserved%]",
-          "rinse_hold": "[%key:component::lg_thinq::entity::sensor::current_state::state::rinse_hold%]",
-          "rinsing": "[%key:component::lg_thinq::entity::sensor::current_state::state::rinsing%]",
-          "running": "[%key:component::lg_thinq::entity::sensor::current_state::state::running%]",
-          "running_end": "[%key:component::lg_thinq::entity::sensor::current_state::state::running_end%]",
-          "setdate": "[%key:component::lg_thinq::entity::sensor::current_state::state::macrosector%]",
-          "shoes_module": "[%key:component::lg_thinq::entity::sensor::current_state::state::shoes_module%]",
-          "sleep": "[%key:component::lg_thinq::entity::sensor::current_state::state::sleep%]",
-          "smart_grid_run": "[%key:component::lg_thinq::entity::sensor::current_state::state::smart_grid_run%]",
-          "soaking": "[%key:component::lg_thinq::entity::sensor::current_state::state::soaking%]",
-          "softening": "[%key:component::lg_thinq::entity::sensor::current_state::state::softening%]",
-          "spinning": "[%key:component::lg_thinq::entity::sensor::current_state::state::spinning%]",
-          "stay": "[%key:component::lg_thinq::entity::sensor::current_state::state::stay%]",
-          "standby": "[%key:common::state::standby%]",
-          "steam": "[%key:component::lg_thinq::entity::sensor::current_state::state::steam%]",
-          "steam_softening": "[%key:component::lg_thinq::entity::sensor::current_state::state::steam_softening%]",
-          "sterilize": "[%key:component::lg_thinq::entity::sensor::current_state::state::sterilize%]",
-          "temperature_stabilization": "[%key:component::lg_thinq::entity::sensor::current_state::state::temperature_stabilization%]",
-          "working": "[%key:component::lg_thinq::entity::sensor::current_state::state::cleaning%]",
-          "wrinkle_care": "[%key:component::lg_thinq::entity::sensor::current_state::state::wrinkle_care%]"
-        }
-      },
-      "fresh_air_filter": {
-        "name": "[%key:component::lg_thinq::entity::binary_sensor::one_touch_filter::name%]",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "auto": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]",
-          "power": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::high%]",
-          "replace": "Replace filter",
-          "smart_power": "Smart safe storage",
-          "smart_off": "[%key:common::state::off%]",
-          "smart_on": "[%key:component::lg_thinq::entity::sensor::fresh_air_filter::state::smart_power%]"
-        }
-      },
-      "filter_lifetime": {
-        "name": "Filter remaining"
-      },
-      "used_time": {
-        "name": "Water filter used"
-      },
-      "current_job_mode": {
-        "name": "Operating mode",
-        "state": {
-          "air_clean": "Purify",
-          "auto": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]",
-          "clothes_dry": "Laundry",
-          "edge": "Edge cleaning",
-          "heat_pump": "Heat pump",
-          "high": "Power",
-          "intensive_dry": "Spot",
-          "macro": "Custom mode",
-          "mop": "Mop",
-          "normal": "Normal",
-          "off": "[%key:common::state::off%]",
-          "quiet_humidity": "Silent",
-          "rapid_humidity": "Jet",
-          "sector_base": "Cell by cell",
-          "select": "My space",
-          "smart_humidity": "Smart",
-          "spot": "Spiral spot mode",
-          "turbo": "[%key:component::lg_thinq::entity::select::wind_strength::state::power%]",
-          "vacation": "Vacation",
-          "zigzag": "Zigzag"
-        }
-      },
-      "current_job_mode_stick_cleaner": {
-        "name": "Operating mode",
-        "state": {
-          "auto": "Low power",
-          "high": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::high%]",
-          "mop": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::mop%]",
-          "normal": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::normal%]",
-          "off": "[%key:common::state::off%]",
-          "turbo": "[%key:component::lg_thinq::entity::select::wind_strength::state::power%]"
-        }
-      },
-      "personalization_mode": {
-        "name": "Personal mode",
-        "state": {
-          "auto_inside": "[%key:component::lg_thinq::entity::switch::auto_mode::name%]",
-          "sleep": "Sleep mode",
-          "baby": "Baby care mode",
-          "sick_house": "New Home mode",
-          "auto_outside": "Interlocking mode",
-          "pet": "Pet mode",
-          "cooking": "Cooking mode",
-          "smoke": "Smoke mode",
-          "exercise": "Exercise mode",
-          "others": "Others"
-        }
-      },
-      "current_dish_washing_course": {
-        "name": "Current cycle",
-        "state": {
-          "auto": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]",
-          "heavy": "Intensive",
-          "delicate": "Delicate",
-          "turbo": "[%key:component::lg_thinq::entity::select::wind_strength::state::power%]",
-          "normal": "Normal",
-          "rinse": "Rinse",
-          "refresh": "Refresh",
-          "express": "Express",
-          "machine_clean": "Machine clean",
-          "short_mode": "Short mode",
-          "download_cycle": "Download cycle",
-          "quick": "Quick",
-          "steam": "Steam care",
-          "spray": "Spray",
-          "eco": "Eco"
-        }
-      },
-      "rinse_level": {
-        "name": "Rinse aid dispenser level",
-        "state": {
-          "rinselevel_0": "0",
-          "rinselevel_1": "1",
-          "rinselevel_2": "2",
-          "rinselevel_3": "3",
-          "rinselevel_4": "4"
-        }
-      },
-      "softening_level": {
-        "name": "Softening level",
-        "state": {
-          "softeninglevel_0": "[%key:component::lg_thinq::entity::sensor::rinse_level::state::rinselevel_0%]",
-          "softeninglevel_1": "[%key:component::lg_thinq::entity::sensor::rinse_level::state::rinselevel_1%]",
-          "softeninglevel_2": "[%key:component::lg_thinq::entity::sensor::rinse_level::state::rinselevel_2%]",
-          "softeninglevel_3": "[%key:component::lg_thinq::entity::sensor::rinse_level::state::rinselevel_3%]",
-          "softeninglevel_4": "[%key:component::lg_thinq::entity::sensor::rinse_level::state::rinselevel_4%]"
-        }
-      },
-      "cock_state": {
-        "name": "[%key:component::lg_thinq::entity::switch::uv_nano::name%]",
-        "state": {
-          "cleaning": "In progress",
-          "normal": "[%key:common::state::standby%]"
-        }
-      },
-      "sterilizing_state": {
-        "name": "High-temp sterilization",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "on": "Sterilizing",
-          "cancel": "[%key:component::lg_thinq::entity::sensor::current_state::state::cancel%]"
-        }
-      },
-      "water_type": {
-        "name": "Type"
-      },
-      "target_temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]",
-        "state": {
-          "kimchi": "Kimchi",
-          "off": "[%key:common::state::off%]",
-          "freezer": "Freezer",
-          "fridge": "Fridge",
-          "storage": "Storage",
-          "meat_fish": "Meat/Fish",
-          "rice_grain": "Rice/Grain",
-          "vegetable_fruit": "Vege/Fruit",
-          "temperature_number": "Number"
-        }
-      },
-      "target_temperature_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::target_temperature_for_location::name%]",
-        "state": {
-          "kimchi": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::kimchi%]",
-          "off": "[%key:common::state::off%]",
-          "freezer": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::freezer%]",
-          "fridge": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::fridge%]",
-          "storage": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::storage%]",
-          "meat_fish": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::meat_fish%]",
-          "rice_grain": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::rice_grain%]",
-          "vegetable_fruit": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::vegetable_fruit%]",
-          "temperature_number": "[%key:component::lg_thinq::entity::sensor::target_temperature::state::temperature_number%]"
-        }
-      },
-      "elapsed_day_state": {
-        "name": "Brewing period"
-      },
-      "elapsed_day_total": {
-        "name": "Brewing duration"
-      },
-      "recipe_name": {
-        "name": "Homebrew recipe",
-        "state": {
-          "ipa": "IPA",
-          "pale_ale": "Pale ale",
-          "stout": "Stout",
-          "wheat": "Wheat",
-          "pilsner": "Pilsner",
-          "red_ale": "Red ale",
-          "my_recipe": "My recipe"
-        }
-      },
-      "wort_info": {
-        "name": "Wort",
-        "state": {
-          "hoppy": "Hoppy",
-          "deep_gold": "DeepGold",
-          "wheat": "Wheat",
-          "dark": "Dark"
-        }
-      },
-      "yeast_info": {
-        "name": "Yeast",
-        "state": {
-          "american_ale": "American ale",
-          "english_ale": "English ale",
-          "lager": "Lager",
-          "weizen": "Weizen"
-        }
-      },
-      "hop_oil_info": {
-        "name": "Hops"
-      },
-      "flavor_info": {
-        "name": "Flavor"
-      },
-      "beer_remain": {
-        "name": "Recipe progress"
-      },
-      "battery_level": {
-        "name": "Battery",
-        "state": {
-          "high": "Full",
-          "mid": "Medium",
-          "low": "Low",
-          "warning": "Empty"
-        }
-      },
-      "relative_to_start": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_start::name%]"
-      },
-      "relative_to_start_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_start_for_location::name%]"
-      },
-      "relative_to_start_wm": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_start_wm::name%]"
-      },
-      "relative_to_start_wm_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_start_wm_for_location::name%]"
-      },
-      "relative_to_stop": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_stop::name%]"
-      },
-      "relative_to_stop_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_stop_for_location::name%]"
-      },
-      "relative_to_stop_wm": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_stop_wm::name%]"
-      },
-      "relative_to_stop_wm_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_stop_wm_for_location::name%]"
-      },
-      "sleep_timer_relative_to_stop": {
-        "name": "[%key:component::lg_thinq::entity::number::sleep_timer_relative_hour_to_stop::name%]"
-      },
-      "sleep_timer_relative_to_stop_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::sleep_timer_relative_hour_to_stop_for_location::name%]"
-      },
-      "absolute_to_start": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_start::name%]"
-      },
-      "absolute_to_start_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_start_for_location::name%]"
-      },
-      "absolute_to_stop": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_stop::name%]"
-      },
-      "absolute_to_stop_for_location": {
-        "name": "[%key:component::lg_thinq::entity::number::relative_hour_to_stop_for_location::name%]"
-      },
-      "remain": {
-        "name": "Remaining time"
-      },
-      "remain_for_location": {
-        "name": "{location} remaining time"
-      },
-      "running": {
-        "name": "Running time"
-      },
-      "running_for_location": {
-        "name": "{location} running time"
-      },
-      "total": {
-        "name": "Total time"
-      },
-      "total_for_location": {
-        "name": "{location} total time"
-      },
-      "target": {
-        "name": "Cook time"
-      },
-      "target_for_location": {
-        "name": "{location} cook time"
-      },
-      "light_start": {
-        "name": "Lights on time"
-      },
-      "light_start_for_location": {
-        "name": "{location} lights on time"
-      },
-      "power_level": {
-        "name": "Power level"
-      },
-      "power_level_for_location": {
-        "name": "{location} power level"
-      }
-    },
-    "select": {
-      "wind_strength": {
-        "name": "Speed",
-        "state": {
-          "slow": "[%key:component::lg_thinq::entity::climate::climate_air_conditioner::state_attributes::fan_mode::state::slow%]",
-          "low": "Low",
-          "mid": "Medium",
-          "high": "High",
-          "power": "Turbo",
-          "turbo": "[%key:component::lg_thinq::entity::select::wind_strength::state::power%]",
-          "auto": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]",
-          "wind_1": "Step 1",
-          "wind_2": "Step 2",
-          "wind_3": "Step 3",
-          "wind_4": "Step 4",
-          "wind_5": "Step 5",
-          "wind_6": "Step 6",
-          "wind_7": "Step 7",
-          "wind_8": "Step 8",
-          "wind_9": "Step 9",
-          "wind_10": "Step 10"
-        }
-      },
-      "monitoring_enabled": {
-        "name": "[%key:component::lg_thinq::entity::sensor::monitoring_enabled::name%]",
-        "state": {
-          "on_working": "[%key:component::lg_thinq::entity::sensor::monitoring_enabled::state::on_working%]",
-          "always": "[%key:component::lg_thinq::entity::sensor::monitoring_enabled::state::always%]"
-        }
-      },
-      "current_job_mode": {
-        "name": "Operating mode",
-        "state": {
-          "air_clean": "Purifying",
-          "auto": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]",
-          "baby_care": "[%key:component::lg_thinq::entity::sensor::personalization_mode::state::baby%]",
-          "circulator": "Booster",
-          "clean": "Single",
-          "direct_clean": "Direct mode",
-          "dual_clean": "Dual",
-          "fast": "[%key:component::lg_thinq::entity::select::wind_strength::state::power%]",
-          "heat_pump": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::heat_pump%]",
-          "humidify": "Mist",
-          "humidify_and_air_clean": "Mist & purifying",
-          "humidity": "Humid",
-          "nature_clean": "Natural mode",
-          "pet_clean": "[%key:component::lg_thinq::entity::sensor::personalization_mode::state::pet%]",
-          "silent": "Silent",
-          "sleep": "Sleep",
-          "smart": "Smart mode",
-          "space_clean": "Diffusion mode",
-          "spot_clean": "Wide mode",
-          "turbo": "[%key:component::lg_thinq::entity::select::wind_strength::state::power%]",
-          "up_feature": "Additional mode",
-          "vacation": "Vacation"
-        }
-      },
-      "operation_mode": {
-        "name": "Operation",
-        "state": {
-          "cancel": "[%key:component::lg_thinq::entity::sensor::current_state::state::cancel%]",
-          "power_off": "Power off",
-          "preheating": "Preheating",
-          "start": "[%key:common::action::start%]",
-          "stop": "[%key:common::action::stop%]",
-          "wake_up": "Sleep mode off"
-        }
-      },
-      "operation_mode_for_location": {
-        "name": "{location} operation",
-        "state": {
-          "cancel": "[%key:component::lg_thinq::entity::sensor::current_state::state::cancel%]",
-          "power_off": "[%key:component::lg_thinq::entity::select::operation_mode::state::power_off%]",
-          "preheating": "[%key:component::lg_thinq::entity::select::operation_mode::state::preheating%]",
-          "start": "[%key:common::action::start%]",
-          "stop": "[%key:common::action::stop%]",
-          "wake_up": "[%key:component::lg_thinq::entity::select::operation_mode::state::wake_up%]"
-        }
-      },
-      "air_clean_operation_mode": {
-        "name": "[%key:component::lg_thinq::entity::climate::climate_air_conditioner::state_attributes::preset_mode::state::air_clean%]",
-        "state": {
-          "start": "[%key:common::action::start%]",
-          "stop": "[%key:common::action::stop%]"
-        }
-      },
-      "cook_mode": {
-        "name": "Cook mode",
-        "state": {
-          "bake": "Bake",
-          "convection_bake": "Convection bake",
-          "convection_roast": "Convection roast",
-          "roast": "Roast",
-          "crisp_convection": "Crisp convection"
-        }
-      },
-      "cook_mode_for_location": {
-        "name": "{location} cook mode",
-        "state": {
-          "bake": "[%key:component::lg_thinq::entity::select::cook_mode::state::bake%]",
-          "convection_bake": "[%key:component::lg_thinq::entity::select::cook_mode::state::convection_bake%]",
-          "convection_roast": "[%key:component::lg_thinq::entity::select::cook_mode::state::convection_roast%]",
-          "roast": "[%key:component::lg_thinq::entity::select::cook_mode::state::roast%]",
-          "crisp_convection": "[%key:component::lg_thinq::entity::select::cook_mode::state::crisp_convection%]"
-        }
-      },
-      "light_brightness": {
-        "name": "Light"
-      },
-      "wind_angle": {
-        "name": "Rotation",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "angle_45": "45°",
-          "angle_60": "60°",
-          "angle_90": "90°",
-          "angle_140": "140°"
-        }
-      },
-      "display_light": {
-        "name": "Display brightness",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "level_1": "Brightness 1",
-          "level_2": "Brightness 2",
-          "level_3": "Brightness 3"
-        }
-      },
-      "fresh_air_filter": {
-        "name": "[%key:component::lg_thinq::entity::binary_sensor::one_touch_filter::name%]",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "auto": "[%key:component::lg_thinq::entity::sensor::growth_mode::state::standard%]",
-          "power": "[%key:component::lg_thinq::entity::sensor::current_job_mode::state::high%]",
-          "replace": "[%key:component::lg_thinq::entity::sensor::fresh_air_filter::state::replace%]",
-          "smart_power": "[%key:component::lg_thinq::entity::sensor::fresh_air_filter::state::smart_power%]",
-          "smart_off": "[%key:common::state::off%]",
-          "smart_on": "[%key:component::lg_thinq::entity::sensor::fresh_air_filter::state::smart_power%]"
-        }
-      },
-      "hygiene_dry_mode": {
-        "name": "[%key:component::lg_thinq::entity::switch::hygiene_dry_mode::name%]",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "fast": "Fast",
-          "silent": "Silent",
-          "normal": "[%key:component::lg_thinq::entity::sensor::current_dish_washing_course::state::delicate%]"
-        }
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/lg_thinq/switch.py b/homeassistant/components/lg_thinq/switch.py
deleted file mode 100644
index 25fd7eb8b64..00000000000
--- a/homeassistant/components/lg_thinq/switch.py
+++ /dev/null
@@ -1,228 +0,0 @@
-"""Support for switch entities."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-import logging
-from typing import Any
-
-from thinqconnect import DeviceType
-from thinqconnect.devices.const import Property as ThinQProperty
-from thinqconnect.integration import ActiveMode
-
-from homeassistant.components.switch import (
-    SwitchDeviceClass,
-    SwitchEntity,
-    SwitchEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ThinqConfigEntry
-from .entity import ThinQEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class ThinQSwitchEntityDescription(SwitchEntityDescription):
-    """Describes ThinQ switch entity."""
-
-    on_key: str | None = None
-    off_key: str | None = None
-
-
-DEVICE_TYPE_SWITCH_MAP: dict[DeviceType, tuple[ThinQSwitchEntityDescription, ...]] = {
-    DeviceType.AIR_CONDITIONER: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.POWER_SAVE_ENABLED,
-            translation_key=ThinQProperty.POWER_SAVE_ENABLED,
-            on_key="true",
-            off_key="false",
-            entity_category=EntityCategory.CONFIG,
-        ),
-    ),
-    DeviceType.AIR_PURIFIER_FAN: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.AIR_FAN_OPERATION_MODE, translation_key="operation_power"
-        ),
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.UV_NANO,
-            translation_key=ThinQProperty.UV_NANO,
-            on_key="on",
-            off_key="off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.WARM_MODE,
-            translation_key=ThinQProperty.WARM_MODE,
-            on_key="warm_on",
-            off_key="warm_off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-    ),
-    DeviceType.AIR_PURIFIER: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.AIR_PURIFIER_OPERATION_MODE,
-            translation_key="operation_power",
-        ),
-    ),
-    DeviceType.DEHUMIDIFIER: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.DEHUMIDIFIER_OPERATION_MODE,
-            translation_key="operation_power",
-        ),
-    ),
-    DeviceType.HUMIDIFIER: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.HUMIDIFIER_OPERATION_MODE,
-            translation_key="operation_power",
-        ),
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.WARM_MODE,
-            translation_key="humidity_warm_mode",
-            on_key="warm_on",
-            off_key="warm_off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.MOOD_LAMP_STATE,
-            translation_key=ThinQProperty.MOOD_LAMP_STATE,
-            on_key="on",
-            off_key="off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.AUTO_MODE,
-            translation_key=ThinQProperty.AUTO_MODE,
-            on_key="auto_on",
-            off_key="auto_off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.SLEEP_MODE,
-            translation_key=ThinQProperty.SLEEP_MODE,
-            on_key="sleep_on",
-            off_key="sleep_off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-    ),
-    DeviceType.REFRIGERATOR: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.EXPRESS_MODE,
-            translation_key=ThinQProperty.EXPRESS_MODE,
-            on_key="true",
-            off_key="false",
-            entity_category=EntityCategory.CONFIG,
-        ),
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.RAPID_FREEZE,
-            translation_key=ThinQProperty.RAPID_FREEZE,
-            on_key="true",
-            off_key="false",
-            entity_category=EntityCategory.CONFIG,
-        ),
-    ),
-    DeviceType.SYSTEM_BOILER: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.HOT_WATER_MODE,
-            translation_key=ThinQProperty.HOT_WATER_MODE,
-            on_key="on",
-            off_key="off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-    ),
-    DeviceType.WINE_CELLAR: (
-        ThinQSwitchEntityDescription(
-            key=ThinQProperty.OPTIMAL_HUMIDITY,
-            translation_key=ThinQProperty.OPTIMAL_HUMIDITY,
-            on_key="on",
-            off_key="off",
-            entity_category=EntityCategory.CONFIG,
-        ),
-    ),
-}
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for switch platform."""
-    entities: list[ThinQSwitchEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_SWITCH_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQSwitchEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(
-                        description.key, ActiveMode.READ_WRITE
-                    )
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQSwitchEntity(ThinQEntity, SwitchEntity):
-    """Represent a thinq switch platform."""
-
-    entity_description: ThinQSwitchEntityDescription
-    _attr_device_class = SwitchDeviceClass.SWITCH
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        if (key := self.entity_description.on_key) is not None:
-            self._attr_is_on = self.data.value == key
-        else:
-            self._attr_is_on = self.data.is_on
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s -> %s",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.is_on,
-            self.is_on,
-        )
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the switch."""
-        _LOGGER.debug(
-            "[%s:%s] async_turn_on id: %s",
-            self.coordinator.device_name,
-            self.name,
-            self.property_id,
-        )
-        if (on_command := self.entity_description.on_key) is not None:
-            await self.async_call_api(
-                self.coordinator.api.post(self.property_id, on_command)
-            )
-        else:
-            await self.async_call_api(
-                self.coordinator.api.async_turn_on(self.property_id)
-            )
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the switch."""
-        _LOGGER.debug(
-            "[%s:%s] async_turn_off id: %s",
-            self.coordinator.device_name,
-            self.name,
-            self.property_id,
-        )
-        if (off_command := self.entity_description.off_key) is not None:
-            await self.async_call_api(
-                self.coordinator.api.post(self.property_id, off_command)
-            )
-        else:
-            await self.async_call_api(
-                self.coordinator.api.async_turn_off(self.property_id)
-            )
diff --git a/homeassistant/components/lg_thinq/vacuum.py b/homeassistant/components/lg_thinq/vacuum.py
deleted file mode 100644
index 138b9ba55bf..00000000000
--- a/homeassistant/components/lg_thinq/vacuum.py
+++ /dev/null
@@ -1,172 +0,0 @@
-"""Support for vacuum entities."""
-
-from __future__ import annotations
-
-from enum import StrEnum
-import logging
-
-from thinqconnect import DeviceType
-from thinqconnect.integration import ExtendedProperty
-
-from homeassistant.components.vacuum import (
-    STATE_CLEANING,
-    STATE_DOCKED,
-    STATE_ERROR,
-    STATE_RETURNING,
-    StateVacuumEntity,
-    StateVacuumEntityDescription,
-    VacuumEntityFeature,
-)
-from homeassistant.const import STATE_IDLE, STATE_PAUSED
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ThinqConfigEntry
-from .entity import ThinQEntity
-
-DEVICE_TYPE_VACUUM_MAP: dict[DeviceType, tuple[StateVacuumEntityDescription, ...]] = {
-    DeviceType.ROBOT_CLEANER: (
-        StateVacuumEntityDescription(
-            key=ExtendedProperty.VACUUM,
-            name=None,
-        ),
-    ),
-}
-
-
-class State(StrEnum):
-    """State of device."""
-
-    HOMING = "homing"
-    PAUSE = "pause"
-    RESUME = "resume"
-    SLEEP = "sleep"
-    START = "start"
-    WAKE_UP = "wake_up"
-
-
-ROBOT_STATUS_TO_HA = {
-    "charging": STATE_DOCKED,
-    "diagnosis": STATE_IDLE,
-    "homing": STATE_RETURNING,
-    "initializing": STATE_IDLE,
-    "macrosector": STATE_IDLE,
-    "monitoring_detecting": STATE_IDLE,
-    "monitoring_moving": STATE_IDLE,
-    "monitoring_positioning": STATE_IDLE,
-    "pause": STATE_PAUSED,
-    "reservation": STATE_IDLE,
-    "setdate": STATE_IDLE,
-    "sleep": STATE_IDLE,
-    "standby": STATE_IDLE,
-    "working": STATE_CLEANING,
-    "error": STATE_ERROR,
-}
-ROBOT_BATT_TO_HA = {
-    "moveless": 5,
-    "dock_level": 5,
-    "low": 30,
-    "mid": 50,
-    "high": 90,
-    "full": 100,
-    "over_charge": 100,
-}
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ThinqConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up an entry for vacuum platform."""
-    entities: list[ThinQStateVacuumEntity] = []
-    for coordinator in entry.runtime_data.coordinators.values():
-        if (
-            descriptions := DEVICE_TYPE_VACUUM_MAP.get(
-                coordinator.api.device.device_type
-            )
-        ) is not None:
-            for description in descriptions:
-                entities.extend(
-                    ThinQStateVacuumEntity(coordinator, description, property_id)
-                    for property_id in coordinator.api.get_active_idx(description.key)
-                )
-
-    if entities:
-        async_add_entities(entities)
-
-
-class ThinQStateVacuumEntity(ThinQEntity, StateVacuumEntity):
-    """Represent a thinq vacuum platform."""
-
-    _attr_supported_features = (
-        VacuumEntityFeature.SEND_COMMAND
-        | VacuumEntityFeature.STATE
-        | VacuumEntityFeature.BATTERY
-        | VacuumEntityFeature.START
-        | VacuumEntityFeature.PAUSE
-        | VacuumEntityFeature.RETURN_HOME
-    )
-
-    def _update_status(self) -> None:
-        """Update status itself."""
-        super()._update_status()
-
-        # Update state.
-        self._attr_state = ROBOT_STATUS_TO_HA[self.data.current_state]
-
-        # Update battery.
-        if (level := self.data.battery) is not None:
-            self._attr_battery_level = (
-                level if isinstance(level, int) else ROBOT_BATT_TO_HA.get(level, 0)
-            )
-
-        _LOGGER.debug(
-            "[%s:%s] update status: %s -> %s (battery_level=%s)",
-            self.coordinator.device_name,
-            self.property_id,
-            self.data.current_state,
-            self.state,
-            self.battery_level,
-        )
-
-    async def async_start(self, **kwargs) -> None:
-        """Start the device."""
-        if self.data.current_state == State.SLEEP:
-            value = State.WAKE_UP
-        elif self._attr_state == STATE_PAUSED:
-            value = State.RESUME
-        else:
-            value = State.START
-
-        _LOGGER.debug(
-            "[%s:%s] async_start", self.coordinator.device_name, self.property_id
-        )
-        await self.async_call_api(
-            self.coordinator.api.async_set_clean_operation_mode(self.property_id, value)
-        )
-
-    async def async_pause(self, **kwargs) -> None:
-        """Pause the device."""
-        _LOGGER.debug(
-            "[%s:%s] async_pause", self.coordinator.device_name, self.property_id
-        )
-        await self.async_call_api(
-            self.coordinator.api.async_set_clean_operation_mode(
-                self.property_id, State.PAUSE
-            )
-        )
-
-    async def async_return_to_base(self, **kwargs) -> None:
-        """Return device to dock."""
-        _LOGGER.debug(
-            "[%s:%s] async_return_to_base",
-            self.coordinator.device_name,
-            self.property_id,
-        )
-        await self.async_call_api(
-            self.coordinator.api.async_set_clean_operation_mode(
-                self.property_id, State.HOMING
-            )
-        )
diff --git a/homeassistant/components/lidarr/__init__.py b/homeassistant/components/lidarr/__init__.py
index a421a881b69..907c89eb737 100644
--- a/homeassistant/components/lidarr/__init__.py
+++ b/homeassistant/components/lidarr/__init__.py
@@ -16,7 +16,6 @@ from homeassistant.helpers.device_registry import DeviceEntryType
 
 from .const import DEFAULT_NAME, DOMAIN
 from .coordinator import (
-    AlbumsDataUpdateCoordinator,
     DiskSpaceDataUpdateCoordinator,
     QueueDataUpdateCoordinator,
     StatusDataUpdateCoordinator,
@@ -36,7 +35,6 @@ class LidarrData:
     queue: QueueDataUpdateCoordinator
     status: StatusDataUpdateCoordinator
     wanted: WantedDataUpdateCoordinator
-    albums: AlbumsDataUpdateCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: LidarrConfigEntry) -> bool:
@@ -56,7 +54,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: LidarrConfigEntry) -> bo
         queue=QueueDataUpdateCoordinator(hass, host_configuration, lidarr),
         status=StatusDataUpdateCoordinator(hass, host_configuration, lidarr),
         wanted=WantedDataUpdateCoordinator(hass, host_configuration, lidarr),
-        albums=AlbumsDataUpdateCoordinator(hass, host_configuration, lidarr),
     )
     for field in fields(data):
         coordinator = getattr(data, field.name)
diff --git a/homeassistant/components/lidarr/coordinator.py b/homeassistant/components/lidarr/coordinator.py
index 1010f708748..2f18e4f0ebb 100644
--- a/homeassistant/components/lidarr/coordinator.py
+++ b/homeassistant/components/lidarr/coordinator.py
@@ -17,7 +17,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DEFAULT_MAX_RECORDS, DOMAIN, LOGGER
 
-T = TypeVar("T", bound=list[LidarrRootFolder] | LidarrQueue | str | LidarrAlbum | int)
+T = TypeVar("T", bound=list[LidarrRootFolder] | LidarrQueue | str | LidarrAlbum)
 
 
 class LidarrDataUpdateCoordinator(DataUpdateCoordinator[T], Generic[T], ABC):
@@ -96,11 +96,3 @@ class WantedDataUpdateCoordinator(LidarrDataUpdateCoordinator[LidarrAlbum]):
             LidarrAlbum,
             await self.api_client.async_get_wanted(page_size=DEFAULT_MAX_RECORDS),
         )
-
-
-class AlbumsDataUpdateCoordinator(LidarrDataUpdateCoordinator[int]):
-    """Albums update coordinator."""
-
-    async def _fetch_data(self) -> int:
-        """Fetch the album data."""
-        return len(cast(list[LidarrAlbum], await self.api_client.async_get_albums()))
diff --git a/homeassistant/components/lidarr/sensor.py b/homeassistant/components/lidarr/sensor.py
index b02361e65ca..e7ea1027ff0 100644
--- a/homeassistant/components/lidarr/sensor.py
+++ b/homeassistant/components/lidarr/sensor.py
@@ -85,7 +85,7 @@ SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
     "queue": LidarrSensorEntityDescription[LidarrQueue](
         key="queue",
         translation_key="queue",
-        native_unit_of_measurement="albums",
+        native_unit_of_measurement="Albums",
         value_fn=lambda data, _: data.totalRecords,
         state_class=SensorStateClass.TOTAL,
         attributes_fn=lambda data: {i.title: queue_str(i) for i in data.records},
@@ -93,7 +93,7 @@ SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
     "wanted": LidarrSensorEntityDescription[LidarrQueue](
         key="wanted",
         translation_key="wanted",
-        native_unit_of_measurement="albums",
+        native_unit_of_measurement="Albums",
         value_fn=lambda data, _: data.totalRecords,
         state_class=SensorStateClass.TOTAL,
         entity_registry_enabled_default=False,
@@ -101,14 +101,6 @@ SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
             album.title: album.artist.artistName for album in data.records
         },
     ),
-    "albums": LidarrSensorEntityDescription[int](
-        key="albums",
-        translation_key="albums",
-        native_unit_of_measurement="albums",
-        value_fn=lambda data, _: data,
-        state_class=SensorStateClass.TOTAL,
-        entity_registry_enabled_default=False,
-    ),
 }
 
 
diff --git a/homeassistant/components/lidarr/strings.json b/homeassistant/components/lidarr/strings.json
index 68e9c395319..bbe4b19db25 100644
--- a/homeassistant/components/lidarr/strings.json
+++ b/homeassistant/components/lidarr/strings.json
@@ -39,9 +39,6 @@
       },
       "wanted": {
         "name": "Wanted"
-      },
-      "albums": {
-        "name": "Albums"
       }
     }
   }
diff --git a/homeassistant/components/linkplay/__init__.py b/homeassistant/components/linkplay/__init__.py
index 918e52a755d..808f2f93ce2 100644
--- a/homeassistant/components/linkplay/__init__.py
+++ b/homeassistant/components/linkplay/__init__.py
@@ -4,7 +4,6 @@ from dataclasses import dataclass
 
 from aiohttp import ClientSession
 from linkplay.bridge import LinkPlayBridge
-from linkplay.controller import LinkPlayController
 from linkplay.discovery import linkplay_factory_httpapi_bridge
 from linkplay.exceptions import LinkPlayRequestException
 
@@ -13,7 +12,7 @@ from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import CONTROLLER, CONTROLLER_KEY, DOMAIN, PLATFORMS
+from .const import PLATFORMS
 from .utils import async_get_client_session
 
 
@@ -33,7 +32,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: LinkPlayConfigEntry) ->
     session: ClientSession = await async_get_client_session(hass)
     bridge: LinkPlayBridge | None = None
 
-    # try create a bridge
     try:
         bridge = await linkplay_factory_httpapi_bridge(entry.data[CONF_HOST], session)
     except LinkPlayRequestException as exception:
@@ -41,19 +39,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: LinkPlayConfigEntry) ->
             f"Failed to connect to LinkPlay device at {entry.data[CONF_HOST]}"
         ) from exception
 
-    # setup the controller and discover multirooms
-    controller: LinkPlayController | None = None
-    hass.data.setdefault(DOMAIN, {})
-    if CONTROLLER not in hass.data[DOMAIN]:
-        controller = LinkPlayController(session)
-        hass.data[DOMAIN][CONTROLLER_KEY] = controller
-    else:
-        controller = hass.data[DOMAIN][CONTROLLER_KEY]
-
-    await controller.add_bridge(bridge)
-    await controller.discover_multirooms()
-
-    # forward to platforms
     entry.runtime_data = LinkPlayData(bridge=bridge)
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
diff --git a/homeassistant/components/linkplay/const.py b/homeassistant/components/linkplay/const.py
index a776365e38f..f531e311f46 100644
--- a/homeassistant/components/linkplay/const.py
+++ b/homeassistant/components/linkplay/const.py
@@ -1,12 +1,7 @@
 """LinkPlay constants."""
 
-from linkplay.controller import LinkPlayController
-
 from homeassistant.const import Platform
-from homeassistant.util.hass_dict import HassKey
 
 DOMAIN = "linkplay"
-CONTROLLER = "controller"
-CONTROLLER_KEY: HassKey[LinkPlayController] = HassKey(CONTROLLER)
 PLATFORMS = [Platform.MEDIA_PLAYER]
 DATA_SESSION = "session"
diff --git a/homeassistant/components/linkplay/diagnostics.py b/homeassistant/components/linkplay/diagnostics.py
deleted file mode 100644
index cfc1346aff4..00000000000
--- a/homeassistant/components/linkplay/diagnostics.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Diagnostics support for Linkplay."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.core import HomeAssistant
-
-from . import LinkPlayConfigEntry
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: LinkPlayConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    data = entry.runtime_data
-    return {"device_info": data.bridge.to_dict()}
diff --git a/homeassistant/components/linkplay/manifest.json b/homeassistant/components/linkplay/manifest.json
index e74d22b8207..dd1e08eda49 100644
--- a/homeassistant/components/linkplay/manifest.json
+++ b/homeassistant/components/linkplay/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["linkplay"],
-  "requirements": ["python-linkplay==0.0.20"],
+  "requirements": ["python-linkplay==0.0.15"],
   "zeroconf": ["_linkplay._tcp.local."]
 }
diff --git a/homeassistant/components/linkplay/media_player.py b/homeassistant/components/linkplay/media_player.py
index c29c2978522..8654600ac73 100644
--- a/homeassistant/components/linkplay/media_player.py
+++ b/homeassistant/components/linkplay/media_player.py
@@ -8,8 +8,7 @@ from typing import Any, Concatenate
 
 from linkplay.bridge import LinkPlayBridge
 from linkplay.consts import EqualizerMode, LoopMode, PlayingMode, PlayingStatus
-from linkplay.controller import LinkPlayController, LinkPlayMultiroom
-from linkplay.exceptions import LinkPlayRequestException
+from linkplay.exceptions import LinkPlayException, LinkPlayRequestException
 import voluptuous as vol
 
 from homeassistant.components import media_source
@@ -23,20 +22,18 @@ from homeassistant.components.media_player import (
     RepeatMode,
     async_process_play_media_url,
 )
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
     entity_platform,
-    entity_registry as er,
 )
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.dt import utcnow
 
-from . import LinkPlayConfigEntry, LinkPlayData
-from .const import CONTROLLER_KEY, DOMAIN
+from . import LinkPlayConfigEntry
+from .const import DOMAIN
 from .utils import MANUFACTURER_GENERIC, get_info_from_project
 
 _LOGGER = logging.getLogger(__name__)
@@ -48,7 +45,6 @@ STATE_MAP: dict[PlayingStatus, MediaPlayerState] = {
 }
 
 SOURCE_MAP: dict[PlayingMode, str] = {
-    PlayingMode.NETWORK: "Wifi",
     PlayingMode.LINE_IN: "Line In",
     PlayingMode.BLUETOOTH: "Bluetooth",
     PlayingMode.OPTICAL: "Optical",
@@ -69,8 +65,6 @@ SOURCE_MAP: dict[PlayingMode, str] = {
     PlayingMode.FM: "FM Radio",
     PlayingMode.RCA: "RCA",
     PlayingMode.UDISK: "USB",
-    PlayingMode.SPOTIFY: "Spotify",
-    PlayingMode.TIDAL: "Tidal",
     PlayingMode.FOLLOWER: "Follower",
 }
 
@@ -203,8 +197,9 @@ class LinkPlayMediaPlayerEntity(MediaPlayerEntity):
         try:
             await self._bridge.player.update_status()
             self._update_properties()
-        except LinkPlayRequestException:
+        except LinkPlayException:
             self._attr_available = False
+            raise
 
     @exception_wrap
     async def async_select_source(self, source: str) -> None:
@@ -293,82 +288,7 @@ class LinkPlayMediaPlayerEntity(MediaPlayerEntity):
     @exception_wrap
     async def async_play_preset(self, preset_number: int) -> None:
         """Play preset number."""
-        try:
-            await self._bridge.player.play_preset(preset_number)
-        except ValueError as err:
-            raise HomeAssistantError(err) from err
-
-    @exception_wrap
-    async def async_media_seek(self, position: float) -> None:
-        """Seek to a position."""
-        await self._bridge.player.seek(round(position))
-
-    @exception_wrap
-    async def async_join_players(self, group_members: list[str]) -> None:
-        """Join `group_members` as a player group with the current player."""
-
-        controller: LinkPlayController = self.hass.data[DOMAIN][CONTROLLER_KEY]
-        multiroom = self._bridge.multiroom
-        if multiroom is None:
-            multiroom = LinkPlayMultiroom(self._bridge)
-
-        for group_member in group_members:
-            bridge = self._get_linkplay_bridge(group_member)
-            if bridge:
-                await multiroom.add_follower(bridge)
-
-        await controller.discover_multirooms()
-
-    def _get_linkplay_bridge(self, entity_id: str) -> LinkPlayBridge:
-        """Get linkplay bridge from entity_id."""
-
-        entity_registry = er.async_get(self.hass)
-
-        # Check for valid linkplay media_player entity
-        entity_entry = entity_registry.async_get(entity_id)
-
-        if (
-            entity_entry is None
-            or entity_entry.domain != Platform.MEDIA_PLAYER
-            or entity_entry.platform != DOMAIN
-            or entity_entry.config_entry_id is None
-        ):
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_grouping_entity",
-                translation_placeholders={"entity_id": entity_id},
-            )
-
-        config_entry = self.hass.config_entries.async_get_entry(
-            entity_entry.config_entry_id
-        )
-        assert config_entry
-
-        # Return bridge
-        data: LinkPlayData = config_entry.runtime_data
-        return data.bridge
-
-    @property
-    def group_members(self) -> list[str]:
-        """List of players which are grouped together."""
-        multiroom = self._bridge.multiroom
-        if multiroom is not None:
-            return [multiroom.leader.device.uuid] + [
-                follower.device.uuid for follower in multiroom.followers
-            ]
-
-        return []
-
-    @exception_wrap
-    async def async_unjoin_player(self) -> None:
-        """Remove this player from any group."""
-        controller: LinkPlayController = self.hass.data[DOMAIN][CONTROLLER_KEY]
-
-        multiroom = self._bridge.multiroom
-        if multiroom is not None:
-            await multiroom.remove_follower(self._bridge)
-
-        await controller.discover_multirooms()
+        await self._bridge.player.play_preset(preset_number)
 
     def _update_properties(self) -> None:
         """Update the properties of the media player."""
@@ -388,9 +308,9 @@ class LinkPlayMediaPlayerEntity(MediaPlayerEntity):
                 )
 
             self._attr_source = SOURCE_MAP.get(self._bridge.player.play_mode, "other")
-            self._attr_media_position = self._bridge.player.current_position_in_seconds
+            self._attr_media_position = self._bridge.player.current_position / 1000
             self._attr_media_position_updated_at = utcnow()
-            self._attr_media_duration = self._bridge.player.total_length_in_seconds
+            self._attr_media_duration = self._bridge.player.total_length / 1000
             self._attr_media_artist = self._bridge.player.artist
             self._attr_media_title = self._bridge.player.title
             self._attr_media_album_name = self._bridge.player.album
diff --git a/homeassistant/components/linkplay/services.yaml b/homeassistant/components/linkplay/services.yaml
index 0d7335a28c8..20bc47be7a7 100644
--- a/homeassistant/components/linkplay/services.yaml
+++ b/homeassistant/components/linkplay/services.yaml
@@ -11,4 +11,5 @@ play_preset:
       selector:
         number:
           min: 1
+          max: 10
           mode: box
diff --git a/homeassistant/components/linkplay/strings.json b/homeassistant/components/linkplay/strings.json
index f3495b293e0..12870816af7 100644
--- a/homeassistant/components/linkplay/strings.json
+++ b/homeassistant/components/linkplay/strings.json
@@ -34,10 +34,5 @@
         }
       }
     }
-  },
-  "exceptions": {
-    "invalid_grouping_entity": {
-      "message": "Entity with id {entity_id} can't be added to the LinkPlay multiroom. Is the entity a LinkPlay mediaplayer?"
-    }
   }
 }
diff --git a/homeassistant/components/litejet/config_flow.py b/homeassistant/components/litejet/config_flow.py
index 9aa0b19c506..b9f8a0f4b66 100644
--- a/homeassistant/components/litejet/config_flow.py
+++ b/homeassistant/components/litejet/config_flow.py
@@ -24,6 +24,10 @@ from .const import CONF_DEFAULT_TRANSITION, DOMAIN
 class LiteJetOptionsFlow(OptionsFlow):
     """Handle LiteJet options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize LiteJet options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -80,4 +84,4 @@ class LiteJetConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> LiteJetOptionsFlow:
         """Get the options flow for this handler."""
-        return LiteJetOptionsFlow()
+        return LiteJetOptionsFlow(config_entry)
diff --git a/homeassistant/components/local_file/manifest.json b/homeassistant/components/local_file/manifest.json
index 0e6e64d17e5..46268ff2a77 100644
--- a/homeassistant/components/local_file/manifest.json
+++ b/homeassistant/components/local_file/manifest.json
@@ -2,7 +2,6 @@
   "domain": "local_file",
   "name": "Local File",
   "codeowners": [],
-  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/local_file",
   "iot_class": "local_polling"
 }
diff --git a/homeassistant/components/logbook/__init__.py b/homeassistant/components/logbook/__init__.py
index 2e2ffddac88..239a52ff7a1 100644
--- a/homeassistant/components/logbook/__init__.py
+++ b/homeassistant/components/logbook/__init__.py
@@ -55,7 +55,7 @@ CONFIG_SCHEMA = vol.Schema(
 LOG_MESSAGE_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_NAME): cv.string,
-        vol.Required(ATTR_MESSAGE): cv.string,
+        vol.Required(ATTR_MESSAGE): cv.template,
         vol.Optional(ATTR_DOMAIN): cv.slug,
         vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
     }
@@ -112,6 +112,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             # away so we use the "logbook" domain
             domain = DOMAIN
 
+        message = message.async_render(parse_result=False)
         async_log_entry(hass, name, message, domain, entity_id, service.context)
 
     frontend.async_register_built_in_panel(
diff --git a/homeassistant/components/london_underground/coordinator.py b/homeassistant/components/london_underground/coordinator.py
index 29d1e8e2f54..cf14ad14b43 100644
--- a/homeassistant/components/london_underground/coordinator.py
+++ b/homeassistant/components/london_underground/coordinator.py
@@ -24,7 +24,6 @@ class LondonTubeCoordinator(DataUpdateCoordinator[dict[str, dict[str, str]]]):
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=None,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/luftdaten/__init__.py b/homeassistant/components/luftdaten/__init__.py
index 37f0f27d2d8..9079b056731 100644
--- a/homeassistant/components/luftdaten/__init__.py
+++ b/homeassistant/components/luftdaten/__init__.py
@@ -52,7 +52,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator: DataUpdateCoordinator[dict[str, Any]] = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{DOMAIN}_{sensor_community.sensor_id}",
         update_interval=DEFAULT_SCAN_INTERVAL,
         update_method=async_update,
diff --git a/homeassistant/components/lupusec/alarm_control_panel.py b/homeassistant/components/lupusec/alarm_control_panel.py
index 4b3d12ad743..73aba775a2a 100644
--- a/homeassistant/components/lupusec/alarm_control_panel.py
+++ b/homeassistant/components/lupusec/alarm_control_panel.py
@@ -9,9 +9,14 @@ import lupupy
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -59,16 +64,16 @@ class LupusecAlarm(LupusecDevice, AlarmControlPanelEntity):
         )
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         if self._device.is_standby:
-            state = AlarmControlPanelState.DISARMED
+            state = STATE_ALARM_DISARMED
         elif self._device.is_away:
-            state = AlarmControlPanelState.ARMED_AWAY
+            state = STATE_ALARM_ARMED_AWAY
         elif self._device.is_home:
-            state = AlarmControlPanelState.ARMED_HOME
+            state = STATE_ALARM_ARMED_HOME
         elif self._device.is_alarm_triggered:
-            state = AlarmControlPanelState.TRIGGERED
+            state = STATE_ALARM_TRIGGERED
         else:
             state = None
         return state
diff --git a/homeassistant/components/lutron/manifest.json b/homeassistant/components/lutron/manifest.json
index 82bdfad4774..5dbf3c45f2a 100644
--- a/homeassistant/components/lutron/manifest.json
+++ b/homeassistant/components/lutron/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/lutron",
   "iot_class": "local_polling",
   "loggers": ["pylutron"],
-  "requirements": ["pylutron==0.2.16"],
+  "requirements": ["pylutron==0.2.15"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/lutron/scene.py b/homeassistant/components/lutron/scene.py
index 9e8070713a9..b66ca08a587 100644
--- a/homeassistant/components/lutron/scene.py
+++ b/homeassistant/components/lutron/scene.py
@@ -51,4 +51,4 @@ class LutronScene(LutronKeypad, Scene):
 
     def activate(self, **kwargs: Any) -> None:
         """Activate the scene."""
-        self._lutron_device.tap()
+        self._lutron_device.press()
diff --git a/homeassistant/components/lutron_caseta/manifest.json b/homeassistant/components/lutron_caseta/manifest.json
index e96778f0a31..776e771b9d3 100644
--- a/homeassistant/components/lutron_caseta/manifest.json
+++ b/homeassistant/components/lutron_caseta/manifest.json
@@ -11,12 +11,6 @@
   "loggers": ["pylutron_caseta"],
   "requirements": ["pylutron-caseta==0.21.1"],
   "zeroconf": [
-    {
-      "type": "_lutron._tcp.local.",
-      "properties": {
-        "SYSTYPE": "hwqs*"
-      }
-    },
     {
       "type": "_lutron._tcp.local.",
       "properties": {
diff --git a/homeassistant/components/lyric/__init__.py b/homeassistant/components/lyric/__init__.py
index f99adf26999..b338605a6ea 100644
--- a/homeassistant/components/lyric/__init__.py
+++ b/homeassistant/components/lyric/__init__.py
@@ -95,7 +95,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator[Lyric](
         hass,
         _LOGGER,
-        config_entry=entry,
         # Name of the data. For logging purposes.
         name="lyric_coordinator",
         update_method=async_update_data,
diff --git a/homeassistant/components/manual/alarm_control_panel.py b/homeassistant/components/manual/alarm_control_panel.py
index 244f38e0902..c1910d0dfa1 100644
--- a/homeassistant/components/manual/alarm_control_panel.py
+++ b/homeassistant/components/manual/alarm_control_panel.py
@@ -11,7 +11,6 @@ from homeassistant.components.alarm_control_panel import (
     PLATFORM_SCHEMA as ALARM_CONTROL_PANEL_PLATFORM_SCHEMA,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.const import (
@@ -22,6 +21,15 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_TRIGGER_TIME,
     CONF_UNIQUE_ID,
+    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_PENDING,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
@@ -39,16 +47,6 @@ CONF_ARMING_STATES = "arming_states"
 CONF_CODE_TEMPLATE = "code_template"
 CONF_CODE_ARM_REQUIRED = "code_arm_required"
 
-CONF_ALARM_ARMED_AWAY = "armed_away"
-CONF_ALARM_ARMED_CUSTOM_BYPASS = "armed_custom_bypass"
-CONF_ALARM_ARMED_HOME = "armed_home"
-CONF_ALARM_ARMED_NIGHT = "armed_night"
-CONF_ALARM_ARMED_VACATION = "armed_vacation"
-CONF_ALARM_ARMING = "arming"
-CONF_ALARM_DISARMED = "disarmed"
-CONF_ALARM_PENDING = "pending"
-CONF_ALARM_TRIGGERED = "triggered"
-
 DEFAULT_ALARM_NAME = "HA Alarm"
 DEFAULT_DELAY_TIME = datetime.timedelta(seconds=60)
 DEFAULT_ARMING_TIME = datetime.timedelta(seconds=60)
@@ -56,46 +54,39 @@ DEFAULT_TRIGGER_TIME = datetime.timedelta(seconds=120)
 DEFAULT_DISARM_AFTER_TRIGGER = False
 
 SUPPORTED_STATES = [
-    AlarmControlPanelState.DISARMED,
-    AlarmControlPanelState.ARMED_AWAY,
-    AlarmControlPanelState.ARMED_HOME,
-    AlarmControlPanelState.ARMED_NIGHT,
-    AlarmControlPanelState.ARMED_VACATION,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-    AlarmControlPanelState.TRIGGERED,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_TRIGGERED,
 ]
 
 SUPPORTED_PRETRIGGER_STATES = [
-    state for state in SUPPORTED_STATES if state != AlarmControlPanelState.TRIGGERED
+    state for state in SUPPORTED_STATES if state != STATE_ALARM_TRIGGERED
 ]
 
 SUPPORTED_ARMING_STATES = [
     state
     for state in SUPPORTED_STATES
-    if state
-    not in (
-        AlarmControlPanelState.DISARMED,
-        AlarmControlPanelState.TRIGGERED,
-    )
+    if state not in (STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED)
 ]
 
 SUPPORTED_ARMING_STATE_TO_FEATURE = {
-    AlarmControlPanelState.ARMED_AWAY: AlarmControlPanelEntityFeature.ARM_AWAY,
-    AlarmControlPanelState.ARMED_HOME: AlarmControlPanelEntityFeature.ARM_HOME,
-    AlarmControlPanelState.ARMED_NIGHT: AlarmControlPanelEntityFeature.ARM_NIGHT,
-    AlarmControlPanelState.ARMED_VACATION: AlarmControlPanelEntityFeature.ARM_VACATION,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS: AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_AWAY: AlarmControlPanelEntityFeature.ARM_AWAY,
+    STATE_ALARM_ARMED_HOME: AlarmControlPanelEntityFeature.ARM_HOME,
+    STATE_ALARM_ARMED_NIGHT: AlarmControlPanelEntityFeature.ARM_NIGHT,
+    STATE_ALARM_ARMED_VACATION: AlarmControlPanelEntityFeature.ARM_VACATION,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS: AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS,
 }
 
 ATTR_PREVIOUS_STATE = "previous_state"
 ATTR_NEXT_STATE = "next_state"
 
 
-def _state_validator(
-    config: dict[AlarmControlPanelState | str, Any],
-) -> dict[str, Any]:
+def _state_validator(config: dict[str, Any]) -> dict[str, Any]:
     """Validate the state."""
-    state: AlarmControlPanelState
     for state in SUPPORTED_PRETRIGGER_STATES:
         if CONF_DELAY_TIME not in config[state]:
             config[state] = config[state] | {CONF_DELAY_TIME: config[CONF_DELAY_TIME]}
@@ -151,26 +142,26 @@ PLATFORM_SCHEMA = vol.Schema(
                 vol.Optional(
                     CONF_ARMING_STATES, default=SUPPORTED_ARMING_STATES
                 ): vol.All(cv.ensure_list, [vol.In(SUPPORTED_ARMING_STATES)]),
-                vol.Optional(CONF_ALARM_ARMED_AWAY, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_AWAY
+                vol.Optional(STATE_ALARM_ARMED_AWAY, default={}): _state_schema(
+                    STATE_ALARM_ARMED_AWAY
                 ),
-                vol.Optional(CONF_ALARM_ARMED_HOME, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_HOME
+                vol.Optional(STATE_ALARM_ARMED_HOME, default={}): _state_schema(
+                    STATE_ALARM_ARMED_HOME
                 ),
-                vol.Optional(CONF_ALARM_ARMED_NIGHT, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_NIGHT
+                vol.Optional(STATE_ALARM_ARMED_NIGHT, default={}): _state_schema(
+                    STATE_ALARM_ARMED_NIGHT
                 ),
-                vol.Optional(CONF_ALARM_ARMED_VACATION, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_VACATION
+                vol.Optional(STATE_ALARM_ARMED_VACATION, default={}): _state_schema(
+                    STATE_ALARM_ARMED_VACATION
                 ),
-                vol.Optional(CONF_ALARM_ARMED_CUSTOM_BYPASS, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_CUSTOM_BYPASS
+                vol.Optional(
+                    STATE_ALARM_ARMED_CUSTOM_BYPASS, default={}
+                ): _state_schema(STATE_ALARM_ARMED_CUSTOM_BYPASS),
+                vol.Optional(STATE_ALARM_DISARMED, default={}): _state_schema(
+                    STATE_ALARM_DISARMED
                 ),
-                vol.Optional(CONF_ALARM_DISARMED, default={}): _state_schema(
-                    AlarmControlPanelState.DISARMED
-                ),
-                vol.Optional(CONF_ALARM_TRIGGERED, default={}): _state_schema(
-                    AlarmControlPanelState.TRIGGERED
+                vol.Optional(STATE_ALARM_TRIGGERED, default={}): _state_schema(
+                    STATE_ALARM_TRIGGERED
                 ),
             },
         ),
@@ -226,25 +217,25 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
         config: dict[str, Any],
     ) -> None:
         """Init the manual alarm panel."""
-        self._state: AlarmControlPanelState = AlarmControlPanelState.DISARMED
+        self._state = STATE_ALARM_DISARMED
         self._hass = hass
         self._attr_name = name
         self._attr_unique_id = unique_id
         self._code = code_template or code or None
         self._attr_code_arm_required = code_arm_required
         self._disarm_after_trigger = disarm_after_trigger
-        self._previous_state: AlarmControlPanelState = self._state
+        self._previous_state = self._state
         self._state_ts: datetime.datetime = dt_util.utcnow()
 
-        self._delay_time_by_state: dict[AlarmControlPanelState, Any] = {
+        self._delay_time_by_state = {
             state: config[state][CONF_DELAY_TIME]
             for state in SUPPORTED_PRETRIGGER_STATES
         }
-        self._trigger_time_by_state: dict[AlarmControlPanelState, Any] = {
+        self._trigger_time_by_state = {
             state: config[state][CONF_TRIGGER_TIME]
             for state in SUPPORTED_PRETRIGGER_STATES
         }
-        self._arming_time_by_state: dict[AlarmControlPanelState, Any] = {
+        self._arming_time_by_state = {
             state: config[state][CONF_ARMING_TIME] for state in SUPPORTED_ARMING_STATES
         }
 
@@ -255,11 +246,11 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
             ]
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState:
+    def state(self) -> str:
         """Return the state of the device."""
-        if self._state == AlarmControlPanelState.TRIGGERED:
+        if self._state == STATE_ALARM_TRIGGERED:
             if self._within_pending_time(self._state):
-                return AlarmControlPanelState.PENDING
+                return STATE_ALARM_PENDING
             trigger_time: datetime.timedelta = self._trigger_time_by_state[
                 self._previous_state
             ]
@@ -267,42 +258,39 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
                 self._state_ts + self._pending_time(self._state) + trigger_time
             ) < dt_util.utcnow():
                 if self._disarm_after_trigger:
-                    return AlarmControlPanelState.DISARMED
+                    return STATE_ALARM_DISARMED
                 self._state = self._previous_state
                 return self._state
 
         if self._state in SUPPORTED_ARMING_STATES and self._within_arming_time(
             self._state
         ):
-            return AlarmControlPanelState.ARMING
+            return STATE_ALARM_ARMING
 
         return self._state
 
     @property
-    def _active_state(self) -> AlarmControlPanelState:
+    def _active_state(self) -> str:
         """Get the current state."""
-        if self.state in (
-            AlarmControlPanelState.PENDING,
-            AlarmControlPanelState.ARMING,
-        ):
+        if self.state in (STATE_ALARM_PENDING, STATE_ALARM_ARMING):
             return self._previous_state
         return self._state
 
-    def _arming_time(self, state: AlarmControlPanelState) -> datetime.timedelta:
+    def _arming_time(self, state: str) -> datetime.timedelta:
         """Get the arming time."""
         arming_time: datetime.timedelta = self._arming_time_by_state[state]
         return arming_time
 
-    def _pending_time(self, state: AlarmControlPanelState) -> datetime.timedelta:
+    def _pending_time(self, state: str) -> datetime.timedelta:
         """Get the pending time."""
         delay_time: datetime.timedelta = self._delay_time_by_state[self._previous_state]
         return delay_time
 
-    def _within_arming_time(self, state: AlarmControlPanelState) -> bool:
+    def _within_arming_time(self, state: str) -> bool:
         """Get if the action is in the arming time window."""
         return self._state_ts + self._arming_time(state) > dt_util.utcnow()
 
-    def _within_pending_time(self, state: AlarmControlPanelState) -> bool:
+    def _within_pending_time(self, state: str) -> bool:
         """Get if the action is in the pending time window."""
         return self._state_ts + self._pending_time(state) > dt_util.utcnow()
 
@@ -317,35 +305,35 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
-        self._async_validate_code(code, AlarmControlPanelState.DISARMED)
-        self._state = AlarmControlPanelState.DISARMED
+        self._async_validate_code(code, STATE_ALARM_DISARMED)
+        self._state = STATE_ALARM_DISARMED
         self._state_ts = dt_util.utcnow()
         self.async_write_ha_state()
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_HOME)
-        self._async_update_state(AlarmControlPanelState.ARMED_HOME)
+        self._async_validate_code(code, STATE_ALARM_ARMED_HOME)
+        self._async_update_state(STATE_ALARM_ARMED_HOME)
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_AWAY)
-        self._async_update_state(AlarmControlPanelState.ARMED_AWAY)
+        self._async_validate_code(code, STATE_ALARM_ARMED_AWAY)
+        self._async_update_state(STATE_ALARM_ARMED_AWAY)
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_NIGHT)
-        self._async_update_state(AlarmControlPanelState.ARMED_NIGHT)
+        self._async_validate_code(code, STATE_ALARM_ARMED_NIGHT)
+        self._async_update_state(STATE_ALARM_ARMED_NIGHT)
 
     async def async_alarm_arm_vacation(self, code: str | None = None) -> None:
         """Send arm vacation command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_VACATION)
-        self._async_update_state(AlarmControlPanelState.ARMED_VACATION)
+        self._async_validate_code(code, STATE_ALARM_ARMED_VACATION)
+        self._async_update_state(STATE_ALARM_ARMED_VACATION)
 
     async def async_alarm_arm_custom_bypass(self, code: str | None = None) -> None:
         """Send arm custom bypass command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_CUSTOM_BYPASS)
-        self._async_update_state(AlarmControlPanelState.ARMED_CUSTOM_BYPASS)
+        self._async_validate_code(code, STATE_ALARM_ARMED_CUSTOM_BYPASS)
+        self._async_update_state(STATE_ALARM_ARMED_CUSTOM_BYPASS)
 
     async def async_alarm_trigger(self, code: str | None = None) -> None:
         """Send alarm trigger command.
@@ -355,9 +343,9 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
         """
         if not self._trigger_time_by_state[self._active_state]:
             return
-        self._async_update_state(AlarmControlPanelState.TRIGGERED)
+        self._async_update_state(STATE_ALARM_TRIGGERED)
 
-    def _async_update_state(self, state: AlarmControlPanelState) -> None:
+    def _async_update_state(self, state: str) -> None:
         """Update the state."""
         if self._state == state:
             return
@@ -370,7 +358,7 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
 
     def _async_set_state_update_events(self) -> None:
         state = self._state
-        if state == AlarmControlPanelState.TRIGGERED:
+        if state == STATE_ALARM_TRIGGERED:
             pending_time = self._pending_time(state)
             async_track_point_in_time(
                 self._hass, self.async_scheduled_update, self._state_ts + pending_time
@@ -394,7 +382,7 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
     def _async_validate_code(self, code: str | None, state: str) -> None:
         """Validate given code."""
         if (
-            state != AlarmControlPanelState.DISARMED and not self.code_arm_required
+            state != STATE_ALARM_DISARMED and not self.code_arm_required
         ) or self._code is None:
             return
 
@@ -417,13 +405,10 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes."""
-        if self.state in (
-            AlarmControlPanelState.PENDING,
-            AlarmControlPanelState.ARMING,
-        ):
+        if self.state in (STATE_ALARM_PENDING, STATE_ALARM_ARMING):
             prev_state: str | None = self._previous_state
             state: str | None = self._state
-        elif self.state == AlarmControlPanelState.TRIGGERED:
+        elif self.state == STATE_ALARM_TRIGGERED:
             prev_state = self._previous_state
             state = None
         else:
@@ -444,9 +429,9 @@ class ManualAlarm(AlarmControlPanelEntity, RestoreEntity):
             if next_state := state.attributes.get(ATTR_NEXT_STATE):
                 # If in arming or pending state we record the transition,
                 # not the current state
-                self._state = AlarmControlPanelState(next_state)
+                self._state = next_state
             else:
-                self._state = AlarmControlPanelState(state.state)
+                self._state = state.state
 
             if prev_state := state.attributes.get(ATTR_PREVIOUS_STATE):
                 self._previous_state = prev_state
diff --git a/homeassistant/components/manual_mqtt/alarm_control_panel.py b/homeassistant/components/manual_mqtt/alarm_control_panel.py
index 768690e8ec5..8d447bbc8ac 100644
--- a/homeassistant/components/manual_mqtt/alarm_control_panel.py
+++ b/homeassistant/components/manual_mqtt/alarm_control_panel.py
@@ -12,7 +12,6 @@ from homeassistant.components import mqtt
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.const import (
@@ -23,6 +22,14 @@ from homeassistant.const import (
     CONF_PENDING_TIME,
     CONF_PLATFORM,
     CONF_TRIGGER_TIME,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -47,15 +54,6 @@ CONF_PAYLOAD_ARM_NIGHT = "payload_arm_night"
 CONF_PAYLOAD_ARM_VACATION = "payload_arm_vacation"
 CONF_PAYLOAD_ARM_CUSTOM_BYPASS = "payload_arm_custom_bypass"
 
-CONF_ALARM_ARMED_AWAY = "armed_away"
-CONF_ALARM_ARMED_CUSTOM_BYPASS = "armed_custom_bypass"
-CONF_ALARM_ARMED_HOME = "armed_home"
-CONF_ALARM_ARMED_NIGHT = "armed_night"
-CONF_ALARM_ARMED_VACATION = "armed_vacation"
-CONF_ALARM_DISARMED = "disarmed"
-CONF_ALARM_PENDING = "pending"
-CONF_ALARM_TRIGGERED = "triggered"
-
 DEFAULT_ALARM_NAME = "HA Alarm"
 DEFAULT_DELAY_TIME = datetime.timedelta(seconds=0)
 DEFAULT_PENDING_TIME = datetime.timedelta(seconds=60)
@@ -69,21 +67,21 @@ DEFAULT_ARM_CUSTOM_BYPASS = "ARM_CUSTOM_BYPASS"
 DEFAULT_DISARM = "DISARM"
 
 SUPPORTED_STATES = [
-    AlarmControlPanelState.DISARMED,
-    AlarmControlPanelState.ARMED_AWAY,
-    AlarmControlPanelState.ARMED_HOME,
-    AlarmControlPanelState.ARMED_NIGHT,
-    AlarmControlPanelState.ARMED_VACATION,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-    AlarmControlPanelState.TRIGGERED,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_TRIGGERED,
 ]
 
 SUPPORTED_PRETRIGGER_STATES = [
-    state for state in SUPPORTED_STATES if state != AlarmControlPanelState.TRIGGERED
+    state for state in SUPPORTED_STATES if state != STATE_ALARM_TRIGGERED
 ]
 
 SUPPORTED_PENDING_STATES = [
-    state for state in SUPPORTED_STATES if state != AlarmControlPanelState.DISARMED
+    state for state in SUPPORTED_STATES if state != STATE_ALARM_DISARMED
 ]
 
 ATTR_PRE_PENDING_STATE = "pre_pending_state"
@@ -145,26 +143,26 @@ PLATFORM_SCHEMA = vol.Schema(
                 vol.Optional(
                     CONF_DISARM_AFTER_TRIGGER, default=DEFAULT_DISARM_AFTER_TRIGGER
                 ): cv.boolean,
-                vol.Optional(CONF_ALARM_ARMED_AWAY, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_AWAY
+                vol.Optional(STATE_ALARM_ARMED_AWAY, default={}): _state_schema(
+                    STATE_ALARM_ARMED_AWAY
                 ),
-                vol.Optional(CONF_ALARM_ARMED_HOME, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_HOME
+                vol.Optional(STATE_ALARM_ARMED_HOME, default={}): _state_schema(
+                    STATE_ALARM_ARMED_HOME
                 ),
-                vol.Optional(CONF_ALARM_ARMED_NIGHT, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_NIGHT
+                vol.Optional(STATE_ALARM_ARMED_NIGHT, default={}): _state_schema(
+                    STATE_ALARM_ARMED_NIGHT
                 ),
-                vol.Optional(CONF_ALARM_ARMED_VACATION, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_VACATION
+                vol.Optional(STATE_ALARM_ARMED_VACATION, default={}): _state_schema(
+                    STATE_ALARM_ARMED_VACATION
                 ),
-                vol.Optional(CONF_ALARM_ARMED_CUSTOM_BYPASS, default={}): _state_schema(
-                    AlarmControlPanelState.ARMED_CUSTOM_BYPASS
+                vol.Optional(
+                    STATE_ALARM_ARMED_CUSTOM_BYPASS, default={}
+                ): _state_schema(STATE_ALARM_ARMED_CUSTOM_BYPASS),
+                vol.Optional(STATE_ALARM_DISARMED, default={}): _state_schema(
+                    STATE_ALARM_DISARMED
                 ),
-                vol.Optional(CONF_ALARM_DISARMED, default={}): _state_schema(
-                    AlarmControlPanelState.DISARMED
-                ),
-                vol.Optional(CONF_ALARM_TRIGGERED, default={}): _state_schema(
-                    AlarmControlPanelState.TRIGGERED
+                vol.Optional(STATE_ALARM_TRIGGERED, default={}): _state_schema(
+                    STATE_ALARM_TRIGGERED
                 ),
                 vol.Required(mqtt.CONF_COMMAND_TOPIC): mqtt.valid_publish_topic,
                 vol.Required(mqtt.CONF_STATE_TOPIC): mqtt.valid_subscribe_topic,
@@ -270,7 +268,7 @@ class ManualMQTTAlarm(AlarmControlPanelEntity):
         config,
     ):
         """Init the manual MQTT alarm panel."""
-        self._state = AlarmControlPanelState.DISARMED
+        self._state = STATE_ALARM_DISARMED
         self._hass = hass
         self._attr_name = name
         if code_template:
@@ -306,38 +304,38 @@ class ManualMQTTAlarm(AlarmControlPanelEntity):
         self._payload_arm_custom_bypass = payload_arm_custom_bypass
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState:
+    def state(self) -> str:
         """Return the state of the device."""
-        if self._state == AlarmControlPanelState.TRIGGERED:
+        if self._state == STATE_ALARM_TRIGGERED:
             if self._within_pending_time(self._state):
-                return AlarmControlPanelState.PENDING
+                return STATE_ALARM_PENDING
             trigger_time = self._trigger_time_by_state[self._previous_state]
             if (
                 self._state_ts + self._pending_time(self._state) + trigger_time
             ) < dt_util.utcnow():
                 if self._disarm_after_trigger:
-                    return AlarmControlPanelState.DISARMED
+                    return STATE_ALARM_DISARMED
                 self._state = self._previous_state
                 return self._state
 
         if self._state in SUPPORTED_PENDING_STATES and self._within_pending_time(
             self._state
         ):
-            return AlarmControlPanelState.PENDING
+            return STATE_ALARM_PENDING
 
         return self._state
 
     @property
     def _active_state(self):
         """Get the current state."""
-        if self.state == AlarmControlPanelState.PENDING:
+        if self.state == STATE_ALARM_PENDING:
             return self._previous_state
         return self._state
 
     def _pending_time(self, state):
         """Get the pending time."""
         pending_time = self._pending_time_by_state[state]
-        if state == AlarmControlPanelState.TRIGGERED:
+        if state == STATE_ALARM_TRIGGERED:
             pending_time += self._delay_time_by_state[self._previous_state]
         return pending_time
 
@@ -356,35 +354,35 @@ class ManualMQTTAlarm(AlarmControlPanelEntity):
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
-        self._async_validate_code(code, AlarmControlPanelState.DISARMED)
-        self._state = AlarmControlPanelState.DISARMED
+        self._async_validate_code(code, STATE_ALARM_DISARMED)
+        self._state = STATE_ALARM_DISARMED
         self._state_ts = dt_util.utcnow()
         self.async_write_ha_state()
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_HOME)
-        self._async_update_state(AlarmControlPanelState.ARMED_HOME)
+        self._async_validate_code(code, STATE_ALARM_ARMED_HOME)
+        self._async_update_state(STATE_ALARM_ARMED_HOME)
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_AWAY)
-        self._async_update_state(AlarmControlPanelState.ARMED_AWAY)
+        self._async_validate_code(code, STATE_ALARM_ARMED_AWAY)
+        self._async_update_state(STATE_ALARM_ARMED_AWAY)
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_NIGHT)
-        self._async_update_state(AlarmControlPanelState.ARMED_NIGHT)
+        self._async_validate_code(code, STATE_ALARM_ARMED_NIGHT)
+        self._async_update_state(STATE_ALARM_ARMED_NIGHT)
 
     async def async_alarm_arm_vacation(self, code: str | None = None) -> None:
         """Send arm vacation command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_VACATION)
-        self._async_update_state(AlarmControlPanelState.ARMED_VACATION)
+        self._async_validate_code(code, STATE_ALARM_ARMED_VACATION)
+        self._async_update_state(STATE_ALARM_ARMED_VACATION)
 
     async def async_alarm_arm_custom_bypass(self, code: str | None = None) -> None:
         """Send arm custom bypass command."""
-        self._async_validate_code(code, AlarmControlPanelState.ARMED_CUSTOM_BYPASS)
-        self._async_update_state(AlarmControlPanelState.ARMED_CUSTOM_BYPASS)
+        self._async_validate_code(code, STATE_ALARM_ARMED_CUSTOM_BYPASS)
+        self._async_update_state(STATE_ALARM_ARMED_CUSTOM_BYPASS)
 
     async def async_alarm_trigger(self, code: str | None = None) -> None:
         """Send alarm trigger command.
@@ -394,7 +392,7 @@ class ManualMQTTAlarm(AlarmControlPanelEntity):
         """
         if not self._trigger_time_by_state[self._active_state]:
             return
-        self._async_update_state(AlarmControlPanelState.TRIGGERED)
+        self._async_update_state(STATE_ALARM_TRIGGERED)
 
     def _async_update_state(self, state: str) -> None:
         """Update the state."""
@@ -407,7 +405,7 @@ class ManualMQTTAlarm(AlarmControlPanelEntity):
         self.async_write_ha_state()
 
         pending_time = self._pending_time(state)
-        if state == AlarmControlPanelState.TRIGGERED:
+        if state == STATE_ALARM_TRIGGERED:
             async_track_point_in_time(
                 self._hass, self.async_scheduled_update, self._state_ts + pending_time
             )
@@ -426,7 +424,7 @@ class ManualMQTTAlarm(AlarmControlPanelEntity):
     def _async_validate_code(self, code, state):
         """Validate given code."""
         if (
-            state != AlarmControlPanelState.DISARMED and not self.code_arm_required
+            state != STATE_ALARM_DISARMED and not self.code_arm_required
         ) or self._code is None:
             return
 
@@ -445,7 +443,7 @@ class ManualMQTTAlarm(AlarmControlPanelEntity):
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes."""
-        if self.state != AlarmControlPanelState.PENDING:
+        if self.state != STATE_ALARM_PENDING:
             return {}
         return {
             ATTR_PRE_PENDING_STATE: self._previous_state,
diff --git a/homeassistant/components/matrix/manifest.json b/homeassistant/components/matrix/manifest.json
index 43c151c7c23..520bd0550cc 100644
--- a/homeassistant/components/matrix/manifest.json
+++ b/homeassistant/components/matrix/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/matrix",
   "iot_class": "cloud_push",
   "loggers": ["matrix_client"],
-  "requirements": ["matrix-nio==0.25.2", "Pillow==11.0.0"]
+  "requirements": ["matrix-nio==0.25.2", "Pillow==10.4.0"]
 }
diff --git a/homeassistant/components/matter/climate.py b/homeassistant/components/matter/climate.py
index cdbe1e36245..f41fa3baaba 100644
--- a/homeassistant/components/matter/climate.py
+++ b/homeassistant/components/matter/climate.py
@@ -188,7 +188,6 @@ class MatterClimate(MatterEntity, ClimateEntity):
     _attr_hvac_mode: HVACMode = HVACMode.OFF
     _feature_map: int | None = None
     _enable_turn_on_off_backwards_compatibility = False
-    _platform_translation_key = "thermostat"
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
@@ -428,7 +427,7 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.CLIMATE,
         entity_description=ClimateEntityDescription(
             key="MatterThermostat",
-            name=None,
+            translation_key="thermostat",
         ),
         entity_class=MatterClimate,
         required_attributes=(clusters.Thermostat.Attributes.LocalTemperature,),
diff --git a/homeassistant/components/matter/config_flow.py b/homeassistant/components/matter/config_flow.py
index 6f7505eb61f..ae71b7a1711 100644
--- a/homeassistant/components/matter/config_flow.py
+++ b/homeassistant/components/matter/config_flow.py
@@ -14,6 +14,8 @@ from homeassistant.components.hassio import (
     AddonInfo,
     AddonManager,
     AddonState,
+    HassioServiceInfo,
+    is_hassio,
 )
 from homeassistant.components.onboarding import async_is_onboarded
 from homeassistant.components.zeroconf import ZeroconfServiceInfo
@@ -23,8 +25,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.hassio import is_hassio
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .addon import get_addon_manager
 from .const import (
diff --git a/homeassistant/components/matter/cover.py b/homeassistant/components/matter/cover.py
index ba9c3afbdee..c32b7bc9e1a 100644
--- a/homeassistant/components/matter/cover.py
+++ b/homeassistant/components/matter/cover.py
@@ -201,8 +201,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.COVER,
         entity_description=CoverEntityDescription(
-            key="MatterCover",
-            name=None,
+            key="MatterCover", translation_key="cover"
         ),
         entity_class=MatterCover,
         required_attributes=(
@@ -217,7 +216,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.COVER,
         entity_description=CoverEntityDescription(
-            key="MatterCoverPositionAwareLift", name=None
+            key="MatterCoverPositionAwareLift", translation_key="cover"
         ),
         entity_class=MatterCover,
         required_attributes=(
@@ -232,7 +231,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.COVER,
         entity_description=CoverEntityDescription(
-            key="MatterCoverPositionAwareTilt", name=None
+            key="MatterCoverPositionAwareTilt", translation_key="cover"
         ),
         entity_class=MatterCover,
         required_attributes=(
@@ -247,7 +246,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.COVER,
         entity_description=CoverEntityDescription(
-            key="MatterCoverPositionAwareLiftAndTilt", name=None
+            key="MatterCoverPositionAwareLiftAndTilt", translation_key="cover"
         ),
         entity_class=MatterCover,
         required_attributes=(
diff --git a/homeassistant/components/matter/discovery.py b/homeassistant/components/matter/discovery.py
index 5b07f9a069f..342522787ab 100644
--- a/homeassistant/components/matter/discovery.py
+++ b/homeassistant/components/matter/discovery.py
@@ -24,7 +24,6 @@ from .select import DISCOVERY_SCHEMAS as SELECT_SCHEMAS
 from .sensor import DISCOVERY_SCHEMAS as SENSOR_SCHEMAS
 from .switch import DISCOVERY_SCHEMAS as SWITCH_SCHEMAS
 from .update import DISCOVERY_SCHEMAS as UPDATE_SCHEMAS
-from .vacuum import DISCOVERY_SCHEMAS as VACUUM_SCHEMAS
 from .valve import DISCOVERY_SCHEMAS as VALVE_SCHEMAS
 
 DISCOVERY_SCHEMAS: dict[Platform, list[MatterDiscoverySchema]] = {
@@ -41,7 +40,6 @@ DISCOVERY_SCHEMAS: dict[Platform, list[MatterDiscoverySchema]] = {
     Platform.SENSOR: SENSOR_SCHEMAS,
     Platform.SWITCH: SWITCH_SCHEMAS,
     Platform.UPDATE: UPDATE_SCHEMAS,
-    Platform.VACUUM: VACUUM_SCHEMAS,
     Platform.VALVE: VALVE_SCHEMAS,
 }
 SUPPORTED_PLATFORMS = tuple(DISCOVERY_SCHEMAS)
diff --git a/homeassistant/components/matter/entity.py b/homeassistant/components/matter/entity.py
index 7c378fe465e..1a454bb7357 100644
--- a/homeassistant/components/matter/entity.py
+++ b/homeassistant/components/matter/entity.py
@@ -45,7 +45,6 @@ class MatterEntity(Entity):
     _attr_has_entity_name = True
     _attr_should_poll = False
     _name_postfix: str | None = None
-    _platform_translation_key: str | None = None
 
     def __init__(
         self,
@@ -84,8 +83,6 @@ class MatterEntity(Entity):
             and ep.has_attribute(None, entity_info.primary_attribute)
         ):
             self._name_postfix = str(self._endpoint.endpoint_id)
-            if self._platform_translation_key and not self.translation_key:
-                self._attr_translation_key = self._platform_translation_key
 
         # prefer the label attribute for the entity name
         # Matter has a way for users and/or vendors to specify a name for an endpoint
diff --git a/homeassistant/components/matter/fan.py b/homeassistant/components/matter/fan.py
index 51c2fb0c882..458a57538eb 100644
--- a/homeassistant/components/matter/fan.py
+++ b/homeassistant/components/matter/fan.py
@@ -60,7 +60,6 @@ class MatterFan(MatterEntity, FanEntity):
     _last_known_percentage: int = 0
     _enable_turn_on_off_backwards_compatibility = False
     _feature_map: int | None = None
-    _platform_translation_key = "fan"
 
     async def async_turn_on(
         self,
@@ -330,8 +329,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.FAN,
         entity_description=FanEntityDescription(
-            key="MatterFan",
-            name=None,
+            key="MatterFan", name=None, translation_key="fan"
         ),
         entity_class=MatterFan,
         # FanEntityFeature
diff --git a/homeassistant/components/matter/light.py b/homeassistant/components/matter/light.py
index 6d184bcc01f..72d06f4b9f1 100644
--- a/homeassistant/components/matter/light.py
+++ b/homeassistant/components/matter/light.py
@@ -89,7 +89,6 @@ class MatterLight(MatterEntity, LightEntity):
     _supports_color = False
     _supports_color_temperature = False
     _transitions_disabled = False
-    _platform_translation_key = "light"
 
     async def _set_xy_color(
         self, xy_color: tuple[float, float], transition: float = 0.0
@@ -444,8 +443,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LIGHT,
         entity_description=LightEntityDescription(
-            key="MatterLight",
-            name=None,
+            key="MatterLight", translation_key="light"
         ),
         entity_class=MatterLight,
         required_attributes=(clusters.OnOff.Attributes.OnOff,),
@@ -472,8 +470,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LIGHT,
         entity_description=LightEntityDescription(
-            key="MatterHSColorLightFallback",
-            name=None,
+            key="MatterHSColorLightFallback", translation_key="light"
         ),
         entity_class=MatterLight,
         required_attributes=(
@@ -493,8 +490,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LIGHT,
         entity_description=LightEntityDescription(
-            key="MatterXYColorLightFallback",
-            name=None,
+            key="MatterXYColorLightFallback", translation_key="light"
         ),
         entity_class=MatterLight,
         required_attributes=(
@@ -514,8 +510,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LIGHT,
         entity_description=LightEntityDescription(
-            key="MatterColorTemperatureLightFallback",
-            name=None,
+            key="MatterColorTemperatureLightFallback", translation_key="light"
         ),
         entity_class=MatterLight,
         required_attributes=(
diff --git a/homeassistant/components/matter/lock.py b/homeassistant/components/matter/lock.py
index c5e10554fe7..8adaecd67ad 100644
--- a/homeassistant/components/matter/lock.py
+++ b/homeassistant/components/matter/lock.py
@@ -40,7 +40,6 @@ class MatterLock(MatterEntity, LockEntity):
 
     _feature_map: int | None = None
     _optimistic_timer: asyncio.TimerHandle | None = None
-    _platform_translation_key = "lock"
 
     @property
     def code_format(self) -> str | None:
@@ -201,8 +200,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LOCK,
         entity_description=LockEntityDescription(
-            key="MatterLock",
-            name=None,
+            key="MatterLock", translation_key="lock"
         ),
         entity_class=MatterLock,
         required_attributes=(clusters.DoorLock.Attributes.LockState,),
diff --git a/homeassistant/components/matter/manifest.json b/homeassistant/components/matter/manifest.json
index 4573fe17401..295b0a23735 100644
--- a/homeassistant/components/matter/manifest.json
+++ b/homeassistant/components/matter/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "matter",
   "name": "Matter (BETA)",
-  "after_dependencies": ["hassio"],
   "codeowners": ["@home-assistant/matter"],
   "config_flow": true,
   "dependencies": ["websocket_api"],
diff --git a/homeassistant/components/matter/select.py b/homeassistant/components/matter/select.py
index 1a2fc36c014..1bba18b2c5b 100644
--- a/homeassistant/components/matter/select.py
+++ b/homeassistant/components/matter/select.py
@@ -162,11 +162,23 @@ DISCOVERY_SCHEMAS = [
             clusters.RefrigeratorAndTemperatureControlledCabinetMode.Attributes.SupportedModes,
         ),
     ),
+    MatterDiscoverySchema(
+        platform=Platform.SELECT,
+        entity_description=MatterSelectEntityDescription(
+            key="MatterRvcRunMode",
+            translation_key="mode",
+        ),
+        entity_class=MatterModeSelectEntity,
+        required_attributes=(
+            clusters.RvcRunMode.Attributes.CurrentMode,
+            clusters.RvcRunMode.Attributes.SupportedModes,
+        ),
+    ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
         entity_description=MatterSelectEntityDescription(
             key="MatterRvcCleanMode",
-            translation_key="clean_mode",
+            translation_key="mode",
         ),
         entity_class=MatterModeSelectEntity,
         required_attributes=(
diff --git a/homeassistant/components/matter/strings.json b/homeassistant/components/matter/strings.json
index 69fa68765b3..f81de11d30e 100644
--- a/homeassistant/components/matter/strings.json
+++ b/homeassistant/components/matter/strings.json
@@ -174,9 +174,6 @@
       }
     },
     "select": {
-      "clean_mode": {
-        "name": "Clean mode"
-      },
       "mode": {
         "name": "Mode"
       },
@@ -255,11 +252,6 @@
         "name": "Power"
       }
     },
-    "vacuum": {
-      "vacuum": {
-        "name": "[%key:component::vacuum::title%]"
-      }
-    },
     "valve": {
       "valve": {
         "name": "[%key:component::valve::title%]"
diff --git a/homeassistant/components/matter/switch.py b/homeassistant/components/matter/switch.py
index 75269de953c..953897fdaa6 100644
--- a/homeassistant/components/matter/switch.py
+++ b/homeassistant/components/matter/switch.py
@@ -35,8 +35,6 @@ async def async_setup_entry(
 class MatterSwitch(MatterEntity, SwitchEntity):
     """Representation of a Matter switch."""
 
-    _platform_translation_key = "switch"
-
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn switch on."""
         await self.matter_client.send_device_command(
@@ -68,7 +66,7 @@ DISCOVERY_SCHEMAS = [
         entity_description=SwitchEntityDescription(
             key="MatterPlug",
             device_class=SwitchDeviceClass.OUTLET,
-            name=None,
+            translation_key="switch",
         ),
         entity_class=MatterSwitch,
         required_attributes=(clusters.OnOff.Attributes.OnOff,),
@@ -108,7 +106,7 @@ DISCOVERY_SCHEMAS = [
         entity_description=SwitchEntityDescription(
             key="MatterSwitch",
             device_class=SwitchDeviceClass.OUTLET,
-            name=None,
+            translation_key="switch",
         ),
         entity_class=MatterSwitch,
         required_attributes=(clusters.OnOff.Attributes.OnOff,),
diff --git a/homeassistant/components/matter/update.py b/homeassistant/components/matter/update.py
index f31dd7b3aa3..736664e0101 100644
--- a/homeassistant/components/matter/update.py
+++ b/homeassistant/components/matter/update.py
@@ -100,23 +100,21 @@ class MatterUpdate(MatterEntity, UpdateEntity):
             == clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kIdle
         ):
             self._attr_in_progress = False
-            self._attr_update_percentage = None
             return
 
         update_progress: int = self.get_matter_attribute_value(
             clusters.OtaSoftwareUpdateRequestor.Attributes.UpdateStateProgress
         )
 
-        self._attr_in_progress = True
         if (
             update_state
             == clusters.OtaSoftwareUpdateRequestor.Enums.UpdateStateEnum.kDownloading
             and update_progress is not None
             and update_progress > 0
         ):
-            self._attr_update_percentage = update_progress
+            self._attr_in_progress = update_progress
         else:
-            self._attr_update_percentage = None
+            self._attr_in_progress = True
 
     async def async_update(self) -> None:
         """Call when the entity needs to be updated."""
diff --git a/homeassistant/components/matter/vacuum.py b/homeassistant/components/matter/vacuum.py
deleted file mode 100644
index 2ecd7128df6..00000000000
--- a/homeassistant/components/matter/vacuum.py
+++ /dev/null
@@ -1,226 +0,0 @@
-"""Matter vacuum 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 homeassistant.components.vacuum import (
-    STATE_CLEANING,
-    STATE_DOCKED,
-    STATE_ERROR,
-    STATE_RETURNING,
-    StateVacuumEntity,
-    StateVacuumEntityDescription,
-    VacuumEntityFeature,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_IDLE, Platform
-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
-
-
-class OperationalState(IntEnum):
-    """Operational State of the vacuum cleaner.
-
-    Combination of generic OperationalState and RvcOperationalState.
-    """
-
-    NO_ERROR = 0x00
-    UNABLE_TO_START_OR_RESUME = 0x01
-    UNABLE_TO_COMPLETE_OPERATION = 0x02
-    COMMAND_INVALID_IN_STATE = 0x03
-    SEEKING_CHARGER = 0x40
-    CHARGING = 0x41
-    DOCKED = 0x42
-
-
-class ModeTag(IntEnum):
-    """Enum with available ModeTag values."""
-
-    IDLE = 0x4000  # 16384 decimal
-    CLEANING = 0x4001  # 16385 decimal
-    MAPPING = 0x4002  # 16386 decimal
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Matter vacuum platform from Config Entry."""
-    matter = get_matter(hass)
-    matter.register_platform_handler(Platform.VACUUM, async_add_entities)
-
-
-class MatterVacuum(MatterEntity, StateVacuumEntity):
-    """Representation of a Matter Vacuum cleaner entity."""
-
-    _last_accepted_commands: list[int] | None = None
-    _supported_run_modes: (
-        dict[int, clusters.RvcCleanMode.Structs.ModeOptionStruct] | None
-    ) = None
-    entity_description: StateVacuumEntityDescription
-    _platform_translation_key = "vacuum"
-
-    async def async_stop(self, **kwargs: Any) -> None:
-        """Stop the vacuum cleaner."""
-        await self._send_device_command(clusters.OperationalState.Commands.Stop())
-
-    async def async_return_to_base(self, **kwargs: Any) -> None:
-        """Set the vacuum cleaner to return to the dock."""
-        await self._send_device_command(clusters.RvcOperationalState.Commands.GoHome())
-
-    async def async_locate(self, **kwargs: Any) -> None:
-        """Locate the vacuum cleaner."""
-        await self._send_device_command(clusters.Identify.Commands.Identify())
-
-    async def async_start(self) -> None:
-        """Start or resume the cleaning task."""
-        if TYPE_CHECKING:
-            assert self._last_accepted_commands is not None
-        if (
-            clusters.RvcOperationalState.Commands.Resume.command_id
-            in self._last_accepted_commands
-        ):
-            await self._send_device_command(
-                clusters.RvcOperationalState.Commands.Resume()
-            )
-        else:
-            await self._send_device_command(clusters.OperationalState.Commands.Start())
-
-    async def async_pause(self) -> None:
-        """Pause the cleaning task."""
-        await self._send_device_command(clusters.OperationalState.Commands.Pause())
-
-    async def _send_device_command(
-        self,
-        command: clusters.ClusterCommand,
-    ) -> None:
-        """Send a command to the device."""
-        await self.matter_client.send_device_command(
-            node_id=self._endpoint.node.node_id,
-            endpoint_id=self._endpoint.endpoint_id,
-            command=command,
-        )
-
-    @callback
-    def _update_from_device(self) -> None:
-        """Update from device."""
-        self._calculate_features()
-        # optional battery level
-        if VacuumEntityFeature.BATTERY & self._attr_supported_features:
-            self._attr_battery_level = self.get_matter_attribute_value(
-                clusters.PowerSource.Attributes.BatPercentRemaining
-            )
-        # derive state from the run mode + operational state
-        run_mode_raw: int = self.get_matter_attribute_value(
-            clusters.RvcRunMode.Attributes.CurrentMode
-        )
-        operational_state: int = self.get_matter_attribute_value(
-            clusters.RvcOperationalState.Attributes.OperationalState
-        )
-        state: str | None = None
-        if TYPE_CHECKING:
-            assert self._supported_run_modes is not None
-        if operational_state in (OperationalState.CHARGING, OperationalState.DOCKED):
-            state = STATE_DOCKED
-        elif operational_state == OperationalState.SEEKING_CHARGER:
-            state = STATE_RETURNING
-        elif operational_state in (
-            OperationalState.UNABLE_TO_COMPLETE_OPERATION,
-            OperationalState.UNABLE_TO_START_OR_RESUME,
-        ):
-            state = STATE_ERROR
-        elif (run_mode := self._supported_run_modes.get(run_mode_raw)) is not None:
-            tags = {x.value for x in run_mode.modeTags}
-            if ModeTag.CLEANING in tags:
-                state = STATE_CLEANING
-            elif ModeTag.IDLE in tags:
-                state = STATE_IDLE
-        self._attr_state = state
-
-    @callback
-    def _calculate_features(self) -> None:
-        """Calculate features for HA Vacuum platform."""
-        accepted_operational_commands: list[int] = self.get_matter_attribute_value(
-            clusters.RvcOperationalState.Attributes.AcceptedCommandList
-        )
-        # in principle the feature set should not change, except for the accepted commands
-        if self._last_accepted_commands == accepted_operational_commands:
-            return
-        self._last_accepted_commands = accepted_operational_commands
-        supported_features: VacuumEntityFeature = VacuumEntityFeature(0)
-        supported_features |= VacuumEntityFeature.STATE
-        # optional battery attribute = battery feature
-        if self.get_matter_attribute_value(
-            clusters.PowerSource.Attributes.BatPercentRemaining
-        ):
-            supported_features |= VacuumEntityFeature.BATTERY
-        # optional identify cluster = locate feature (value must be not None or 0)
-        if self.get_matter_attribute_value(clusters.Identify.Attributes.IdentifyType):
-            supported_features |= VacuumEntityFeature.LOCATE
-        # create a map of supported run modes
-        run_modes: list[clusters.RvcCleanMode.Structs.ModeOptionStruct] = (
-            self.get_matter_attribute_value(
-                clusters.RvcRunMode.Attributes.SupportedModes
-            )
-        )
-        self._supported_run_modes = {mode.mode: mode for mode in run_modes}
-        # map operational state commands to vacuum features
-        if (
-            clusters.RvcOperationalState.Commands.Pause.command_id
-            in accepted_operational_commands
-        ):
-            supported_features |= VacuumEntityFeature.PAUSE
-        if (
-            clusters.OperationalState.Commands.Stop.command_id
-            in accepted_operational_commands
-        ):
-            supported_features |= VacuumEntityFeature.STOP
-        if (
-            clusters.OperationalState.Commands.Start.command_id
-            in accepted_operational_commands
-        ):
-            # note that start has been replaced by resume in rev2 of the spec
-            supported_features |= VacuumEntityFeature.START
-        if (
-            clusters.RvcOperationalState.Commands.Resume.command_id
-            in accepted_operational_commands
-        ):
-            supported_features |= VacuumEntityFeature.START
-        if (
-            clusters.RvcOperationalState.Commands.GoHome.command_id
-            in accepted_operational_commands
-        ):
-            supported_features |= VacuumEntityFeature.RETURN_HOME
-
-        self._attr_supported_features = supported_features
-
-
-# Discovery schema(s) to map Matter Attributes to HA entities
-DISCOVERY_SCHEMAS = [
-    MatterDiscoverySchema(
-        platform=Platform.VACUUM,
-        entity_description=StateVacuumEntityDescription(
-            key="MatterVacuumCleaner", name=None
-        ),
-        entity_class=MatterVacuum,
-        required_attributes=(
-            clusters.RvcRunMode.Attributes.CurrentMode,
-            clusters.RvcOperationalState.Attributes.CurrentPhase,
-        ),
-        optional_attributes=(
-            clusters.RvcCleanMode.Attributes.CurrentMode,
-            clusters.PowerSource.Attributes.BatPercentRemaining,
-        ),
-        device_type=(device_types.RoboticVacuumCleaner,),
-    ),
-]
diff --git a/homeassistant/components/matter/valve.py b/homeassistant/components/matter/valve.py
index ccb4e89da17..f2e212246ca 100644
--- a/homeassistant/components/matter/valve.py
+++ b/homeassistant/components/matter/valve.py
@@ -40,7 +40,6 @@ class MatterValve(MatterEntity, ValveEntity):
 
     _feature_map: int | None = None
     entity_description: ValveEntityDescription
-    _platform_translation_key = "valve"
 
     async def send_device_command(
         self,
@@ -140,7 +139,7 @@ DISCOVERY_SCHEMAS = [
         entity_description=ValveEntityDescription(
             key="MatterValve",
             device_class=ValveDeviceClass.WATER,
-            name=None,
+            translation_key="valve",
         ),
         entity_class=MatterValve,
         required_attributes=(
diff --git a/homeassistant/components/meater/__init__.py b/homeassistant/components/meater/__init__.py
index 50eff40c0e8..08ca32029cb 100644
--- a/homeassistant/components/meater/__init__.py
+++ b/homeassistant/components/meater/__init__.py
@@ -64,7 +64,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         # Name of the data. For logging purposes.
         name="meater_api",
         update_method=async_update_data,
diff --git a/homeassistant/components/medcom_ble/__init__.py b/homeassistant/components/medcom_ble/__init__.py
index 8603e1b9ce5..36357746b95 100644
--- a/homeassistant/components/medcom_ble/__init__.py
+++ b/homeassistant/components/medcom_ble/__init__.py
@@ -53,7 +53,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=_async_update_method,
         update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
diff --git a/homeassistant/components/media_extractor/manifest.json b/homeassistant/components/media_extractor/manifest.json
index ebfa79d7190..fa7657244d6 100644
--- a/homeassistant/components/media_extractor/manifest.json
+++ b/homeassistant/components/media_extractor/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "calculated",
   "loggers": ["yt_dlp"],
   "quality_scale": "internal",
-  "requirements": ["yt-dlp[default]==2024.11.04"],
+  "requirements": ["yt-dlp==2024.10.07"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/media_source/__init__.py b/homeassistant/components/media_source/__init__.py
index 3ea8f581245..604f9b7cc88 100644
--- a/homeassistant/components/media_source/__init__.py
+++ b/homeassistant/components/media_source/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.components.media_player import (
 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_usage
+from homeassistant.helpers.frame import report
 from homeassistant.helpers.integration_platform import (
     async_process_integration_platforms,
 )
@@ -156,7 +156,7 @@ async def async_resolve_media(
         raise Unresolvable("Media Source not loaded")
 
     if target_media_player is UNDEFINED:
-        report_usage(
+        report(
             "calls media_source.async_resolve_media without passing an entity_id",
             exclude_integrations={DOMAIN},
         )
diff --git a/homeassistant/components/met/config_flow.py b/homeassistant/components/met/config_flow.py
index 62964d22bb1..84a44682413 100644
--- a/homeassistant/components/met/config_flow.py
+++ b/homeassistant/components/met/config_flow.py
@@ -11,6 +11,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_ELEVATION,
@@ -142,12 +143,12 @@ class MetConfigFlowHandler(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> MetOptionsFlowHandler:
+    ) -> OptionsFlow:
         """Get the options flow for Met."""
-        return MetOptionsFlowHandler()
+        return MetOptionsFlowHandler(config_entry)
 
 
-class MetOptionsFlowHandler(OptionsFlow):
+class MetOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Options flow for Met component."""
 
     async def async_step_init(
@@ -158,13 +159,13 @@ class MetOptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             # Update config entry with data from user input
             self.hass.config_entries.async_update_entry(
-                self.config_entry, data=user_input
+                self._config_entry, data=user_input
             )
             return self.async_create_entry(
-                title=self.config_entry.title, data=user_input
+                title=self._config_entry.title, data=user_input
             )
 
         return self.async_show_form(
             step_id="init",
-            data_schema=_get_data_schema(self.hass, config_entry=self.config_entry),
+            data_schema=_get_data_schema(self.hass, config_entry=self._config_entry),
         )
diff --git a/homeassistant/components/met_eireann/__init__.py b/homeassistant/components/met_eireann/__init__.py
index ab2695cbd11..7d0e6401bd6 100644
--- a/homeassistant/components/met_eireann/__init__.py
+++ b/homeassistant/components/met_eireann/__init__.py
@@ -46,7 +46,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=config_entry,
         name=DOMAIN,
         update_method=_async_update_data,
         update_interval=UPDATE_INTERVAL,
diff --git a/homeassistant/components/meteo_france/__init__.py b/homeassistant/components/meteo_france/__init__.py
index 1d4f8293c5e..ddba982934c 100644
--- a/homeassistant/components/meteo_france/__init__.py
+++ b/homeassistant/components/meteo_france/__init__.py
@@ -75,15 +75,24 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if not coordinator_forecast.last_update_success:
         raise ConfigEntryNotReady
 
-    # Check rain forecast.
-    coordinator_rain = DataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        name=f"Météo-France rain for city {entry.title}",
-        update_method=_async_update_data_rain,
-        update_interval=SCAN_INTERVAL_RAIN,
-    )
-    await coordinator_rain.async_config_entry_first_refresh()
+    # Check if rain forecast is available.
+    if coordinator_forecast.data.position.get("rain_product_available") == 1:
+        coordinator_rain = DataUpdateCoordinator(
+            hass,
+            _LOGGER,
+            name=f"Météo-France rain for city {entry.title}",
+            update_method=_async_update_data_rain,
+            update_interval=SCAN_INTERVAL_RAIN,
+        )
+        await coordinator_rain.async_refresh()
+
+        if not coordinator_rain.last_update_success:
+            raise ConfigEntryNotReady
+    else:
+        _LOGGER.warning(
+            "1 hour rain forecast not available. %s is not in covered zone",
+            entry.title,
+        )
 
     department = coordinator_forecast.data.position.get("dept")
     _LOGGER.debug(
diff --git a/homeassistant/components/meteoclimatic/__init__.py b/homeassistant/components/meteoclimatic/__init__.py
index 8c2fb41c634..f81d60c3d00 100644
--- a/homeassistant/components/meteoclimatic/__init__.py
+++ b/homeassistant/components/meteoclimatic/__init__.py
@@ -32,7 +32,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"Meteoclimatic weather for {entry.title} ({station_code})",
         update_method=async_update_data,
         update_interval=SCAN_INTERVAL,
diff --git a/homeassistant/components/metoffice/__init__.py b/homeassistant/components/metoffice/__init__.py
index 1d516bbc4f5..18fc121d5d3 100644
--- a/homeassistant/components/metoffice/__init__.py
+++ b/homeassistant/components/metoffice/__init__.py
@@ -109,7 +109,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     metoffice_hourly_coordinator = TimestampDataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"MetOffice Hourly Coordinator for {site_name}",
         update_method=async_update_3hourly,
         update_interval=DEFAULT_SCAN_INTERVAL,
@@ -118,7 +117,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     metoffice_daily_coordinator = TimestampDataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"MetOffice Daily Coordinator for {site_name}",
         update_method=async_update_daily,
         update_interval=DEFAULT_SCAN_INTERVAL,
diff --git a/homeassistant/components/mikrotik/config_flow.py b/homeassistant/components/mikrotik/config_flow.py
index bca394f0d38..98303889194 100644
--- a/homeassistant/components/mikrotik/config_flow.py
+++ b/homeassistant/components/mikrotik/config_flow.py
@@ -46,7 +46,7 @@ class MikrotikFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> MikrotikOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return MikrotikOptionsFlowHandler()
+        return MikrotikOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -122,6 +122,10 @@ class MikrotikFlowHandler(ConfigFlow, domain=DOMAIN):
 class MikrotikOptionsFlowHandler(OptionsFlow):
     """Handle Mikrotik options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize Mikrotik options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/mill/manifest.json b/homeassistant/components/mill/manifest.json
index 6316eb72096..16e7bf552ba 100644
--- a/homeassistant/components/mill/manifest.json
+++ b/homeassistant/components/mill/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/mill",
   "iot_class": "local_polling",
   "loggers": ["mill", "mill_local"],
-  "requirements": ["millheater==0.12.2", "mill-local==0.3.0"]
+  "requirements": ["millheater==0.11.8", "mill-local==0.3.0"]
 }
diff --git a/homeassistant/components/minio/__init__.py b/homeassistant/components/minio/__init__.py
index 57a9632a6ff..8a301ea4225 100644
--- a/homeassistant/components/minio/__init__.py
+++ b/homeassistant/components/minio/__init__.py
@@ -73,11 +73,11 @@ CONFIG_SCHEMA = vol.Schema(
 )
 
 BUCKET_KEY_SCHEMA = vol.Schema(
-    {vol.Required(ATTR_BUCKET): cv.string, vol.Required(ATTR_KEY): cv.string}
+    {vol.Required(ATTR_BUCKET): cv.template, vol.Required(ATTR_KEY): cv.template}
 )
 
 BUCKET_KEY_FILE_SCHEMA = BUCKET_KEY_SCHEMA.extend(
-    {vol.Required(ATTR_FILE_PATH): cv.string}
+    {vol.Required(ATTR_FILE_PATH): cv.template}
 )
 
 
@@ -125,11 +125,15 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
         get_minio_endpoint(host, port), access_key, secret_key, secure
     )
 
+    def _render_service_value(service, key):
+        value = service.data[key]
+        return value.async_render(parse_result=False)
+
     def put_file(service: ServiceCall) -> None:
         """Upload file service."""
-        bucket = service.data[ATTR_BUCKET]
-        key = service.data[ATTR_KEY]
-        file_path = service.data[ATTR_FILE_PATH]
+        bucket = _render_service_value(service, ATTR_BUCKET)
+        key = _render_service_value(service, ATTR_KEY)
+        file_path = _render_service_value(service, ATTR_FILE_PATH)
 
         if not hass.config.is_allowed_path(file_path):
             raise ValueError(f"Invalid file_path {file_path}")
@@ -138,9 +142,9 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     def get_file(service: ServiceCall) -> None:
         """Download file service."""
-        bucket = service.data[ATTR_BUCKET]
-        key = service.data[ATTR_KEY]
-        file_path = service.data[ATTR_FILE_PATH]
+        bucket = _render_service_value(service, ATTR_BUCKET)
+        key = _render_service_value(service, ATTR_KEY)
+        file_path = _render_service_value(service, ATTR_FILE_PATH)
 
         if not hass.config.is_allowed_path(file_path):
             raise ValueError(f"Invalid file_path {file_path}")
@@ -149,8 +153,8 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     def remove_file(service: ServiceCall) -> None:
         """Delete file service."""
-        bucket = service.data[ATTR_BUCKET]
-        key = service.data[ATTR_KEY]
+        bucket = _render_service_value(service, ATTR_BUCKET)
+        key = _render_service_value(service, ATTR_KEY)
 
         minio_client.remove_object(bucket, key)
 
diff --git a/homeassistant/components/mjpeg/config_flow.py b/homeassistant/components/mjpeg/config_flow.py
index e0150f8c461..84267936788 100644
--- a/homeassistant/components/mjpeg/config_flow.py
+++ b/homeassistant/components/mjpeg/config_flow.py
@@ -141,7 +141,7 @@ class MJPEGFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> MJPEGOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return MJPEGOptionsFlowHandler()
+        return MJPEGOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -183,6 +183,10 @@ class MJPEGFlowHandler(ConfigFlow, domain=DOMAIN):
 class MJPEGOptionsFlowHandler(OptionsFlow):
     """Handle MJPEG IP Camera options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize MJPEG IP Camera options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/mobile_app/__init__.py b/homeassistant/components/mobile_app/__init__.py
index 9fadca31b50..80893e0cbfa 100644
--- a/homeassistant/components/mobile_app/__init__.py
+++ b/homeassistant/components/mobile_app/__init__.py
@@ -4,7 +4,6 @@ from contextlib import suppress
 from functools import partial
 from typing import Any
 
-from homeassistant.auth import EVENT_USER_REMOVED
 from homeassistant.components import cloud, intent, notify as hass_notify
 from homeassistant.components.webhook import (
     async_register as webhook_register,
@@ -12,7 +11,7 @@ from homeassistant.components.webhook import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_DEVICE_ID, CONF_WEBHOOK_ID, Platform
-from homeassistant.core import Event, HomeAssistant
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
@@ -37,7 +36,6 @@ from .const import (
     ATTR_MODEL,
     ATTR_OS_VERSION,
     CONF_CLOUDHOOK_URL,
-    CONF_USER_ID,
     DATA_CONFIG_ENTRIES,
     DATA_DELETED_IDS,
     DATA_DEVICES,
@@ -92,15 +90,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     websocket_api.async_setup_commands(hass)
 
-    async def _handle_user_removed(event: Event) -> None:
-        """Remove an entry when the user is removed."""
-        user_id = event.data["user_id"]
-        for entry in hass.config_entries.async_entries(DOMAIN):
-            if entry.data[CONF_USER_ID] == user_id:
-                await hass.config_entries.async_remove(entry.entry_id)
-
-    hass.bus.async_listen(EVENT_USER_REMOVED, _handle_user_removed)
-
     return True
 
 
diff --git a/homeassistant/components/modbus/__init__.py b/homeassistant/components/modbus/__init__.py
index 48f8c726836..d83406a71d5 100644
--- a/homeassistant/components/modbus/__init__.py
+++ b/homeassistant/components/modbus/__init__.py
@@ -87,6 +87,7 @@ from .const import (
     CONF_HVAC_MODE_VALUES,
     CONF_HVAC_ONOFF_REGISTER,
     CONF_INPUT_TYPE,
+    CONF_LAZY_ERROR,
     CONF_MAX_TEMP,
     CONF_MAX_VALUE,
     CONF_MIN_TEMP,
@@ -95,6 +96,7 @@ from .const import (
     CONF_NAN_VALUE,
     CONF_PARITY,
     CONF_PRECISION,
+    CONF_RETRIES,
     CONF_SCALE,
     CONF_SLAVE_COUNT,
     CONF_STATE_CLOSED,
@@ -160,6 +162,7 @@ BASE_COMPONENT_SCHEMA = vol.Schema(
         vol.Optional(
             CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL
         ): cv.positive_int,
+        vol.Optional(CONF_LAZY_ERROR): cv.positive_int,
         vol.Optional(CONF_UNIQUE_ID): cv.string,
     }
 )
@@ -392,6 +395,7 @@ MODBUS_SCHEMA = vol.Schema(
         vol.Optional(CONF_NAME, default=DEFAULT_HUB): cv.string,
         vol.Optional(CONF_TIMEOUT, default=3): cv.socket_timeout,
         vol.Optional(CONF_DELAY, default=0): cv.positive_int,
+        vol.Optional(CONF_RETRIES): cv.positive_int,
         vol.Optional(CONF_MSG_WAIT): cv.positive_int,
         vol.Optional(CONF_BINARY_SENSORS): vol.All(
             cv.ensure_list, [BINARY_SENSOR_SCHEMA]
diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py
index b50d21faf42..54ee49ed6a2 100644
--- a/homeassistant/components/modbus/binary_sensor.py
+++ b/homeassistant/components/modbus/binary_sensor.py
@@ -90,7 +90,6 @@ class ModbusBinarySensor(BasePlatform, RestoreEntity, BinarySensorEntity):
         self._coordinator = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=None,
             name=name,
         )
 
diff --git a/homeassistant/components/modbus/const.py b/homeassistant/components/modbus/const.py
index 7a1a4121a93..02f5d99c72c 100644
--- a/homeassistant/components/modbus/const.py
+++ b/homeassistant/components/modbus/const.py
@@ -20,6 +20,7 @@ CONF_DATA_TYPE = "data_type"
 CONF_DEVICE_ADDRESS = "device_address"
 CONF_FANS = "fans"
 CONF_INPUT_TYPE = "input_type"
+CONF_LAZY_ERROR = "lazy_error_count"
 CONF_MAX_TEMP = "max_temp"
 CONF_MAX_VALUE = "max_value"
 CONF_MIN_TEMP = "min_temp"
@@ -27,6 +28,7 @@ CONF_MIN_VALUE = "min_value"
 CONF_MSG_WAIT = "message_wait_milliseconds"
 CONF_NAN_VALUE = "nan_value"
 CONF_PARITY = "parity"
+CONF_RETRIES = "retries"
 CONF_PRECISION = "precision"
 CONF_SCALE = "scale"
 CONF_SLAVE_COUNT = "slave_count"
diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py
index d85b4e0e67f..8f855addd47 100644
--- a/homeassistant/components/modbus/modbus.py
+++ b/homeassistant/components/modbus/modbus.py
@@ -316,7 +316,7 @@ class ModbusHub:
                 self._log_error(err, error_state=False)
                 return
             message = f"modbus {self.name} communication open"
-            _LOGGER.info(message)
+            _LOGGER.warning(message)
 
     async def async_setup(self) -> bool:
         """Set up pymodbus client."""
@@ -368,7 +368,7 @@ class ModbusHub:
                 del self._client
                 self._client = None
                 message = f"modbus {self.name} communication closed"
-                _LOGGER.info(message)
+                _LOGGER.warning(message)
 
     async def low_level_pb_call(
         self, slave: int | None, address: int, value: int | list[int], use_call: str
diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py
index d5a16c95cc4..4b4fd5bd51a 100644
--- a/homeassistant/components/modbus/sensor.py
+++ b/homeassistant/components/modbus/sensor.py
@@ -91,7 +91,6 @@ class ModbusRegisterSensor(BaseStructPlatform, RestoreSensor, SensorEntity):
         self._coordinator = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=None,
             name=name,
         )
 
diff --git a/homeassistant/components/modbus/validators.py b/homeassistant/components/modbus/validators.py
index f8f1a7450eb..e1120094d01 100644
--- a/homeassistant/components/modbus/validators.py
+++ b/homeassistant/components/modbus/validators.py
@@ -27,6 +27,8 @@ from homeassistant.helpers.issue_registry import IssueSeverity, async_create_iss
 from .const import (
     CONF_DATA_TYPE,
     CONF_FAN_MODE_VALUES,
+    CONF_LAZY_ERROR,
+    CONF_RETRIES,
     CONF_SLAVE_COUNT,
     CONF_SWAP,
     CONF_SWAP_BYTE,
@@ -282,6 +284,27 @@ def validate_modbus(
     hub_name_inx: int,
 ) -> bool:
     """Validate modbus entries."""
+    if CONF_RETRIES in hub:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_retries",
+            breaks_in_ha_version="2024.7.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_retries",
+            translation_placeholders={
+                "config_key": "retries",
+                "integration": DOMAIN,
+                "url": "https://www.home-assistant.io/integrations/modbus",
+            },
+        )
+        _LOGGER.warning(
+            "`retries`: is deprecated and will be removed in version 2024.7"
+        )
+    else:
+        hub[CONF_RETRIES] = 3
+
     host: str = (
         hub[CONF_PORT]
         if hub[CONF_TYPE] == SERIAL
@@ -330,6 +353,24 @@ def validate_entity(
     ent_addr: set[str],
 ) -> bool:
     """Validate entity."""
+    if CONF_LAZY_ERROR in entity:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "removed_lazy_error_count",
+            breaks_in_ha_version="2024.7.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key="removed_lazy_error_count",
+            translation_placeholders={
+                "config_key": "lazy_error_count",
+                "integration": DOMAIN,
+                "url": "https://www.home-assistant.io/integrations/modbus",
+            },
+        )
+        _LOGGER.warning(
+            "`lazy_error_count`: is deprecated and will be removed in version 2024.7"
+        )
     name = f"{component}.{entity[CONF_NAME]}"
     scan_interval = entity.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
     if 0 < scan_interval < 5:
diff --git a/homeassistant/components/modern_forms/config_flow.py b/homeassistant/components/modern_forms/config_flow.py
index 33e814efb51..dee08736234 100644
--- a/homeassistant/components/modern_forms/config_flow.py
+++ b/homeassistant/components/modern_forms/config_flow.py
@@ -9,13 +9,11 @@ import voluptuous as vol
 
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import SOURCE_ZEROCONF, ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_MAC
+from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
 
-USER_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str})
-
 
 class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a ModernForms config flow."""
@@ -57,21 +55,17 @@ class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None, prepare: bool = False
     ) -> ConfigFlowResult:
         """Config flow handler for ModernForms."""
+        source = self.context["source"]
+
         # Request user input, unless we are preparing discovery flow
         if user_input is None:
             user_input = {}
             if not prepare:
-                if self.source == SOURCE_ZEROCONF:
-                    return self.async_show_form(
-                        step_id="zeroconf_confirm",
-                        description_placeholders={"name": self.name},
-                    )
-                return self.async_show_form(
-                    step_id="user",
-                    data_schema=USER_SCHEMA,
-                )
+                if source == SOURCE_ZEROCONF:
+                    return self._show_confirm_dialog()
+                return self._show_setup_form()
 
-        if self.source == SOURCE_ZEROCONF:
+        if source == SOURCE_ZEROCONF:
             user_input[CONF_HOST] = self.host
             user_input[CONF_MAC] = self.mac
 
@@ -81,21 +75,18 @@ class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
             try:
                 device = await device.update()
             except ModernFormsConnectionError:
-                if self.source == SOURCE_ZEROCONF:
+                if source == SOURCE_ZEROCONF:
                     return self.async_abort(reason="cannot_connect")
-                return self.async_show_form(
-                    step_id="user",
-                    data_schema=USER_SCHEMA,
-                    errors={"base": "cannot_connect"},
-                )
+                return self._show_setup_form({"base": "cannot_connect"})
             user_input[CONF_MAC] = device.info.mac_address
+            user_input[CONF_NAME] = device.info.device_name
 
         # Check if already configured
         await self.async_set_unique_id(user_input[CONF_MAC])
         self._abort_if_unique_id_configured(updates={CONF_HOST: user_input[CONF_HOST]})
 
         title = device.info.device_name
-        if self.source == SOURCE_ZEROCONF:
+        if source == SOURCE_ZEROCONF:
             title = self.name
 
         if prepare:
@@ -105,3 +96,19 @@ class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
             title=title,
             data={CONF_HOST: user_input[CONF_HOST], CONF_MAC: user_input[CONF_MAC]},
         )
+
+    def _show_setup_form(self, errors: dict | None = None) -> ConfigFlowResult:
+        """Show the setup form to the user."""
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
+            errors=errors or {},
+        )
+
+    def _show_confirm_dialog(self, errors: dict | None = None) -> ConfigFlowResult:
+        """Show the confirm dialog to the user."""
+        return self.async_show_form(
+            step_id="zeroconf_confirm",
+            description_placeholders={"name": self.name},
+            errors=errors or {},
+        )
diff --git a/homeassistant/components/mold_indicator/sensor.py b/homeassistant/components/mold_indicator/sensor.py
index 262d13ad3af..eb4c0bf7284 100644
--- a/homeassistant/components/mold_indicator/sensor.py
+++ b/homeassistant/components/mold_indicator/sensor.py
@@ -22,7 +22,6 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_UNIQUE_ID,
     PERCENTAGE,
-    STATE_UNAVAILABLE,
     STATE_UNKNOWN,
     UnitOfTemperature,
 )
@@ -38,7 +37,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 from homeassistant.util.unit_conversion import TemperatureConverter
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
@@ -151,6 +150,7 @@ class MoldIndicator(SensorEntity):
         unique_id: str | None,
     ) -> None:
         """Initialize the sensor."""
+        self._state: str | None = None
         self._attr_name = name
         self._attr_unique_id = unique_id
         self._indoor_temp_sensor = indoor_temp_sensor
@@ -272,7 +272,7 @@ class MoldIndicator(SensorEntity):
                 # re-calculate dewpoint and mold indicator
                 self._calc_dewpoint()
                 self._calc_moldindicator()
-                if self._attr_native_value is None:
+                if self._state is None:
                     self._attr_available = False
                 else:
                     self._attr_available = True
@@ -311,7 +311,7 @@ class MoldIndicator(SensorEntity):
         _LOGGER.debug("Updating temp sensor with value %s", state.state)
 
         # Return an error if the sensor change its state to Unknown.
-        if state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE):
+        if state.state == STATE_UNKNOWN:
             _LOGGER.error(
                 "Unable to parse temperature sensor %s with state: %s",
                 state.entity_id,
@@ -319,6 +319,8 @@ class MoldIndicator(SensorEntity):
             )
             return None
 
+        unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+
         if (temp := util.convert(state.state, float)) is None:
             _LOGGER.error(
                 "Unable to parse temperature sensor %s with state: %s",
@@ -328,10 +330,12 @@ class MoldIndicator(SensorEntity):
             return None
 
         # convert to celsius if necessary
-        if (
-            unit := state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
-        ) in UnitOfTemperature:
-            return TemperatureConverter.convert(temp, unit, UnitOfTemperature.CELSIUS)
+        if unit == UnitOfTemperature.FAHRENHEIT:
+            return TemperatureConverter.convert(
+                temp, UnitOfTemperature.FAHRENHEIT, UnitOfTemperature.CELSIUS
+            )
+        if unit == UnitOfTemperature.CELSIUS:
+            return temp
         _LOGGER.error(
             "Temp sensor %s has unsupported unit: %s (allowed: %s, %s)",
             state.entity_id,
@@ -348,7 +352,7 @@ class MoldIndicator(SensorEntity):
         _LOGGER.debug("Updating humidity sensor with value %s", state.state)
 
         # Return an error if the sensor change its state to Unknown.
-        if state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE):
+        if state.state == STATE_UNKNOWN:
             _LOGGER.error(
                 "Unable to parse humidity sensor %s, state: %s",
                 state.entity_id,
@@ -366,18 +370,19 @@ class MoldIndicator(SensorEntity):
 
         if (unit := state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)) != PERCENTAGE:
             _LOGGER.error(
-                "Humidity sensor %s has unsupported unit: %s (allowed: %s)",
+                "Humidity sensor %s has unsupported unit: %s %s",
                 state.entity_id,
                 unit,
-                PERCENTAGE,
+                " (allowed: %)",
             )
             return None
 
         if hum > 100 or hum < 0:
             _LOGGER.error(
-                "Humidity sensor %s is out of range: %s (allowed: 0-100)",
+                "Humidity sensor %s is out of range: %s %s",
                 state.entity_id,
                 hum,
+                "(allowed: 0-100%)",
             )
             return None
 
@@ -396,7 +401,7 @@ class MoldIndicator(SensorEntity):
         # re-calculate dewpoint and mold indicator
         self._calc_dewpoint()
         self._calc_moldindicator()
-        if self._attr_native_value is None:
+        if self._state is None:
             self._attr_available = False
             self._dewpoint = None
             self._crit_temp = None
@@ -432,7 +437,7 @@ class MoldIndicator(SensorEntity):
                 self._dewpoint,
                 self._calib_factor,
             )
-            self._attr_native_value = None
+            self._state = None
             self._attr_available = False
             self._crit_temp = None
             return
@@ -463,13 +468,18 @@ class MoldIndicator(SensorEntity):
 
         # check bounds and format
         if crit_humidity > 100:
-            self._attr_native_value = "100"
+            self._state = "100"
         elif crit_humidity < 0:
-            self._attr_native_value = "0"
+            self._state = "0"
         else:
-            self._attr_native_value = f"{int(crit_humidity):d}"
+            self._state = f"{int(crit_humidity):d}"
 
-        _LOGGER.debug("Mold indicator humidity: %s", self.native_value)
+        _LOGGER.debug("Mold indicator humidity: %s", self._state)
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the state of the entity."""
+        return self._state
 
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
diff --git a/homeassistant/components/mold_indicator/strings.json b/homeassistant/components/mold_indicator/strings.json
index e19fed690b2..03c6a05546f 100644
--- a/homeassistant/components/mold_indicator/strings.json
+++ b/homeassistant/components/mold_indicator/strings.json
@@ -1,5 +1,4 @@
 {
-  "title": "Mold Indicator",
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
diff --git a/homeassistant/components/monoprice/config_flow.py b/homeassistant/components/monoprice/config_flow.py
index b2619623a07..cac673e38c1 100644
--- a/homeassistant/components/monoprice/config_flow.py
+++ b/homeassistant/components/monoprice/config_flow.py
@@ -108,7 +108,7 @@ class MonoPriceConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> MonopriceOptionsFlowHandler:
         """Define the config flow to handle options."""
-        return MonopriceOptionsFlowHandler()
+        return MonopriceOptionsFlowHandler(config_entry)
 
 
 @callback
@@ -126,6 +126,10 @@ def _key_for_source(index, source, previous_sources):
 class MonopriceOptionsFlowHandler(OptionsFlow):
     """Handle a Monoprice options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.config_entry = config_entry
+
     @callback
     def _previous_sources(self):
         if CONF_SOURCES in self.config_entry.options:
diff --git a/homeassistant/components/monzo/manifest.json b/homeassistant/components/monzo/manifest.json
index 7038cecd7ea..d9d17eb8abc 100644
--- a/homeassistant/components/monzo/manifest.json
+++ b/homeassistant/components/monzo/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/monzo",
   "iot_class": "cloud_polling",
-  "requirements": ["monzopy==1.4.2"]
+  "requirements": ["monzopy==1.3.2"]
 }
diff --git a/homeassistant/components/mopeka/config_flow.py b/homeassistant/components/mopeka/config_flow.py
index 2e35ff4283f..72e9386a47f 100644
--- a/homeassistant/components/mopeka/config_flow.py
+++ b/homeassistant/components/mopeka/config_flow.py
@@ -58,7 +58,7 @@ class MopekaConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: config_entries.ConfigEntry,
     ) -> MopekaOptionsFlow:
         """Return the options flow for this handler."""
-        return MopekaOptionsFlow()
+        return MopekaOptionsFlow(config_entry)
 
     async def async_step_bluetooth(
         self, discovery_info: BluetoothServiceInfoBleak
@@ -139,6 +139,10 @@ class MopekaConfigFlow(ConfigFlow, domain=DOMAIN):
 class MopekaOptionsFlow(config_entries.OptionsFlow):
     """Handle options for the Mopeka component."""
 
+    def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/motion_blinds/config_flow.py b/homeassistant/components/motion_blinds/config_flow.py
index e961880375c..131299314a2 100644
--- a/homeassistant/components/motion_blinds/config_flow.py
+++ b/homeassistant/components/motion_blinds/config_flow.py
@@ -38,6 +38,10 @@ CONFIG_SCHEMA = vol.Schema(
 class OptionsFlowHandler(OptionsFlow):
     """Options for the component."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Init object."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -79,7 +83,7 @@ class MotionBlindsFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_dhcp(
         self, discovery_info: dhcp.DhcpServiceInfo
diff --git a/homeassistant/components/motionblinds_ble/config_flow.py b/homeassistant/components/motionblinds_ble/config_flow.py
index d99096d3a09..cda673b13ac 100644
--- a/homeassistant/components/motionblinds_ble/config_flow.py
+++ b/homeassistant/components/motionblinds_ble/config_flow.py
@@ -187,12 +187,16 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Create the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle an options flow for Motionblinds BLE."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/motioneye/__init__.py b/homeassistant/components/motioneye/__init__.py
index 3e4ad53d200..e24b844c4a2 100644
--- a/homeassistant/components/motioneye/__init__.py
+++ b/homeassistant/components/motioneye/__init__.py
@@ -322,7 +322,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=async_update_data,
         update_interval=DEFAULT_SCAN_INTERVAL,
diff --git a/homeassistant/components/motioneye/config_flow.py b/homeassistant/components/motioneye/config_flow.py
index 80a6449a22d..43d34b84bca 100644
--- a/homeassistant/components/motioneye/config_flow.py
+++ b/homeassistant/components/motioneye/config_flow.py
@@ -12,6 +12,7 @@ from motioneye_client.client import (
 )
 import voluptuous as vol
 
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import (
     SOURCE_REAUTH,
     ConfigEntry,
@@ -23,7 +24,6 @@ from homeassistant.const import CONF_URL, CONF_WEBHOOK_ID
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.helpers.typing import VolDictType
 
 from . import create_motioneye_client
@@ -179,16 +179,18 @@ class MotionEyeConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> MotionEyeOptionsFlow:
+    def async_get_options_flow(config_entry: ConfigEntry) -> MotionEyeOptionsFlow:
         """Get the Hyperion Options flow."""
-        return MotionEyeOptionsFlow()
+        return MotionEyeOptionsFlow(config_entry)
 
 
 class MotionEyeOptionsFlow(OptionsFlow):
     """motionEye options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize a motionEye options flow."""
+        self._config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -199,14 +201,14 @@ class MotionEyeOptionsFlow(OptionsFlow):
         schema: dict[vol.Marker, type] = {
             vol.Required(
                 CONF_WEBHOOK_SET,
-                default=self.config_entry.options.get(
+                default=self._config_entry.options.get(
                     CONF_WEBHOOK_SET,
                     DEFAULT_WEBHOOK_SET,
                 ),
             ): bool,
             vol.Required(
                 CONF_WEBHOOK_SET_OVERWRITE,
-                default=self.config_entry.options.get(
+                default=self._config_entry.options.get(
                     CONF_WEBHOOK_SET_OVERWRITE,
                     DEFAULT_WEBHOOK_SET_OVERWRITE,
                 ),
@@ -217,9 +219,9 @@ class MotionEyeOptionsFlow(OptionsFlow):
             # The input URL is not validated as being a URL, to allow for the possibility
             # the template input won't be a valid URL until after it's rendered
             description: dict[str, str] | None = None
-            if CONF_STREAM_URL_TEMPLATE in self.config_entry.options:
+            if CONF_STREAM_URL_TEMPLATE in self._config_entry.options:
                 description = {
-                    "suggested_value": self.config_entry.options[
+                    "suggested_value": self._config_entry.options[
                         CONF_STREAM_URL_TEMPLATE
                     ]
                 }
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 907b1a1dd11..86eeca2017c 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -76,8 +76,8 @@ from .const import (  # noqa: F401
     DEFAULT_QOS,
     DEFAULT_RETAIN,
     DOMAIN,
-    ENTITY_PLATFORMS,
     MQTT_CONNECTION_STATE,
+    RELOADABLE_PLATFORMS,
     TEMPLATE_ERRORS,
 )
 from .models import (  # noqa: F401
@@ -438,7 +438,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             for entity in list(mqtt_platform.entities.values())
             if getattr(entity, "_discovery_data", None) is None
             and mqtt_platform.config_entry
-            and mqtt_platform.domain in ENTITY_PLATFORMS
+            and mqtt_platform.domain in RELOADABLE_PLATFORMS
         ]
         await asyncio.gather(*tasks)
 
diff --git a/homeassistant/components/mqtt/abbreviations.py b/homeassistant/components/mqtt/abbreviations.py
index 65e24d5d780..3c1d0abdb66 100644
--- a/homeassistant/components/mqtt/abbreviations.py
+++ b/homeassistant/components/mqtt/abbreviations.py
@@ -30,7 +30,6 @@ ABBREVIATIONS = {
     "cmd_on_tpl": "command_on_template",
     "cmd_t": "command_topic",
     "cmd_tpl": "command_template",
-    "cmps": "components",
     "cod_arm_req": "code_arm_required",
     "cod_dis_req": "code_disarm_required",
     "cod_form": "code_format",
@@ -46,7 +45,6 @@ ABBREVIATIONS = {
     "dir_cmd_tpl": "direction_command_template",
     "dir_stat_t": "direction_state_topic",
     "dir_val_tpl": "direction_value_template",
-    "dsp_prc": "display_precision",
     "dock_cmd_t": "dock_command_topic",
     "dock_cmd_tpl": "dock_command_template",
     "e": "encoding",
@@ -94,7 +92,6 @@ ABBREVIATIONS = {
     "min_mirs": "min_mireds",
     "max_temp": "max_temp",
     "min_temp": "min_temp",
-    "migr_discvry": "migrate_discovery",
     "mode": "mode",
     "mode_cmd_tpl": "mode_command_template",
     "mode_cmd_t": "mode_command_topic",
@@ -112,7 +109,6 @@ ABBREVIATIONS = {
     "osc_cmd_tpl": "oscillation_command_template",
     "osc_stat_t": "oscillation_state_topic",
     "osc_val_tpl": "oscillation_value_template",
-    "p": "platform",
     "pause_cmd_t": "pause_command_topic",
     "pause_mw_cmd_tpl": "pause_command_template",
     "pct_cmd_t": "percentage_command_topic",
diff --git a/homeassistant/components/mqtt/alarm_control_panel.py b/homeassistant/components/mqtt/alarm_control_panel.py
index 76bac8540a4..7f14c65ffb0 100644
--- a/homeassistant/components/mqtt/alarm_control_panel.py
+++ b/homeassistant/components/mqtt/alarm_control_panel.py
@@ -7,12 +7,23 @@ import logging
 import voluptuous as vol
 
 import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import (
-    AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import AlarmControlPanelEntityFeature
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_CODE, CONF_NAME, CONF_VALUE_TEMPLATE
+from homeassistant.const import (
+    CONF_CODE,
+    CONF_NAME,
+    CONF_VALUE_TEMPLATE,
+    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
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -171,30 +182,29 @@ class MqttAlarm(MqttEntity, alarm.AlarmControlPanelEntity):
             )
             return
         if payload == PAYLOAD_NONE:
-            self._attr_alarm_state = None
+            self._attr_state = None
             return
         if payload not in (
-            AlarmControlPanelState.DISARMED,
-            AlarmControlPanelState.ARMED_HOME,
-            AlarmControlPanelState.ARMED_AWAY,
-            AlarmControlPanelState.ARMED_NIGHT,
-            AlarmControlPanelState.ARMED_VACATION,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-            AlarmControlPanelState.PENDING,
-            AlarmControlPanelState.ARMING,
-            AlarmControlPanelState.DISARMING,
-            AlarmControlPanelState.TRIGGERED,
+            STATE_ALARM_DISARMED,
+            STATE_ALARM_ARMED_HOME,
+            STATE_ALARM_ARMED_AWAY,
+            STATE_ALARM_ARMED_NIGHT,
+            STATE_ALARM_ARMED_VACATION,
+            STATE_ALARM_ARMED_CUSTOM_BYPASS,
+            STATE_ALARM_PENDING,
+            STATE_ALARM_ARMING,
+            STATE_ALARM_DISARMING,
+            STATE_ALARM_TRIGGERED,
         ):
             _LOGGER.warning("Received unexpected payload: %s", msg.payload)
             return
-        assert isinstance(payload, str)
-        self._attr_alarm_state = AlarmControlPanelState(payload)
+        self._attr_state = str(payload)
 
     @callback
     def _prepare_subscribe_topics(self) -> None:
         """(Re)Subscribe to topics."""
         self.add_subscription(
-            CONF_STATE_TOPIC, self._state_message_received, {"_attr_alarm_state"}
+            CONF_STATE_TOPIC, self._state_message_received, {"_attr_state"}
         )
 
     async def _subscribe_topics(self) -> None:
diff --git a/homeassistant/components/mqtt/client.py b/homeassistant/components/mqtt/client.py
index a626e0e5b28..4fa8b7db02a 100644
--- a/homeassistant/components/mqtt/client.py
+++ b/homeassistant/components/mqtt/client.py
@@ -376,9 +376,7 @@ class MQTT:
         self._simple_subscriptions: defaultdict[str, set[Subscription]] = defaultdict(
             set
         )
-        # To ensure the wildcard subscriptions order is preserved, we use a dict
-        # with `None` values instead of a set.
-        self._wildcard_subscriptions: dict[Subscription, None] = {}
+        self._wildcard_subscriptions: set[Subscription] = set()
         # _retained_topics prevents a Subscription from receiving a
         # retained message more than once per topic. This prevents flooding
         # already active subscribers when new subscribers subscribe to a topic
@@ -756,7 +754,7 @@ class MQTT:
         if subscription.is_simple_match:
             self._simple_subscriptions[subscription.topic].add(subscription)
         else:
-            self._wildcard_subscriptions[subscription] = None
+            self._wildcard_subscriptions.add(subscription)
 
     @callback
     def _async_untrack_subscription(self, subscription: Subscription) -> None:
@@ -774,7 +772,7 @@ class MQTT:
                 if not simple_subscriptions[topic]:
                     del simple_subscriptions[topic]
             else:
-                del self._wildcard_subscriptions[subscription]
+                self._wildcard_subscriptions.remove(subscription)
         except (KeyError, ValueError) as exc:
             raise HomeAssistantError("Can't remove subscription twice") from exc
 
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index 6e6b44cd4b8..7786387ae1c 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -16,7 +16,13 @@ from cryptography.x509 import load_pem_x509_certificate
 import voluptuous as vol
 
 from homeassistant.components.file_upload import process_uploaded_file
-from homeassistant.components.hassio import AddonError, AddonManager, AddonState
+from homeassistant.components.hassio import (
+    AddonError,
+    AddonManager,
+    AddonState,
+    HassioServiceInfo,
+    is_hassio,
+)
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
@@ -36,7 +42,6 @@ from homeassistant.const import (
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.selector import (
     BooleanSelector,
@@ -53,7 +58,6 @@ from homeassistant.helpers.selector import (
     TextSelectorConfig,
     TextSelectorType,
 )
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
 
 from .addon import get_addon_manager
@@ -220,7 +224,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> MQTTOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return MQTTOptionsFlowHandler()
+        return MQTTOptionsFlowHandler(config_entry)
 
     async def _async_install_addon(self) -> None:
         """Install the Mosquitto Mqtt broker add-on."""
@@ -543,9 +547,11 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
 class MQTTOptionsFlowHandler(OptionsFlow):
     """Handle MQTT options."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize MQTT options flow."""
+        self.config_entry = config_entry
         self.broker_config: dict[str, str | int] = {}
+        self.options = config_entry.options
 
     async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
         """Manage the MQTT options."""
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
index 9f1c55a54e0..1e1011cc381 100644
--- a/homeassistant/components/mqtt/const.py
+++ b/homeassistant/components/mqtt/const.py
@@ -61,7 +61,6 @@ CONF_CURRENT_HUMIDITY_TOPIC = "current_humidity_topic"
 CONF_CURRENT_TEMP_TEMPLATE = "current_temperature_template"
 CONF_CURRENT_TEMP_TOPIC = "current_temperature_topic"
 CONF_ENABLED_BY_DEFAULT = "enabled_by_default"
-CONF_ENTITY_PICTURE = "entity_picture"
 CONF_MODE_COMMAND_TEMPLATE = "mode_command_template"
 CONF_MODE_COMMAND_TOPIC = "mode_command_topic"
 CONF_MODE_LIST = "modes"
@@ -90,7 +89,6 @@ CONF_TEMP_MIN = "min_temp"
 CONF_CERTIFICATE = "certificate"
 CONF_CLIENT_KEY = "client_key"
 CONF_CLIENT_CERT = "client_cert"
-CONF_COMPONENTS = "components"
 CONF_TLS_INSECURE = "tls_insecure"
 
 # Device and integration info options
@@ -160,7 +158,7 @@ MQTT_CONNECTION_STATE = "mqtt_connection_state"
 PAYLOAD_EMPTY_JSON = "{}"
 PAYLOAD_NONE = "None"
 
-ENTITY_PLATFORMS = [
+RELOADABLE_PLATFORMS = [
     Platform.ALARM_CONTROL_PANEL,
     Platform.BINARY_SENSOR,
     Platform.BUTTON,
@@ -191,7 +189,7 @@ ENTITY_PLATFORMS = [
 
 TEMPLATE_ERRORS = (jinja2.TemplateError, TemplateError, TypeError, ValueError)
 
-SUPPORTED_COMPONENTS = (
+SUPPORTED_COMPONENTS = {
     "alarm_control_panel",
     "binary_sensor",
     "button",
@@ -220,4 +218,4 @@ SUPPORTED_COMPONENTS = (
     "vacuum",
     "valve",
     "water_heater",
-)
+}
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index a5ddb3ef4e6..af27615e2c0 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 from collections import deque
-from dataclasses import dataclass
 import functools
 from itertools import chain
 import logging
@@ -12,22 +11,15 @@ import re
 import time
 from typing import TYPE_CHECKING, Any
 
-import voluptuous as vol
-
-from homeassistant.config_entries import (
-    SOURCE_MQTT,
-    ConfigEntry,
-    signal_discovered_config_entry_removed,
-)
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE, CONF_PLATFORM
 from homeassistant.core import HassJobType, HomeAssistant, callback
-from homeassistant.helpers import discovery_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.service_info.mqtt import MqttServiceInfo, ReceivePayloadType
+from homeassistant.helpers.service_info.mqtt import MqttServiceInfo
 from homeassistant.helpers.typing import DiscoveryInfoType
 from homeassistant.loader import async_get_mqtt
 from homeassistant.util.json import json_loads_object
@@ -40,14 +32,13 @@ from .const import (
     ATTR_DISCOVERY_PAYLOAD,
     ATTR_DISCOVERY_TOPIC,
     CONF_AVAILABILITY,
-    CONF_COMPONENTS,
     CONF_ORIGIN,
     CONF_TOPIC,
     DOMAIN,
     SUPPORTED_COMPONENTS,
 )
-from .models import DATA_MQTT, MqttComponentConfig, MqttOriginInfo, ReceiveMessage
-from .schemas import DEVICE_DISCOVERY_SCHEMA, MQTT_ORIGIN_INFO_SCHEMA, SHARED_OPTIONS
+from .models import DATA_MQTT, MqttOriginInfo, ReceiveMessage
+from .schemas import MQTT_ORIGIN_INFO_SCHEMA
 from .util import async_forward_entry_setup_and_setup_discovery
 
 ABBREVIATIONS_SET = set(ABBREVIATIONS)
@@ -73,47 +64,13 @@ MQTT_DISCOVERY_DONE: SignalTypeFormat[Any] = SignalTypeFormat(
 
 TOPIC_BASE = "~"
 
-CONF_MIGRATE_DISCOVERY = "migrate_discovery"
-
-MIGRATE_DISCOVERY_SCHEMA = vol.Schema(
-    {vol.Optional(CONF_MIGRATE_DISCOVERY): True},
-)
-
 
 class MQTTDiscoveryPayload(dict[str, Any]):
     """Class to hold and MQTT discovery payload and discovery data."""
 
-    device_discovery: bool = False
-    migrate_discovery: bool = False
     discovery_data: DiscoveryInfoType
 
 
-@dataclass(frozen=True)
-class MQTTIntegrationDiscoveryConfig:
-    """Class to hold an integration discovery playload."""
-
-    integration: str
-    msg: ReceiveMessage
-
-
-@callback
-def _async_process_discovery_migration(payload: MQTTDiscoveryPayload) -> bool:
-    """Process a discovery migration request in the discovery payload."""
-    # Allow abbreviation
-    if migr_discvry := (payload.pop("migr_discvry", None)):
-        payload[CONF_MIGRATE_DISCOVERY] = migr_discvry
-    if CONF_MIGRATE_DISCOVERY in payload:
-        try:
-            MIGRATE_DISCOVERY_SCHEMA(payload)
-        except vol.Invalid as exc:
-            _LOGGER.warning(exc)
-            return False
-        payload.migrate_discovery = True
-        payload.clear()
-        return True
-    return False
-
-
 def clear_discovery_hash(hass: HomeAssistant, discovery_hash: tuple[str, str]) -> None:
     """Clear entry from already discovered list."""
     hass.data[DATA_MQTT].discovery_already_discovered.discard(discovery_hash)
@@ -125,51 +82,36 @@ def set_discovery_hash(hass: HomeAssistant, discovery_hash: tuple[str, str]) ->
 
 
 @callback
-def get_origin_log_string(
-    discovery_payload: MQTTDiscoveryPayload, *, include_url: bool
-) -> str:
-    """Get the origin information from a discovery payload for logging."""
+def async_log_discovery_origin_info(
+    message: str, discovery_payload: MQTTDiscoveryPayload, level: int = logging.INFO
+) -> None:
+    """Log information about the discovery and origin."""
+    if not _LOGGER.isEnabledFor(level):
+        # bail early if logging is disabled
+        return
     if CONF_ORIGIN not in discovery_payload:
-        return ""
+        _LOGGER.log(level, message)
+        return
     origin_info: MqttOriginInfo = discovery_payload[CONF_ORIGIN]
     sw_version_log = ""
     if sw_version := origin_info.get("sw_version"):
         sw_version_log = f", version: {sw_version}"
     support_url_log = ""
-    if include_url and (support_url := get_origin_support_url(discovery_payload)):
+    if support_url := origin_info.get("support_url"):
         support_url_log = f", support URL: {support_url}"
-    return f" from external application {origin_info["name"]}{sw_version_log}{support_url_log}"
-
-
-@callback
-def get_origin_support_url(discovery_payload: MQTTDiscoveryPayload) -> str | None:
-    """Get the origin information support URL from a discovery payload."""
-    if CONF_ORIGIN not in discovery_payload:
-        return ""
-    origin_info: MqttOriginInfo = discovery_payload[CONF_ORIGIN]
-    return origin_info.get("support_url")
-
-
-@callback
-def async_log_discovery_origin_info(
-    message: str, discovery_payload: MQTTDiscoveryPayload, level: int = logging.INFO
-) -> None:
-    """Log information about the discovery and origin."""
-    # We only log origin info once per device discovery
-    if not _LOGGER.isEnabledFor(level):
-        # bail out early if logging is disabled
-        return
     _LOGGER.log(
         level,
-        "%s%s",
+        "%s from external application %s%s%s",
         message,
-        get_origin_log_string(discovery_payload, include_url=True),
+        origin_info["name"],
+        sw_version_log,
+        support_url_log,
     )
 
 
 @callback
 def _replace_abbreviations(
-    payload: dict[str, Any] | str,
+    payload: Any | dict[str, Any],
     abbreviations: dict[str, str],
     abbreviations_set: set[str],
 ) -> None:
@@ -181,20 +123,11 @@ def _replace_abbreviations(
 
 
 @callback
-def _replace_all_abbreviations(
-    discovery_payload: dict[str, Any], component_only: bool = False
-) -> None:
+def _replace_all_abbreviations(discovery_payload: Any | dict[str, Any]) -> None:
     """Replace all abbreviations in an MQTT discovery payload."""
 
     _replace_abbreviations(discovery_payload, ABBREVIATIONS, ABBREVIATIONS_SET)
 
-    if CONF_AVAILABILITY in discovery_payload:
-        for availability_conf in cv.ensure_list(discovery_payload[CONF_AVAILABILITY]):
-            _replace_abbreviations(availability_conf, ABBREVIATIONS, ABBREVIATIONS_SET)
-
-    if component_only:
-        return
-
     if CONF_ORIGIN in discovery_payload:
         _replace_abbreviations(
             discovery_payload[CONF_ORIGIN],
@@ -209,15 +142,13 @@ def _replace_all_abbreviations(
             DEVICE_ABBREVIATIONS_SET,
         )
 
-    if CONF_COMPONENTS in discovery_payload:
-        if not isinstance(discovery_payload[CONF_COMPONENTS], dict):
-            return
-        for comp_conf in discovery_payload[CONF_COMPONENTS].values():
-            _replace_all_abbreviations(comp_conf, component_only=True)
+    if CONF_AVAILABILITY in discovery_payload:
+        for availability_conf in cv.ensure_list(discovery_payload[CONF_AVAILABILITY]):
+            _replace_abbreviations(availability_conf, ABBREVIATIONS, ABBREVIATIONS_SET)
 
 
 @callback
-def _replace_topic_base(discovery_payload: MQTTDiscoveryPayload) -> None:
+def _replace_topic_base(discovery_payload: dict[str, Any]) -> None:
     """Replace topic base in MQTT discovery data."""
     base = discovery_payload.pop(TOPIC_BASE)
     for key, value in discovery_payload.items():
@@ -237,79 +168,6 @@ def _replace_topic_base(discovery_payload: MQTTDiscoveryPayload) -> None:
                     availability_conf[CONF_TOPIC] = f"{topic[:-1]}{base}"
 
 
-@callback
-def _generate_device_config(
-    hass: HomeAssistant,
-    object_id: str,
-    node_id: str | None,
-    migrate_discovery: bool = False,
-) -> MQTTDiscoveryPayload:
-    """Generate a cleanup or discovery migration message on device cleanup.
-
-    If an empty payload, or a migrate discovery request is received for a device,
-    we forward an empty payload for all previously discovered components.
-    """
-    mqtt_data = hass.data[DATA_MQTT]
-    device_node_id: str = f"{node_id} {object_id}" if node_id else object_id
-    config = MQTTDiscoveryPayload({CONF_DEVICE: {}, CONF_COMPONENTS: {}})
-    config.migrate_discovery = migrate_discovery
-    comp_config = config[CONF_COMPONENTS]
-    for platform, discover_id in mqtt_data.discovery_already_discovered:
-        ids = discover_id.split(" ")
-        component_node_id = ids.pop(0)
-        component_object_id = " ".join(ids)
-        if not ids:
-            continue
-        if device_node_id == component_node_id:
-            comp_config[component_object_id] = {CONF_PLATFORM: platform}
-
-    return config if comp_config else MQTTDiscoveryPayload({})
-
-
-@callback
-def _parse_device_payload(
-    hass: HomeAssistant,
-    payload: ReceivePayloadType,
-    object_id: str,
-    node_id: str | None,
-) -> MQTTDiscoveryPayload:
-    """Parse a device discovery payload.
-
-    The device discovery payload is translated info the config payloads for every single
-    component inside the device based configuration.
-    An empty payload is translated in a cleanup, which forwards an empty payload to all
-    removed components.
-    """
-    device_payload = MQTTDiscoveryPayload()
-    if payload == "":
-        if not (device_payload := _generate_device_config(hass, object_id, node_id)):
-            _LOGGER.warning(
-                "No device components to cleanup for %s, node_id '%s'",
-                object_id,
-                node_id,
-            )
-        return device_payload
-    try:
-        device_payload = MQTTDiscoveryPayload(json_loads_object(payload))
-    except ValueError:
-        _LOGGER.warning("Unable to parse JSON %s: '%s'", object_id, payload)
-        return device_payload
-    if _async_process_discovery_migration(device_payload):
-        return _generate_device_config(hass, object_id, node_id, migrate_discovery=True)
-    _replace_all_abbreviations(device_payload)
-    try:
-        DEVICE_DISCOVERY_SCHEMA(device_payload)
-    except vol.Invalid as exc:
-        _LOGGER.warning(
-            "Invalid MQTT device discovery payload for %s, %s: '%s'",
-            object_id,
-            exc,
-            payload,
-        )
-        return MQTTDiscoveryPayload({})
-    return device_payload
-
-
 @callback
 def _valid_origin_info(discovery_payload: MQTTDiscoveryPayload) -> bool:
     """Parse and validate origin info from a single component discovery payload."""
@@ -327,37 +185,13 @@ def _valid_origin_info(discovery_payload: MQTTDiscoveryPayload) -> bool:
     return True
 
 
-@callback
-def _merge_common_device_options(
-    component_config: MQTTDiscoveryPayload, device_config: dict[str, Any]
-) -> None:
-    """Merge common device options with the component config options.
-
-    Common options are:
-        CONF_AVAILABILITY,
-        CONF_AVAILABILITY_MODE,
-        CONF_AVAILABILITY_TEMPLATE,
-        CONF_AVAILABILITY_TOPIC,
-        CONF_COMMAND_TOPIC,
-        CONF_PAYLOAD_AVAILABLE,
-        CONF_PAYLOAD_NOT_AVAILABLE,
-        CONF_STATE_TOPIC,
-    Common options in the body of the device based config are inherited into
-    the component. Unless the option is explicitly specified at component level,
-    in that case the option at component level will override the common option.
-    """
-    for option in SHARED_OPTIONS:
-        if option in device_config and option not in component_config:
-            component_config[option] = device_config.get(option)
-
-
 async def async_start(  # noqa: C901
     hass: HomeAssistant, discovery_topic: str, config_entry: ConfigEntry
 ) -> None:
     """Start MQTT Discovery."""
     mqtt_data = hass.data[DATA_MQTT]
     platform_setup_lock: dict[str, asyncio.Lock] = {}
-    integration_discovery_messages: dict[str, MQTTIntegrationDiscoveryConfig] = {}
+    integration_discovery_messages: dict[str, int] = {}
 
     @callback
     def _async_add_component(discovery_payload: MQTTDiscoveryPayload) -> None:
@@ -395,7 +229,8 @@ async def async_start(  # noqa: C901
                 _LOGGER.warning(
                     (
                         "Received message on illegal discovery topic '%s'. The topic"
-                        " contains non allowed characters. For more information see "
+                        " contains "
+                        "not allowed characters. For more information see "
                         "https://www.home-assistant.io/integrations/mqtt/#discovery-topic"
                     ),
                     topic,
@@ -404,118 +239,51 @@ async def async_start(  # noqa: C901
 
         component, node_id, object_id = match.groups()
 
-        discovered_components: list[MqttComponentConfig] = []
-        if component == CONF_DEVICE:
-            # Process device based discovery message and regenerate
-            # cleanup config for the all the components that are being removed.
-            # This is done when a component in the device config is omitted and detected
-            # as being removed, or when the device config update payload is empty.
-            # In that case this will regenerate a cleanup message for all every already
-            # discovered components that were linked to the initial device discovery.
-            device_discovery_payload = _parse_device_payload(
-                hass, payload, object_id, node_id
-            )
-            if not device_discovery_payload:
-                return
-            device_config: dict[str, Any]
-            origin_config: dict[str, Any] | None
-            component_configs: dict[str, dict[str, Any]]
-            device_config = device_discovery_payload[CONF_DEVICE]
-            origin_config = device_discovery_payload.get(CONF_ORIGIN)
-            component_configs = device_discovery_payload[CONF_COMPONENTS]
-            for component_id, config in component_configs.items():
-                component = config.pop(CONF_PLATFORM)
-                # The object_id in the device discovery topic is the unique identifier.
-                # It is used as node_id for the components it contains.
-                component_node_id = object_id
-                # The component_id in the discovery playload is used as object_id
-                # If we have an additional node_id in the discovery topic,
-                # we extend the component_id with it.
-                component_object_id = (
-                    f"{node_id} {component_id}" if node_id else component_id
-                )
-                # We add wrapper to the discovery payload with the discovery data.
-                # If the dict is empty after removing the platform, the payload is
-                # assumed to remove the existing config and we do not want to add
-                # device or orig or shared availability attributes.
-                if discovery_payload := MQTTDiscoveryPayload(config):
-                    discovery_payload[CONF_DEVICE] = device_config
-                    discovery_payload[CONF_ORIGIN] = origin_config
-                    # Only assign shared config options
-                    # when they are not set at entity level
-                    _merge_common_device_options(
-                        discovery_payload, device_discovery_payload
-                    )
-                discovery_payload.device_discovery = True
-                discovery_payload.migrate_discovery = (
-                    device_discovery_payload.migrate_discovery
-                )
-                discovered_components.append(
-                    MqttComponentConfig(
-                        component,
-                        component_object_id,
-                        component_node_id,
-                        discovery_payload,
-                    )
-                )
-            _LOGGER.debug(
-                "Process device discovery payload %s", device_discovery_payload
-            )
-            device_discovery_id = f"{node_id} {object_id}" if node_id else object_id
-            message = f"Processing device discovery for '{device_discovery_id}'"
-            async_log_discovery_origin_info(
-                message, MQTTDiscoveryPayload(device_discovery_payload)
-            )
-
-        else:
-            # Process component based discovery message
+        if payload:
             try:
-                discovery_payload = MQTTDiscoveryPayload(
-                    json_loads_object(payload) if payload else {}
-                )
+                discovery_payload = MQTTDiscoveryPayload(json_loads_object(payload))
             except ValueError:
                 _LOGGER.warning("Unable to parse JSON %s: '%s'", object_id, payload)
                 return
-            if not _async_process_discovery_migration(discovery_payload):
-                _replace_all_abbreviations(discovery_payload)
-                if not _valid_origin_info(discovery_payload):
-                    return
-            discovered_components.append(
-                MqttComponentConfig(component, object_id, node_id, discovery_payload)
-            )
-
-        discovery_pending_discovered = mqtt_data.discovery_pending_discovered
-        for component_config in discovered_components:
-            component = component_config.component
-            node_id = component_config.node_id
-            object_id = component_config.object_id
-            discovery_payload = component_config.discovery_payload
-
+            _replace_all_abbreviations(discovery_payload)
+            if not _valid_origin_info(discovery_payload):
+                return
             if TOPIC_BASE in discovery_payload:
                 _replace_topic_base(discovery_payload)
+        else:
+            discovery_payload = MQTTDiscoveryPayload({})
 
-            # If present, the node_id will be included in the discovery_id.
-            discovery_id = f"{node_id} {object_id}" if node_id else object_id
-            discovery_hash = (component, discovery_id)
+        # If present, the node_id will be included in the discovered object id
+        discovery_id = f"{node_id} {object_id}" if node_id else object_id
+        discovery_hash = (component, discovery_id)
 
+        if discovery_payload:
             # Attach MQTT topic to the payload, used for debug prints
-            discovery_payload.discovery_data = {
+            setattr(
+                discovery_payload,
+                "__configuration_source__",
+                f"MQTT (topic: '{topic}')",
+            )
+            discovery_data = {
                 ATTR_DISCOVERY_HASH: discovery_hash,
                 ATTR_DISCOVERY_PAYLOAD: discovery_payload,
                 ATTR_DISCOVERY_TOPIC: topic,
             }
+            setattr(discovery_payload, "discovery_data", discovery_data)
 
-            if discovery_hash in discovery_pending_discovered:
-                pending = discovery_pending_discovered[discovery_hash]["pending"]
-                pending.appendleft(discovery_payload)
-                _LOGGER.debug(
-                    "Component has already been discovered: %s %s, queuing update",
-                    component,
-                    discovery_id,
-                )
-                return
+            discovery_payload[CONF_PLATFORM] = "mqtt"
 
-            async_process_discovery_payload(component, discovery_id, discovery_payload)
+        if discovery_hash in mqtt_data.discovery_pending_discovered:
+            pending = mqtt_data.discovery_pending_discovered[discovery_hash]["pending"]
+            pending.appendleft(discovery_payload)
+            _LOGGER.debug(
+                "Component has already been discovered: %s %s, queuing update",
+                component,
+                discovery_id,
+            )
+            return
+
+        async_process_discovery_payload(component, discovery_id, discovery_payload)
 
     @callback
     def async_process_discovery_payload(
@@ -523,7 +291,7 @@ async def async_start(  # noqa: C901
     ) -> None:
         """Process the payload of a new discovery."""
 
-        _LOGGER.debug("Process component discovery payload %s", payload)
+        _LOGGER.debug("Process discovery payload %s", payload)
         discovery_hash = (component, discovery_id)
 
         already_discovered = discovery_hash in mqtt_data.discovery_already_discovered
@@ -580,8 +348,6 @@ async def async_start(  # noqa: C901
             0,
             job_type=HassJobType.Callback,
         )
-        # Subscribe first for platform discovery wildcard topics first,
-        # and then subscribe device discovery wildcard topics.
         for topic in chain(
             (
                 f"{discovery_topic}/{component}/+/config"
@@ -591,10 +357,6 @@ async def async_start(  # noqa: C901
                 f"{discovery_topic}/{component}/+/+/config"
                 for component in SUPPORTED_COMPONENTS
             ),
-            (
-                f"{discovery_topic}/device/+/config",
-                f"{discovery_topic}/device/+/+/config",
-            ),
         )
     ]
 
@@ -602,39 +364,13 @@ async def async_start(  # noqa: C901
     mqtt_integrations = await async_get_mqtt(hass)
     integration_unsubscribe = mqtt_data.integration_unsubscribe
 
-    async def _async_handle_config_entry_removed(entry: ConfigEntry) -> None:
-        """Handle integration config entry changes."""
-        for discovery_key in entry.discovery_keys[DOMAIN]:
-            if (
-                discovery_key.version != 1
-                or not isinstance(discovery_key.key, str)
-                or discovery_key.key not in integration_discovery_messages
-            ):
-                continue
-            topic = discovery_key.key
-            discovery_message = integration_discovery_messages[topic]
-            del integration_discovery_messages[topic]
-            _LOGGER.debug("Rediscover service on topic %s", topic)
-            # Initiate re-discovery
-            await async_integration_message_received(
-                discovery_message.integration, discovery_message.msg
-            )
-
-    mqtt_data.discovery_unsubscribe.append(
-        async_dispatcher_connect(
-            hass,
-            signal_discovered_config_entry_removed(DOMAIN),
-            _async_handle_config_entry_removed,
-        )
-    )
-
     async def async_integration_message_received(
         integration: str, msg: ReceiveMessage
     ) -> None:
         """Process the received message."""
         if (
             msg.topic in integration_discovery_messages
-            and integration_discovery_messages[msg.topic].msg.payload == msg.payload
+            and integration_discovery_messages[msg.topic] == hash(msg.payload)
         ):
             _LOGGER.debug(
                 "Ignoring already processed discovery message for '%s' on topic %s: %s",
@@ -657,23 +393,14 @@ async def async_start(  # noqa: C901
                 subscribed_topic=msg.subscribed_topic,
                 timestamp=msg.timestamp,
             )
-            discovery_key = discovery_flow.DiscoveryKey(
-                domain=DOMAIN, key=msg.topic, version=1
-            )
-            discovery_flow.async_create_flow(
-                hass,
-                integration,
-                {"source": SOURCE_MQTT},
-                data,
-                discovery_key=discovery_key,
+            await hass.config_entries.flow.async_init(
+                integration, context={"source": DOMAIN}, data=data
             )
             if msg.payload:
                 # Update the last discovered config message
-                integration_discovery_messages[msg.topic] = (
-                    MQTTIntegrationDiscoveryConfig(integration=integration, msg=msg)
-                )
+                integration_discovery_messages[msg.topic] = hash(msg.payload)
             elif msg.topic in integration_discovery_messages:
-                # Cleanup cache if discovery payload is empty
+                # Cleanup hash if discovery payload is empty
                 del integration_discovery_messages[msg.topic]
 
     integration_unsubscribe.update(
diff --git a/homeassistant/components/mqtt/entity.py b/homeassistant/components/mqtt/entity.py
index 46b2c9e1d42..5845dae12e2 100644
--- a/homeassistant/components/mqtt/entity.py
+++ b/homeassistant/components/mqtt/entity.py
@@ -76,7 +76,6 @@ from .const import (
     CONF_CONNECTIONS,
     CONF_ENABLED_BY_DEFAULT,
     CONF_ENCODING,
-    CONF_ENTITY_PICTURE,
     CONF_HW_VERSION,
     CONF_IDENTIFIERS,
     CONF_JSON_ATTRS_TEMPLATE,
@@ -104,8 +103,6 @@ from .discovery import (
     MQTT_DISCOVERY_UPDATED,
     MQTTDiscoveryPayload,
     clear_discovery_hash,
-    get_origin_log_string,
-    get_origin_support_url,
     set_discovery_hash,
 )
 from .models import (
@@ -593,7 +590,6 @@ async def cleanup_device_registry(
     entity_registry = er.async_get(hass)
     if (
         device_id
-        and device_id not in device_registry.deleted_devices
         and config_entry_id
         and not er.async_entries_for_device(
             entity_registry, device_id, include_disabled_entities=False
@@ -675,7 +671,6 @@ class MqttDiscoveryDeviceUpdateMixin(ABC):
         self._config_entry = config_entry
         self._config_entry_id = config_entry.entry_id
         self._skip_device_removal: bool = False
-        self._migrate_discovery: str | None = None
 
         discovery_hash = get_discovery_hash(discovery_data)
         self._remove_discovery_updated = async_dispatcher_connect(
@@ -708,95 +703,12 @@ class MqttDiscoveryDeviceUpdateMixin(ABC):
     ) -> None:
         """Handle discovery update."""
         discovery_hash = get_discovery_hash(self._discovery_data)
-        # Start discovery migration or rollback if migrate_discovery flag is set
-        # and the discovery topic is valid and not yet migrating
-        if (
-            discovery_payload.migrate_discovery
-            and self._migrate_discovery is None
-            and self._discovery_data[ATTR_DISCOVERY_TOPIC]
-            == discovery_payload.discovery_data[ATTR_DISCOVERY_TOPIC]
-        ):
-            self._migrate_discovery = self._discovery_data[ATTR_DISCOVERY_TOPIC]
-            discovery_hash = self._discovery_data[ATTR_DISCOVERY_HASH]
-            origin_info = get_origin_log_string(
-                self._discovery_data[ATTR_DISCOVERY_PAYLOAD], include_url=False
-            )
-            action = "Rollback" if discovery_payload.device_discovery else "Migration"
-            schema_type = "platform" if discovery_payload.device_discovery else "device"
-            _LOGGER.info(
-                "%s to MQTT %s discovery schema started for %s '%s'"
-                "%s on topic %s. To complete %s, publish a %s discovery "
-                "message with %s '%s'. After completed %s, "
-                "publish an empty (retained) payload to %s",
-                action,
-                schema_type,
-                discovery_hash[0],
-                discovery_hash[1],
-                origin_info,
-                self._migrate_discovery,
-                action.lower(),
-                schema_type,
-                discovery_hash[0],
-                discovery_hash[1],
-                action.lower(),
-                self._migrate_discovery,
-            )
-
-            # Cleanup platform resources
-            await self.async_tear_down()
-            # Unregister and clean discovery
-            stop_discovery_updates(
-                self.hass, self._discovery_data, self._remove_discovery_updated
-            )
-            send_discovery_done(self.hass, self._discovery_data)
-            return
-
         _LOGGER.debug(
             "Got update for %s with hash: %s '%s'",
             self.log_name,
             discovery_hash,
             discovery_payload,
         )
-        new_discovery_topic = discovery_payload.discovery_data[ATTR_DISCOVERY_TOPIC]
-
-        # Abort early if an update is not received via the registered discovery topic.
-        # This can happen if a device and single component discovery payload
-        # share the same discovery ID.
-        if self._discovery_data[ATTR_DISCOVERY_TOPIC] != new_discovery_topic:
-            # Prevent illegal updates
-            old_origin_info = get_origin_log_string(
-                self._discovery_data[ATTR_DISCOVERY_PAYLOAD], include_url=False
-            )
-            new_origin_info = get_origin_log_string(
-                discovery_payload.discovery_data[ATTR_DISCOVERY_PAYLOAD],
-                include_url=False,
-            )
-            new_origin_support_url = get_origin_support_url(
-                discovery_payload.discovery_data[ATTR_DISCOVERY_PAYLOAD]
-            )
-            if new_origin_support_url:
-                get_support = f"for support visit {new_origin_support_url}"
-            else:
-                get_support = (
-                    "for documentation on migration to device schema or rollback to "
-                    "discovery schema, visit https://www.home-assistant.io/integrations/"
-                    "mqtt/#migration-from-single-component-to-device-based-discovery"
-                )
-            _LOGGER.warning(
-                "Received a conflicting MQTT discovery message for %s '%s' which was "
-                "previously discovered on topic %s%s; the conflicting discovery "
-                "message was received on topic %s%s; %s",
-                discovery_hash[0],
-                discovery_hash[1],
-                self._discovery_data[ATTR_DISCOVERY_TOPIC],
-                old_origin_info,
-                new_discovery_topic,
-                new_origin_info,
-                get_support,
-            )
-            send_discovery_done(self.hass, self._discovery_data)
-            return
-
         if (
             discovery_payload
             and discovery_payload != self._discovery_data[ATTR_DISCOVERY_PAYLOAD]
@@ -893,7 +805,6 @@ class MqttDiscoveryUpdateMixin(Entity):
         mqtt_data = hass.data[DATA_MQTT]
         self._registry_hooks = mqtt_data.discovery_registry_hooks
         discovery_hash: tuple[str, str] = discovery_data[ATTR_DISCOVERY_HASH]
-        self._migrate_discovery: str | None = None
         if discovery_hash in self._registry_hooks:
             self._registry_hooks.pop(discovery_hash)()
 
@@ -951,12 +862,7 @@ class MqttDiscoveryUpdateMixin(Entity):
         if TYPE_CHECKING:
             assert self._discovery_data
         self._cleanup_discovery_on_remove()
-        if self._migrate_discovery is None:
-            # Unload and cleanup registry
-            await self._async_remove_state_and_registry_entry()
-        else:
-            # Only unload the entity
-            await self.async_remove(force_remove=True)
+        await self._async_remove_state_and_registry_entry()
         send_discovery_done(self.hass, self._discovery_data)
 
     @callback
@@ -971,102 +877,18 @@ class MqttDiscoveryUpdateMixin(Entity):
         """
         if TYPE_CHECKING:
             assert self._discovery_data
-        discovery_hash = get_discovery_hash(self._discovery_data)
-        # Start discovery migration or rollback if migrate_discovery flag is set
-        # and the discovery topic is valid and not yet migrating
-        if (
-            payload.migrate_discovery
-            and self._migrate_discovery is None
-            and self._discovery_data[ATTR_DISCOVERY_TOPIC]
-            == payload.discovery_data[ATTR_DISCOVERY_TOPIC]
-        ):
-            if self.unique_id is None or self.device_info is None:
-                _LOGGER.error(
-                    "Discovery migration is not possible for "
-                    "for entity %s on topic %s. A unique_id "
-                    "and device context is required, got unique_id: %s, device: %s",
-                    self.entity_id,
-                    self._discovery_data[ATTR_DISCOVERY_TOPIC],
-                    self.unique_id,
-                    self.device_info,
-                )
-                send_discovery_done(self.hass, self._discovery_data)
-                return
-
-            self._migrate_discovery = self._discovery_data[ATTR_DISCOVERY_TOPIC]
-            discovery_hash = self._discovery_data[ATTR_DISCOVERY_HASH]
-            origin_info = get_origin_log_string(
-                self._discovery_data[ATTR_DISCOVERY_PAYLOAD], include_url=False
-            )
-            action = "Rollback" if payload.device_discovery else "Migration"
-            schema_type = "platform" if payload.device_discovery else "device"
-            _LOGGER.info(
-                "%s to MQTT %s discovery schema started for entity %s"
-                "%s on topic %s. To complete %s, publish a %s discovery "
-                "message with %s entity '%s'. After completed %s, "
-                "publish an empty (retained) payload to %s",
-                action,
-                schema_type,
-                self.entity_id,
-                origin_info,
-                self._migrate_discovery,
-                action.lower(),
-                schema_type,
-                discovery_hash[0],
-                discovery_hash[1],
-                action.lower(),
-                self._migrate_discovery,
-            )
-        old_payload = self._discovery_data[ATTR_DISCOVERY_PAYLOAD]
+        discovery_hash: tuple[str, str] = self._discovery_data[ATTR_DISCOVERY_HASH]
         _LOGGER.debug(
             "Got update for entity with hash: %s '%s'",
             discovery_hash,
             payload,
         )
-        new_discovery_topic = payload.discovery_data[ATTR_DISCOVERY_TOPIC]
-        # Abort early if an update is not received via the registered discovery topic.
-        # This can happen if a device and single component discovery payload
-        # share the same discovery ID.
-        if self._discovery_data[ATTR_DISCOVERY_TOPIC] != new_discovery_topic:
-            # Prevent illegal updates
-            old_origin_info = get_origin_log_string(
-                self._discovery_data[ATTR_DISCOVERY_PAYLOAD], include_url=False
-            )
-            new_origin_info = get_origin_log_string(
-                payload.discovery_data[ATTR_DISCOVERY_PAYLOAD], include_url=False
-            )
-            new_origin_support_url = get_origin_support_url(
-                payload.discovery_data[ATTR_DISCOVERY_PAYLOAD]
-            )
-            if new_origin_support_url:
-                get_support = f"for support visit {new_origin_support_url}"
-            else:
-                get_support = (
-                    "for documentation on migration to device schema or rollback to "
-                    "discovery schema, visit https://www.home-assistant.io/integrations/"
-                    "mqtt/#migration-from-single-component-to-device-based-discovery"
-                )
-            _LOGGER.warning(
-                "Received a conflicting MQTT discovery message for entity %s; the "
-                "entity was previously discovered on topic %s%s; the conflicting "
-                "discovery message was received on topic %s%s; %s",
-                self.entity_id,
-                self._discovery_data[ATTR_DISCOVERY_TOPIC],
-                old_origin_info,
-                new_discovery_topic,
-                new_origin_info,
-                get_support,
-            )
-            send_discovery_done(self.hass, self._discovery_data)
-            return
-
+        old_payload: DiscoveryInfoType
+        old_payload = self._discovery_data[ATTR_DISCOVERY_PAYLOAD]
         debug_info.update_entity_discovery_data(self.hass, payload, self.entity_id)
         if not payload:
             # Empty payload: Remove component
-            if self._migrate_discovery is None:
-                _LOGGER.info("Removing component: %s", self.entity_id)
-            else:
-                _LOGGER.info("Unloading component: %s", self.entity_id)
+            _LOGGER.info("Removing component: %s", self.entity_id)
             self.hass.async_create_task(
                 self._async_process_discovery_update_and_remove()
             )
@@ -1389,7 +1211,6 @@ class MqttEntity(
             config.get(CONF_ENABLED_BY_DEFAULT)
         )
         self._attr_icon = config.get(CONF_ICON)
-        self._attr_entity_picture = config.get(CONF_ENTITY_PICTURE)
         # Set the entity name if needed
         self._set_entity_name(config)
 
diff --git a/homeassistant/components/mqtt/manifest.json b/homeassistant/components/mqtt/manifest.json
index 25e98c01aaf..e39387347de 100644
--- a/homeassistant/components/mqtt/manifest.json
+++ b/homeassistant/components/mqtt/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "mqtt",
   "name": "MQTT",
-  "after_dependencies": ["hassio"],
   "codeowners": ["@emontnemery", "@jbouwh", "@bdraco"],
   "config_flow": true,
   "dependencies": ["file_upload", "http"],
diff --git a/homeassistant/components/mqtt/models.py b/homeassistant/components/mqtt/models.py
index 34c1f304944..f7abbc29464 100644
--- a/homeassistant/components/mqtt/models.py
+++ b/homeassistant/components/mqtt/models.py
@@ -410,15 +410,5 @@ class MqttData:
     tags: dict[str, dict[str, MQTTTagScanner]] = field(default_factory=dict)
 
 
-@dataclass(slots=True)
-class MqttComponentConfig:
-    """(component, object_id, node_id, discovery_payload)."""
-
-    component: str
-    object_id: str
-    node_id: str | None
-    discovery_payload: MQTTDiscoveryPayload
-
-
 DATA_MQTT: HassKey[MqttData] = HassKey("mqtt")
 DATA_MQTT_AVAILABLE: HassKey[asyncio.Future[bool]] = HassKey("mqtt_client_available")
diff --git a/homeassistant/components/mqtt/schemas.py b/homeassistant/components/mqtt/schemas.py
index 5e942c24738..67c6b447709 100644
--- a/homeassistant/components/mqtt/schemas.py
+++ b/homeassistant/components/mqtt/schemas.py
@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Any
-
 import voluptuous as vol
 
 from homeassistant.const import (
@@ -13,7 +11,6 @@ from homeassistant.const import (
     CONF_MODEL,
     CONF_MODEL_ID,
     CONF_NAME,
-    CONF_PLATFORM,
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
 )
@@ -28,14 +25,10 @@ from .const import (
     CONF_AVAILABILITY_MODE,
     CONF_AVAILABILITY_TEMPLATE,
     CONF_AVAILABILITY_TOPIC,
-    CONF_COMMAND_TOPIC,
-    CONF_COMPONENTS,
     CONF_CONFIGURATION_URL,
     CONF_CONNECTIONS,
     CONF_DEPRECATED_VIA_HUB,
     CONF_ENABLED_BY_DEFAULT,
-    CONF_ENCODING,
-    CONF_ENTITY_PICTURE,
     CONF_HW_VERSION,
     CONF_IDENTIFIERS,
     CONF_JSON_ATTRS_TEMPLATE,
@@ -45,9 +38,7 @@ from .const import (
     CONF_ORIGIN,
     CONF_PAYLOAD_AVAILABLE,
     CONF_PAYLOAD_NOT_AVAILABLE,
-    CONF_QOS,
     CONF_SERIAL_NUMBER,
-    CONF_STATE_TOPIC,
     CONF_SUGGESTED_AREA,
     CONF_SUPPORT_URL,
     CONF_SW_VERSION,
@@ -55,34 +46,10 @@ from .const import (
     CONF_VIA_DEVICE,
     DEFAULT_PAYLOAD_AVAILABLE,
     DEFAULT_PAYLOAD_NOT_AVAILABLE,
-    ENTITY_PLATFORMS,
-    SUPPORTED_COMPONENTS,
 )
-from .util import valid_publish_topic, valid_qos_schema, valid_subscribe_topic
+from .util import valid_subscribe_topic
 
-# Device discovery options that are also available at entity component level
-SHARED_OPTIONS = [
-    CONF_AVAILABILITY,
-    CONF_AVAILABILITY_MODE,
-    CONF_AVAILABILITY_TEMPLATE,
-    CONF_AVAILABILITY_TOPIC,
-    CONF_COMMAND_TOPIC,
-    CONF_PAYLOAD_AVAILABLE,
-    CONF_PAYLOAD_NOT_AVAILABLE,
-    CONF_STATE_TOPIC,
-]
-
-MQTT_ORIGIN_INFO_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            vol.Required(CONF_NAME): cv.string,
-            vol.Optional(CONF_SW_VERSION): cv.string,
-            vol.Optional(CONF_SUPPORT_URL): cv.configuration_url,
-        }
-    ),
-)
-
-_MQTT_AVAILABILITY_SINGLE_SCHEMA = vol.Schema(
+MQTT_AVAILABILITY_SINGLE_SCHEMA = vol.Schema(
     {
         vol.Exclusive(CONF_AVAILABILITY_TOPIC, "availability"): valid_subscribe_topic,
         vol.Optional(CONF_AVAILABILITY_TEMPLATE): cv.template,
@@ -95,7 +62,7 @@ _MQTT_AVAILABILITY_SINGLE_SCHEMA = vol.Schema(
     }
 )
 
-_MQTT_AVAILABILITY_LIST_SCHEMA = vol.Schema(
+MQTT_AVAILABILITY_LIST_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_AVAILABILITY_MODE, default=AVAILABILITY_LATEST): vol.All(
             cv.string, vol.In(AVAILABILITY_MODES)
@@ -119,8 +86,8 @@ _MQTT_AVAILABILITY_LIST_SCHEMA = vol.Schema(
     }
 )
 
-_MQTT_AVAILABILITY_SCHEMA = _MQTT_AVAILABILITY_SINGLE_SCHEMA.extend(
-    _MQTT_AVAILABILITY_LIST_SCHEMA.schema
+MQTT_AVAILABILITY_SCHEMA = MQTT_AVAILABILITY_SINGLE_SCHEMA.extend(
+    MQTT_AVAILABILITY_LIST_SCHEMA.schema
 )
 
 
@@ -170,10 +137,9 @@ MQTT_ORIGIN_INFO_SCHEMA = vol.All(
     ),
 )
 
-MQTT_ENTITY_COMMON_SCHEMA = _MQTT_AVAILABILITY_SCHEMA.extend(
+MQTT_ENTITY_COMMON_SCHEMA = MQTT_AVAILABILITY_SCHEMA.extend(
     {
         vol.Optional(CONF_DEVICE): MQTT_ENTITY_DEVICE_INFO_SCHEMA,
-        vol.Optional(CONF_ENTITY_PICTURE): cv.url,
         vol.Optional(CONF_ORIGIN): MQTT_ORIGIN_INFO_SCHEMA,
         vol.Optional(CONF_ENABLED_BY_DEFAULT, default=True): cv.boolean,
         vol.Optional(CONF_ENTITY_CATEGORY): ENTITY_CATEGORIES_SCHEMA,
@@ -184,35 +150,3 @@ MQTT_ENTITY_COMMON_SCHEMA = _MQTT_AVAILABILITY_SCHEMA.extend(
         vol.Optional(CONF_UNIQUE_ID): cv.string,
     }
 )
-
-_UNIQUE_ID_SCHEMA = vol.Schema(
-    {vol.Required(CONF_UNIQUE_ID): cv.string},
-).extend({}, extra=True)
-
-
-def check_unique_id(config: dict[str, Any]) -> dict[str, Any]:
-    """Check if a unique ID is set in case an entity platform is configured."""
-    platform = config[CONF_PLATFORM]
-    if platform in ENTITY_PLATFORMS and len(config.keys()) > 1:
-        _UNIQUE_ID_SCHEMA(config)
-    return config
-
-
-_COMPONENT_CONFIG_SCHEMA = vol.All(
-    vol.Schema(
-        {vol.Required(CONF_PLATFORM): vol.In(SUPPORTED_COMPONENTS)},
-    ).extend({}, extra=True),
-    check_unique_id,
-)
-
-DEVICE_DISCOVERY_SCHEMA = _MQTT_AVAILABILITY_SCHEMA.extend(
-    {
-        vol.Required(CONF_DEVICE): MQTT_ENTITY_DEVICE_INFO_SCHEMA,
-        vol.Required(CONF_COMPONENTS): vol.Schema({str: _COMPONENT_CONFIG_SCHEMA}),
-        vol.Required(CONF_ORIGIN): MQTT_ORIGIN_INFO_SCHEMA,
-        vol.Optional(CONF_STATE_TOPIC): valid_subscribe_topic,
-        vol.Optional(CONF_COMMAND_TOPIC): valid_publish_topic,
-        vol.Optional(CONF_QOS): valid_qos_schema,
-        vol.Optional(CONF_ENCODING): cv.string,
-    }
-)
diff --git a/homeassistant/components/mqtt/update.py b/homeassistant/components/mqtt/update.py
index 8878ff63127..f7bb9f75dd1 100644
--- a/homeassistant/components/mqtt/update.py
+++ b/homeassistant/components/mqtt/update.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import Any, TypedDict, cast
 
 import voluptuous as vol
 
@@ -34,7 +34,7 @@ _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = "MQTT Update"
 
-CONF_DISPLAY_PRECISION = "display_precision"
+CONF_ENTITY_PICTURE = "entity_picture"
 CONF_LATEST_VERSION_TEMPLATE = "latest_version_template"
 CONF_LATEST_VERSION_TOPIC = "latest_version_topic"
 CONF_PAYLOAD_INSTALL = "payload_install"
@@ -47,7 +47,7 @@ PLATFORM_SCHEMA_MODERN = MQTT_RO_SCHEMA.extend(
     {
         vol.Optional(CONF_COMMAND_TOPIC): valid_publish_topic,
         vol.Optional(CONF_DEVICE_CLASS): vol.Any(DEVICE_CLASSES_SCHEMA, None),
-        vol.Optional(CONF_DISPLAY_PRECISION, default=0): cv.positive_int,
+        vol.Optional(CONF_ENTITY_PICTURE): cv.string,
         vol.Optional(CONF_LATEST_VERSION_TEMPLATE): cv.template,
         vol.Optional(CONF_LATEST_VERSION_TOPIC): valid_subscribe_topic,
         vol.Optional(CONF_NAME): vol.Any(cv.string, None),
@@ -63,18 +63,15 @@ PLATFORM_SCHEMA_MODERN = MQTT_RO_SCHEMA.extend(
 DISCOVERY_SCHEMA = vol.All(PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA))
 
 
-MQTT_JSON_UPDATE_SCHEMA = vol.Schema(
-    {
-        vol.Optional("installed_version"): cv.string,
-        vol.Optional("latest_version"): cv.string,
-        vol.Optional("title"): cv.string,
-        vol.Optional("release_summary"): cv.string,
-        vol.Optional("release_url"): cv.url,
-        vol.Optional("entity_picture"): cv.url,
-        vol.Optional("in_progress"): cv.boolean,
-        vol.Optional("update_percentage"): vol.Any(vol.Range(min=0, max=100), None),
-    }
-)
+class _MqttUpdatePayloadType(TypedDict, total=False):
+    """Presentation of supported JSON payload to process state updates."""
+
+    installed_version: str
+    latest_version: str
+    title: str
+    release_summary: str
+    release_url: str
+    entity_picture: str
 
 
 async def async_setup_entry(
@@ -99,12 +96,13 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
 
     _default_name = DEFAULT_NAME
     _entity_id_format = update.ENTITY_ID_FORMAT
+    _entity_picture: str | None
 
     @property
     def entity_picture(self) -> str | None:
         """Return the entity picture to use in the frontend."""
-        if self._attr_entity_picture is not None:
-            return self._attr_entity_picture
+        if self._entity_picture is not None:
+            return self._entity_picture
 
         return super().entity_picture
 
@@ -116,10 +114,10 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
     def _setup_from_config(self, config: ConfigType) -> None:
         """(Re)Setup the entity."""
         self._attr_device_class = self._config.get(CONF_DEVICE_CLASS)
-        self._attr_display_precision = self._config[CONF_DISPLAY_PRECISION]
         self._attr_release_summary = self._config.get(CONF_RELEASE_SUMMARY)
         self._attr_release_url = self._config.get(CONF_RELEASE_URL)
         self._attr_title = self._config.get(CONF_TITLE)
+        self._entity_picture: str | None = self._config.get(CONF_ENTITY_PICTURE)
         self._templates = {
             CONF_VALUE_TEMPLATE: MqttValueTemplate(
                 config.get(CONF_VALUE_TEMPLATE),
@@ -144,7 +142,7 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
             )
             return
 
-        json_payload: dict[str, Any] = {}
+        json_payload: _MqttUpdatePayloadType = {}
         try:
             rendered_json_payload = json_loads(payload)
             if isinstance(rendered_json_payload, dict):
@@ -156,7 +154,7 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
                     rendered_json_payload,
                     msg.topic,
                 )
-                json_payload = MQTT_JSON_UPDATE_SCHEMA(rendered_json_payload)
+                json_payload = cast(_MqttUpdatePayloadType, rendered_json_payload)
             else:
                 _LOGGER.debug(
                     (
@@ -167,27 +165,14 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
                     msg.topic,
                 )
                 json_payload = {"installed_version": str(payload)}
-        except vol.MultipleInvalid as exc:
-            _LOGGER.warning(
-                (
-                    "Schema violation after processing payload '%s'"
-                    " on topic '%s' for entity '%s': %s"
-                ),
-                payload,
-                msg.topic,
-                self.entity_id,
-                exc,
-            )
-            return
         except JSON_DECODE_EXCEPTIONS:
             _LOGGER.debug(
                 (
                     "No valid (JSON) payload detected after processing payload '%s'"
-                    " on topic '%s' for entity '%s'"
+                    " on topic %s"
                 ),
                 payload,
                 msg.topic,
-                self.entity_id,
             )
             json_payload["installed_version"] = str(payload)
 
@@ -207,14 +192,7 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
             self._attr_release_url = json_payload["release_url"]
 
         if "entity_picture" in json_payload:
-            self._attr_entity_picture = json_payload["entity_picture"]
-
-        if "update_percentage" in json_payload:
-            self._attr_update_percentage = json_payload["update_percentage"]
-            self._attr_in_progress = self._attr_update_percentage is not None
-
-        if "in_progress" in json_payload:
-            self._attr_in_progress = json_payload["in_progress"]
+            self._entity_picture = json_payload["entity_picture"]
 
     @callback
     def _handle_latest_version_received(self, msg: ReceiveMessage) -> None:
@@ -231,14 +209,12 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
             CONF_STATE_TOPIC,
             self._handle_state_message_received,
             {
-                "_attr_entity_picture",
-                "_attr_in_progress",
                 "_attr_installed_version",
                 "_attr_latest_version",
                 "_attr_title",
                 "_attr_release_summary",
                 "_attr_release_url",
-                "_attr_update_percentage",
+                "_entity_picture",
             },
         )
         self.add_subscription(
@@ -261,7 +237,7 @@ class MqttUpdate(MqttEntity, UpdateEntity, RestoreEntity):
     @property
     def supported_features(self) -> UpdateEntityFeature:
         """Return the list of supported features."""
-        support = UpdateEntityFeature(UpdateEntityFeature.PROGRESS)
+        support = UpdateEntityFeature(0)
 
         if self._config.get(CONF_COMMAND_TOPIC) is not None:
             support |= UpdateEntityFeature.INSTALL
diff --git a/homeassistant/components/mullvad/__init__.py b/homeassistant/components/mullvad/__init__.py
index f2f6f39c96f..b79b9b4aa6a 100644
--- a/homeassistant/components/mullvad/__init__.py
+++ b/homeassistant/components/mullvad/__init__.py
@@ -27,7 +27,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         logging.getLogger(__name__),
-        config_entry=entry,
         name=DOMAIN,
         update_method=async_get_mullvad_api_data,
         update_interval=timedelta(minutes=1),
diff --git a/homeassistant/components/music_assistant/__init__.py b/homeassistant/components/music_assistant/__init__.py
deleted file mode 100644
index 9f0fc1aad27..00000000000
--- a/homeassistant/components/music_assistant/__init__.py
+++ /dev/null
@@ -1,164 +0,0 @@
-"""Music Assistant (music-assistant.io) integration."""
-
-from __future__ import annotations
-
-import asyncio
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from music_assistant_client import MusicAssistantClient
-from music_assistant_client.exceptions import CannotConnect, InvalidServerVersion
-from music_assistant_models.enums import EventType
-from music_assistant_models.errors import MusicAssistantError
-
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
-from homeassistant.const import CONF_URL, EVENT_HOMEASSISTANT_STOP, Platform
-from homeassistant.core import Event, HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.issue_registry import (
-    IssueSeverity,
-    async_create_issue,
-    async_delete_issue,
-)
-
-from .const import DOMAIN, LOGGER
-
-if TYPE_CHECKING:
-    from music_assistant_models.event import MassEvent
-
-type MusicAssistantConfigEntry = ConfigEntry[MusicAssistantEntryData]
-
-PLATFORMS = [Platform.MEDIA_PLAYER]
-
-CONNECT_TIMEOUT = 10
-LISTEN_READY_TIMEOUT = 30
-
-
-@dataclass
-class MusicAssistantEntryData:
-    """Hold Mass data for the config entry."""
-
-    mass: MusicAssistantClient
-    listen_task: asyncio.Task
-
-
-async def async_setup_entry(
-    hass: HomeAssistant, entry: MusicAssistantConfigEntry
-) -> bool:
-    """Set up from a config entry."""
-    http_session = async_get_clientsession(hass, verify_ssl=False)
-    mass_url = entry.data[CONF_URL]
-    mass = MusicAssistantClient(mass_url, http_session)
-
-    try:
-        async with asyncio.timeout(CONNECT_TIMEOUT):
-            await mass.connect()
-    except (TimeoutError, CannotConnect) as err:
-        raise ConfigEntryNotReady(
-            f"Failed to connect to music assistant server {mass_url}"
-        ) from err
-    except InvalidServerVersion as err:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "invalid_server_version",
-            is_fixable=False,
-            severity=IssueSeverity.ERROR,
-            translation_key="invalid_server_version",
-        )
-        raise ConfigEntryNotReady(f"Invalid server version: {err}") from err
-    except MusicAssistantError as err:
-        LOGGER.exception("Failed to connect to music assistant server", exc_info=err)
-        raise ConfigEntryNotReady(
-            f"Unknown error connecting to the Music Assistant server {mass_url}"
-        ) from err
-
-    async_delete_issue(hass, DOMAIN, "invalid_server_version")
-
-    async def on_hass_stop(event: Event) -> None:
-        """Handle incoming stop event from Home Assistant."""
-        await mass.disconnect()
-
-    entry.async_on_unload(
-        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)
-    )
-
-    # launch the music assistant client listen task in the background
-    # use the init_ready event to wait until initialization is done
-    init_ready = asyncio.Event()
-    listen_task = asyncio.create_task(_client_listen(hass, entry, mass, init_ready))
-
-    try:
-        async with asyncio.timeout(LISTEN_READY_TIMEOUT):
-            await init_ready.wait()
-    except TimeoutError as err:
-        listen_task.cancel()
-        raise ConfigEntryNotReady("Music Assistant client not ready") from err
-
-    entry.runtime_data = MusicAssistantEntryData(mass, listen_task)
-
-    # If the listen task is already failed, we need to raise ConfigEntryNotReady
-    if listen_task.done() and (listen_error := listen_task.exception()) is not None:
-        await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-        try:
-            await mass.disconnect()
-        finally:
-            raise ConfigEntryNotReady(listen_error) from listen_error
-
-    # initialize platforms
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    # register listener for removed players
-    async def handle_player_removed(event: MassEvent) -> None:
-        """Handle Mass Player Removed event."""
-        if event.object_id is None:
-            return
-        dev_reg = dr.async_get(hass)
-        if hass_device := dev_reg.async_get_device({(DOMAIN, event.object_id)}):
-            dev_reg.async_update_device(
-                hass_device.id, remove_config_entry_id=entry.entry_id
-            )
-
-    entry.async_on_unload(
-        mass.subscribe(handle_player_removed, EventType.PLAYER_REMOVED)
-    )
-
-    return True
-
-
-async def _client_listen(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    mass: MusicAssistantClient,
-    init_ready: asyncio.Event,
-) -> None:
-    """Listen with the client."""
-    try:
-        await mass.start_listening(init_ready)
-    except MusicAssistantError as err:
-        if entry.state != ConfigEntryState.LOADED:
-            raise
-        LOGGER.error("Failed to listen: %s", err)
-    except Exception as err:  # pylint: disable=broad-except
-        # We need to guard against unknown exceptions to not crash this task.
-        if entry.state != ConfigEntryState.LOADED:
-            raise
-        LOGGER.exception("Unexpected exception: %s", err)
-
-    if not hass.is_stopping:
-        LOGGER.debug("Disconnected from server. Reloading integration")
-        hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
-
-
-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:
-        mass_entry_data: MusicAssistantEntryData = entry.runtime_data
-        mass_entry_data.listen_task.cancel()
-        await mass_entry_data.mass.disconnect()
-
-    return unload_ok
diff --git a/homeassistant/components/music_assistant/config_flow.py b/homeassistant/components/music_assistant/config_flow.py
deleted file mode 100644
index fc50a2d654b..00000000000
--- a/homeassistant/components/music_assistant/config_flow.py
+++ /dev/null
@@ -1,137 +0,0 @@
-"""Config flow for MusicAssistant integration."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-from music_assistant_client import MusicAssistantClient
-from music_assistant_client.exceptions import (
-    CannotConnect,
-    InvalidServerVersion,
-    MusicAssistantClientException,
-)
-from music_assistant_models.api import ServerInfoMessage
-import voluptuous as vol
-
-from homeassistant.components import zeroconf
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_URL
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
-
-from .const import DOMAIN, LOGGER
-
-DEFAULT_URL = "http://mass.local:8095"
-DEFAULT_TITLE = "Music Assistant"
-
-
-def get_manual_schema(user_input: dict[str, Any]) -> vol.Schema:
-    """Return a schema for the manual step."""
-    default_url = user_input.get(CONF_URL, DEFAULT_URL)
-    return vol.Schema(
-        {
-            vol.Required(CONF_URL, default=default_url): str,
-        }
-    )
-
-
-async def get_server_info(hass: HomeAssistant, url: str) -> ServerInfoMessage:
-    """Validate the user input allows us to connect."""
-    async with MusicAssistantClient(
-        url, aiohttp_client.async_get_clientsession(hass)
-    ) as client:
-        if TYPE_CHECKING:
-            assert client.server_info is not None
-        return client.server_info
-
-
-class MusicAssistantConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for MusicAssistant."""
-
-    VERSION = 1
-
-    def __init__(self) -> None:
-        """Set up flow instance."""
-        self.server_info: ServerInfoMessage | None = None
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a manual configuration."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            try:
-                self.server_info = await get_server_info(
-                    self.hass, user_input[CONF_URL]
-                )
-                await self.async_set_unique_id(
-                    self.server_info.server_id, raise_on_progress=False
-                )
-                self._abort_if_unique_id_configured(
-                    updates={CONF_URL: self.server_info.base_url},
-                    reload_on_update=True,
-                )
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except InvalidServerVersion:
-                errors["base"] = "invalid_server_version"
-            except MusicAssistantClientException:
-                LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_create_entry(
-                    title=DEFAULT_TITLE,
-                    data={
-                        CONF_URL: self.server_info.base_url,
-                    },
-                )
-
-            return self.async_show_form(
-                step_id="user", data_schema=get_manual_schema(user_input), errors=errors
-            )
-
-        return self.async_show_form(step_id="user", data_schema=get_manual_schema({}))
-
-    async def async_step_zeroconf(
-        self, discovery_info: zeroconf.ZeroconfServiceInfo
-    ) -> ConfigFlowResult:
-        """Handle a discovered Mass server.
-
-        This flow is triggered by the Zeroconf component. It will check if the
-        host is already configured and delegate to the import step if not.
-        """
-        # abort if discovery info is not what we expect
-        if "server_id" not in discovery_info.properties:
-            return self.async_abort(reason="missing_server_id")
-        # abort if we already have exactly this server_id
-        # reload the integration if the host got updated
-        self.server_info = ServerInfoMessage.from_dict(discovery_info.properties)
-        await self.async_set_unique_id(self.server_info.server_id)
-        self._abort_if_unique_id_configured(
-            updates={CONF_URL: self.server_info.base_url},
-            reload_on_update=True,
-        )
-        try:
-            await get_server_info(self.hass, self.server_info.base_url)
-        except CannotConnect:
-            return self.async_abort(reason="cannot_connect")
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_discovery_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle user-confirmation of discovered server."""
-        if TYPE_CHECKING:
-            assert self.server_info is not None
-        if user_input is not None:
-            return self.async_create_entry(
-                title=DEFAULT_TITLE,
-                data={
-                    CONF_URL: self.server_info.base_url,
-                },
-            )
-        self._set_confirm_only()
-        return self.async_show_form(
-            step_id="discovery_confirm",
-            description_placeholders={"url": self.server_info.base_url},
-        )
diff --git a/homeassistant/components/music_assistant/const.py b/homeassistant/components/music_assistant/const.py
deleted file mode 100644
index 6512f58b96c..00000000000
--- a/homeassistant/components/music_assistant/const.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""Constants for Music Assistant Component."""
-
-import logging
-
-DOMAIN = "music_assistant"
-DOMAIN_EVENT = f"{DOMAIN}_event"
-
-DEFAULT_NAME = "Music Assistant"
-
-ATTR_IS_GROUP = "is_group"
-ATTR_GROUP_MEMBERS = "group_members"
-ATTR_GROUP_PARENTS = "group_parents"
-
-ATTR_MASS_PLAYER_TYPE = "mass_player_type"
-ATTR_ACTIVE_QUEUE = "active_queue"
-ATTR_STREAM_TITLE = "stream_title"
-
-LOGGER = logging.getLogger(__package__)
diff --git a/homeassistant/components/music_assistant/entity.py b/homeassistant/components/music_assistant/entity.py
deleted file mode 100644
index f5b6d92b0cf..00000000000
--- a/homeassistant/components/music_assistant/entity.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""Base entity model."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from music_assistant_models.enums import EventType
-from music_assistant_models.event import MassEvent
-from music_assistant_models.player import Player
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import Entity
-
-from .const import DOMAIN
-
-if TYPE_CHECKING:
-    from music_assistant_client import MusicAssistantClient
-
-
-class MusicAssistantEntity(Entity):
-    """Base Entity from Music Assistant Player."""
-
-    _attr_has_entity_name = True
-    _attr_should_poll = False
-
-    def __init__(self, mass: MusicAssistantClient, player_id: str) -> None:
-        """Initialize MediaPlayer entity."""
-        self.mass = mass
-        self.player_id = player_id
-        provider = self.mass.get_provider(self.player.provider)
-        if TYPE_CHECKING:
-            assert provider is not None
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, player_id)},
-            manufacturer=self.player.device_info.manufacturer or provider.name,
-            model=self.player.device_info.model or self.player.name,
-            name=self.player.display_name,
-            configuration_url=f"{mass.server_url}/#/settings/editplayer/{player_id}",
-        )
-
-    async def async_added_to_hass(self) -> None:
-        """Register callbacks."""
-        await self.async_on_update()
-        self.async_on_remove(
-            self.mass.subscribe(
-                self.__on_mass_update, EventType.PLAYER_UPDATED, self.player_id
-            )
-        )
-        self.async_on_remove(
-            self.mass.subscribe(
-                self.__on_mass_update,
-                EventType.QUEUE_UPDATED,
-            )
-        )
-
-    @property
-    def player(self) -> Player:
-        """Return the Mass Player attached to this HA entity."""
-        return self.mass.players[self.player_id]
-
-    @property
-    def unique_id(self) -> str | None:
-        """Return unique id for entity."""
-        _base = self.player_id
-        if hasattr(self, "entity_description"):
-            return f"{_base}_{self.entity_description.key}"
-        return _base
-
-    @property
-    def available(self) -> bool:
-        """Return availability of entity."""
-        return self.player.available and bool(self.mass.connection.connected)
-
-    async def __on_mass_update(self, event: MassEvent) -> None:
-        """Call when we receive an event from MusicAssistant."""
-        if event.event == EventType.QUEUE_UPDATED and event.object_id not in (
-            self.player.active_source,
-            self.player.active_group,
-            self.player.player_id,
-        ):
-            return
-        await self.async_on_update()
-        self.async_write_ha_state()
-
-    async def async_on_update(self) -> None:
-        """Handle player updates."""
diff --git a/homeassistant/components/music_assistant/manifest.json b/homeassistant/components/music_assistant/manifest.json
deleted file mode 100644
index 65e6652407f..00000000000
--- a/homeassistant/components/music_assistant/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "domain": "music_assistant",
-  "name": "Music Assistant",
-  "after_dependencies": ["media_source", "media_player"],
-  "codeowners": ["@music-assistant"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/music_assistant",
-  "iot_class": "local_push",
-  "loggers": ["music_assistant"],
-  "requirements": ["music-assistant-client==1.0.5"],
-  "zeroconf": ["_mass._tcp.local."]
-}
diff --git a/homeassistant/components/music_assistant/media_player.py b/homeassistant/components/music_assistant/media_player.py
deleted file mode 100644
index f0f3675ee32..00000000000
--- a/homeassistant/components/music_assistant/media_player.py
+++ /dev/null
@@ -1,557 +0,0 @@
-"""MediaPlayer platform for Music Assistant integration."""
-
-from __future__ import annotations
-
-import asyncio
-from collections.abc import Awaitable, Callable, Coroutine, Mapping
-from contextlib import suppress
-import functools
-import os
-from typing import TYPE_CHECKING, Any
-
-from music_assistant_models.enums import (
-    EventType,
-    MediaType,
-    PlayerFeature,
-    QueueOption,
-    RepeatMode as MassRepeatMode,
-)
-from music_assistant_models.errors import MediaNotFoundError, MusicAssistantError
-from music_assistant_models.event import MassEvent
-from music_assistant_models.media_items import ItemMapping, MediaItemType, Track
-
-from homeassistant.components import media_source
-from homeassistant.components.media_player import (
-    ATTR_MEDIA_EXTRA,
-    BrowseMedia,
-    MediaPlayerDeviceClass,
-    MediaPlayerEnqueue,
-    MediaPlayerEntity,
-    MediaPlayerEntityFeature,
-    MediaPlayerState,
-    MediaType as HAMediaType,
-    RepeatMode,
-    async_process_play_media_url,
-)
-from homeassistant.const import STATE_OFF
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.dt import utc_from_timestamp
-
-from . import MusicAssistantConfigEntry
-from .const import ATTR_ACTIVE_QUEUE, ATTR_MASS_PLAYER_TYPE, DOMAIN
-from .entity import MusicAssistantEntity
-
-if TYPE_CHECKING:
-    from music_assistant_client import MusicAssistantClient
-    from music_assistant_models.player import Player
-    from music_assistant_models.player_queue import PlayerQueue
-
-SUPPORTED_FEATURES = (
-    MediaPlayerEntityFeature.PAUSE
-    | MediaPlayerEntityFeature.VOLUME_SET
-    | MediaPlayerEntityFeature.STOP
-    | MediaPlayerEntityFeature.PREVIOUS_TRACK
-    | MediaPlayerEntityFeature.NEXT_TRACK
-    | MediaPlayerEntityFeature.SHUFFLE_SET
-    | MediaPlayerEntityFeature.REPEAT_SET
-    | MediaPlayerEntityFeature.TURN_ON
-    | MediaPlayerEntityFeature.TURN_OFF
-    | MediaPlayerEntityFeature.PLAY
-    | MediaPlayerEntityFeature.PLAY_MEDIA
-    | MediaPlayerEntityFeature.VOLUME_STEP
-    | MediaPlayerEntityFeature.CLEAR_PLAYLIST
-    | MediaPlayerEntityFeature.BROWSE_MEDIA
-    | MediaPlayerEntityFeature.MEDIA_ENQUEUE
-    | MediaPlayerEntityFeature.MEDIA_ANNOUNCE
-    | MediaPlayerEntityFeature.SEEK
-)
-
-QUEUE_OPTION_MAP = {
-    # map from HA enqueue options to MA enqueue options
-    # which are the same but just in case
-    MediaPlayerEnqueue.ADD: QueueOption.ADD,
-    MediaPlayerEnqueue.NEXT: QueueOption.NEXT,
-    MediaPlayerEnqueue.PLAY: QueueOption.PLAY,
-    MediaPlayerEnqueue.REPLACE: QueueOption.REPLACE,
-}
-
-ATTR_RADIO_MODE = "radio_mode"
-ATTR_MEDIA_ID = "media_id"
-ATTR_MEDIA_TYPE = "media_type"
-ATTR_ARTIST = "artist"
-ATTR_ALBUM = "album"
-ATTR_URL = "url"
-ATTR_USE_PRE_ANNOUNCE = "use_pre_announce"
-ATTR_ANNOUNCE_VOLUME = "announce_volume"
-ATTR_SOURCE_PLAYER = "source_player"
-ATTR_AUTO_PLAY = "auto_play"
-
-
-def catch_musicassistant_error[_R, **P](
-    func: Callable[..., Awaitable[_R]],
-) -> Callable[..., Coroutine[Any, Any, _R | None]]:
-    """Check and log commands to players."""
-
-    @functools.wraps(func)
-    async def wrapper(
-        self: MusicAssistantPlayer, *args: P.args, **kwargs: P.kwargs
-    ) -> _R | None:
-        """Catch Music Assistant errors and convert to Home Assistant error."""
-        try:
-            return await func(self, *args, **kwargs)
-        except MusicAssistantError as err:
-            error_msg = str(err) or err.__class__.__name__
-            raise HomeAssistantError(error_msg) from err
-
-    return wrapper
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: MusicAssistantConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Music Assistant MediaPlayer(s) from Config Entry."""
-    mass = entry.runtime_data.mass
-    added_ids = set()
-
-    async def handle_player_added(event: MassEvent) -> None:
-        """Handle Mass Player Added event."""
-        if TYPE_CHECKING:
-            assert event.object_id is not None
-        if event.object_id in added_ids:
-            return
-        added_ids.add(event.object_id)
-        async_add_entities([MusicAssistantPlayer(mass, event.object_id)])
-
-    # register listener for new players
-    entry.async_on_unload(mass.subscribe(handle_player_added, EventType.PLAYER_ADDED))
-    mass_players = []
-    # add all current players
-    for player in mass.players:
-        added_ids.add(player.player_id)
-        mass_players.append(MusicAssistantPlayer(mass, player.player_id))
-
-    async_add_entities(mass_players)
-
-
-class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
-    """Representation of MediaPlayerEntity from Music Assistant Player."""
-
-    _attr_name = None
-    _attr_media_image_remotely_accessible = True
-    _attr_media_content_type = HAMediaType.MUSIC
-
-    def __init__(self, mass: MusicAssistantClient, player_id: str) -> None:
-        """Initialize MediaPlayer entity."""
-        super().__init__(mass, player_id)
-        self._attr_icon = self.player.icon.replace("mdi-", "mdi:")
-        self._attr_supported_features = SUPPORTED_FEATURES
-        if PlayerFeature.SYNC in self.player.supported_features:
-            self._attr_supported_features |= MediaPlayerEntityFeature.GROUPING
-        self._attr_device_class = MediaPlayerDeviceClass.SPEAKER
-        self._prev_time: float = 0
-
-    async def async_added_to_hass(self) -> None:
-        """Register callbacks."""
-        await super().async_added_to_hass()
-
-        # we subscribe to player queue time update but we only
-        # accept a state change on big time jumps (e.g. seeking)
-        async def queue_time_updated(event: MassEvent) -> None:
-            if event.object_id != self.player.active_source:
-                return
-            if abs((self._prev_time or 0) - event.data) > 5:
-                await self.async_on_update()
-                self.async_write_ha_state()
-            self._prev_time = event.data
-
-        self.async_on_remove(
-            self.mass.subscribe(
-                queue_time_updated,
-                EventType.QUEUE_TIME_UPDATED,
-            )
-        )
-
-    @property
-    def active_queue(self) -> PlayerQueue | None:
-        """Return the active queue for this player (if any)."""
-        if not self.player.active_source:
-            return None
-        return self.mass.player_queues.get(self.player.active_source)
-
-    @property
-    def extra_state_attributes(self) -> Mapping[str, Any]:
-        """Return additional state attributes."""
-        return {
-            ATTR_MASS_PLAYER_TYPE: self.player.type.value,
-            ATTR_ACTIVE_QUEUE: (
-                self.active_queue.queue_id if self.active_queue else None
-            ),
-        }
-
-    async def async_on_update(self) -> None:
-        """Handle player updates."""
-        if not self.available:
-            return
-        player = self.player
-        active_queue = self.active_queue
-        # update generic attributes
-        if player.powered and active_queue is not None:
-            self._attr_state = MediaPlayerState(active_queue.state.value)
-        if player.powered and player.state is not None:
-            self._attr_state = MediaPlayerState(player.state.value)
-        else:
-            self._attr_state = MediaPlayerState(STATE_OFF)
-        group_members_entity_ids: list[str] = []
-        if player.group_childs:
-            # translate MA group_childs to HA group_members as entity id's
-            entity_registry = er.async_get(self.hass)
-            group_members_entity_ids = [
-                entity_id
-                for child_id in player.group_childs
-                if (
-                    entity_id := entity_registry.async_get_entity_id(
-                        self.platform.domain, DOMAIN, child_id
-                    )
-                )
-            ]
-        self._attr_group_members = group_members_entity_ids
-        self._attr_volume_level = (
-            player.volume_level / 100 if player.volume_level is not None else None
-        )
-        self._attr_is_volume_muted = player.volume_muted
-        self._update_media_attributes(player, active_queue)
-        self._update_media_image_url(player, active_queue)
-
-    @catch_musicassistant_error
-    async def async_media_play(self) -> None:
-        """Send play command to device."""
-        await self.mass.players.player_command_play(self.player_id)
-
-    @catch_musicassistant_error
-    async def async_media_pause(self) -> None:
-        """Send pause command to device."""
-        await self.mass.players.player_command_pause(self.player_id)
-
-    @catch_musicassistant_error
-    async def async_media_stop(self) -> None:
-        """Send stop command to device."""
-        await self.mass.players.player_command_stop(self.player_id)
-
-    @catch_musicassistant_error
-    async def async_media_next_track(self) -> None:
-        """Send next track command to device."""
-        await self.mass.players.player_command_next_track(self.player_id)
-
-    @catch_musicassistant_error
-    async def async_media_previous_track(self) -> None:
-        """Send previous track command to device."""
-        await self.mass.players.player_command_previous_track(self.player_id)
-
-    @catch_musicassistant_error
-    async def async_media_seek(self, position: float) -> None:
-        """Send seek command."""
-        position = int(position)
-        await self.mass.players.player_command_seek(self.player_id, position)
-
-    @catch_musicassistant_error
-    async def async_mute_volume(self, mute: bool) -> None:
-        """Mute the volume."""
-        await self.mass.players.player_command_volume_mute(self.player_id, mute)
-
-    @catch_musicassistant_error
-    async def async_set_volume_level(self, volume: float) -> None:
-        """Send new volume_level to device."""
-        volume = int(volume * 100)
-        await self.mass.players.player_command_volume_set(self.player_id, volume)
-
-    @catch_musicassistant_error
-    async def async_volume_up(self) -> None:
-        """Send new volume_level to device."""
-        await self.mass.players.player_command_volume_up(self.player_id)
-
-    @catch_musicassistant_error
-    async def async_volume_down(self) -> None:
-        """Send new volume_level to device."""
-        await self.mass.players.player_command_volume_down(self.player_id)
-
-    @catch_musicassistant_error
-    async def async_turn_on(self) -> None:
-        """Turn on device."""
-        await self.mass.players.player_command_power(self.player_id, True)
-
-    @catch_musicassistant_error
-    async def async_turn_off(self) -> None:
-        """Turn off device."""
-        await self.mass.players.player_command_power(self.player_id, False)
-
-    @catch_musicassistant_error
-    async def async_set_shuffle(self, shuffle: bool) -> None:
-        """Set shuffle state."""
-        if not self.active_queue:
-            return
-        await self.mass.player_queues.queue_command_shuffle(
-            self.active_queue.queue_id, shuffle
-        )
-
-    @catch_musicassistant_error
-    async def async_set_repeat(self, repeat: RepeatMode) -> None:
-        """Set repeat state."""
-        if not self.active_queue:
-            return
-        await self.mass.player_queues.queue_command_repeat(
-            self.active_queue.queue_id, MassRepeatMode(repeat)
-        )
-
-    @catch_musicassistant_error
-    async def async_clear_playlist(self) -> None:
-        """Clear players playlist."""
-        if TYPE_CHECKING:
-            assert self.player.active_source is not None
-        if queue := self.mass.player_queues.get(self.player.active_source):
-            await self.mass.player_queues.queue_command_clear(queue.queue_id)
-
-    @catch_musicassistant_error
-    async def async_play_media(
-        self,
-        media_type: MediaType | str,
-        media_id: str,
-        enqueue: MediaPlayerEnqueue | None = None,
-        announce: bool | None = None,
-        **kwargs: Any,
-    ) -> None:
-        """Send the play_media command to the media player."""
-        if media_source.is_media_source_id(media_id):
-            # Handle media_source
-            sourced_media = await media_source.async_resolve_media(
-                self.hass, media_id, self.entity_id
-            )
-            media_id = sourced_media.url
-            media_id = async_process_play_media_url(self.hass, media_id)
-
-        if announce:
-            await self._async_handle_play_announcement(
-                media_id,
-                use_pre_announce=kwargs[ATTR_MEDIA_EXTRA].get("use_pre_announce"),
-                announce_volume=kwargs[ATTR_MEDIA_EXTRA].get("announce_volume"),
-            )
-            return
-
-        # forward to our advanced play_media handler
-        await self._async_handle_play_media(
-            media_id=[media_id],
-            enqueue=enqueue,
-            media_type=media_type,
-            radio_mode=kwargs[ATTR_MEDIA_EXTRA].get(ATTR_RADIO_MODE),
-        )
-
-    @catch_musicassistant_error
-    async def async_join_players(self, group_members: list[str]) -> None:
-        """Join `group_members` as a player group with the current player."""
-        player_ids: list[str] = []
-        for child_entity_id in group_members:
-            # resolve HA entity_id to MA player_id
-            if (hass_state := self.hass.states.get(child_entity_id)) is None:
-                continue
-            if (mass_player_id := hass_state.attributes.get("mass_player_id")) is None:
-                continue
-            player_ids.append(mass_player_id)
-        await self.mass.players.player_command_sync_many(self.player_id, player_ids)
-
-    @catch_musicassistant_error
-    async def async_unjoin_player(self) -> None:
-        """Remove this player from any group."""
-        await self.mass.players.player_command_unsync(self.player_id)
-
-    @catch_musicassistant_error
-    async def _async_handle_play_media(
-        self,
-        media_id: list[str],
-        enqueue: MediaPlayerEnqueue | QueueOption | None = None,
-        radio_mode: bool | None = None,
-        media_type: str | None = None,
-    ) -> None:
-        """Send the play_media command to the media player."""
-        media_uris: list[str] = []
-        item: MediaItemType | ItemMapping | None = None
-        # work out (all) uri(s) to play
-        for media_id_str in media_id:
-            # URL or URI string
-            if "://" in media_id_str:
-                media_uris.append(media_id_str)
-                continue
-            # try content id as library id
-            if media_type and media_id_str.isnumeric():
-                with suppress(MediaNotFoundError):
-                    item = await self.mass.music.get_item(
-                        MediaType(media_type), media_id_str, "library"
-                    )
-                    if isinstance(item, MediaItemType | ItemMapping) and item.uri:
-                        media_uris.append(item.uri)
-                    continue
-            # try local accessible filename
-            elif await asyncio.to_thread(os.path.isfile, media_id_str):
-                media_uris.append(media_id_str)
-                continue
-
-        if not media_uris:
-            raise HomeAssistantError(
-                f"Could not resolve {media_id} to playable media item"
-            )
-
-        # determine active queue to send the play request to
-        if TYPE_CHECKING:
-            assert self.player.active_source is not None
-        if queue := self.mass.player_queues.get(self.player.active_source):
-            queue_id = queue.queue_id
-        else:
-            queue_id = self.player_id
-
-        await self.mass.player_queues.play_media(
-            queue_id,
-            media=media_uris,
-            option=self._convert_queueoption_to_media_player_enqueue(enqueue),
-            radio_mode=radio_mode if radio_mode else False,
-        )
-
-    @catch_musicassistant_error
-    async def _async_handle_play_announcement(
-        self,
-        url: str,
-        use_pre_announce: bool | None = None,
-        announce_volume: int | None = None,
-    ) -> None:
-        """Send the play_announcement command to the media player."""
-        await self.mass.players.play_announcement(
-            self.player_id, url, use_pre_announce, announce_volume
-        )
-
-    async def async_browse_media(
-        self,
-        media_content_type: MediaType | str | None = None,
-        media_content_id: str | None = None,
-    ) -> BrowseMedia:
-        """Implement the websocket media browsing helper."""
-        return await media_source.async_browse_media(
-            self.hass,
-            media_content_id,
-            content_filter=lambda item: item.media_content_type.startswith("audio/"),
-        )
-
-    def _update_media_image_url(
-        self, player: Player, queue: PlayerQueue | None
-    ) -> None:
-        """Update image URL for the active queue item."""
-        if queue is None or queue.current_item is None:
-            self._attr_media_image_url = None
-            return
-        if image_url := self.mass.get_media_item_image_url(queue.current_item):
-            self._attr_media_image_remotely_accessible = (
-                self.mass.server_url not in image_url
-            )
-            self._attr_media_image_url = image_url
-            return
-        self._attr_media_image_url = None
-
-    def _update_media_attributes(
-        self, player: Player, queue: PlayerQueue | None
-    ) -> None:
-        """Update media attributes for the active queue item."""
-        # pylint: disable=too-many-statements
-        self._attr_media_artist = None
-        self._attr_media_album_artist = None
-        self._attr_media_album_name = None
-        self._attr_media_title = None
-        self._attr_media_content_id = None
-        self._attr_media_duration = None
-        self._attr_media_position = None
-        self._attr_media_position_updated_at = None
-
-        if queue is None and player.current_media:
-            # player has some external source active
-            self._attr_media_content_id = player.current_media.uri
-            self._attr_app_id = player.active_source
-            self._attr_media_title = player.current_media.title
-            self._attr_media_artist = player.current_media.artist
-            self._attr_media_album_name = player.current_media.album
-            self._attr_media_duration = player.current_media.duration
-            # shuffle and repeat are not (yet) supported for external sources
-            self._attr_shuffle = None
-            self._attr_repeat = None
-            if TYPE_CHECKING:
-                assert player.elapsed_time is not None
-            self._attr_media_position = int(player.elapsed_time)
-            self._attr_media_position_updated_at = (
-                utc_from_timestamp(player.elapsed_time_last_updated)
-                if player.elapsed_time_last_updated
-                else None
-            )
-            if TYPE_CHECKING:
-                assert player.elapsed_time is not None
-            self._prev_time = player.elapsed_time
-            return
-
-        if queue is None:
-            # player has no MA queue active
-            self._attr_source = player.active_source
-            self._attr_app_id = player.active_source
-            return
-
-        # player has an MA queue active (either its own queue or some group queue)
-        self._attr_app_id = DOMAIN
-        self._attr_shuffle = queue.shuffle_enabled
-        self._attr_repeat = queue.repeat_mode.value
-        if not (cur_item := queue.current_item):
-            # queue is empty
-            return
-
-        self._attr_media_content_id = queue.current_item.uri
-        self._attr_media_duration = queue.current_item.duration
-        self._attr_media_position = int(queue.elapsed_time)
-        self._attr_media_position_updated_at = utc_from_timestamp(
-            queue.elapsed_time_last_updated
-        )
-        self._prev_time = queue.elapsed_time
-
-        # handle stream title (radio station icy metadata)
-        if (stream_details := cur_item.streamdetails) and stream_details.stream_title:
-            self._attr_media_album_name = cur_item.name
-            if " - " in stream_details.stream_title:
-                stream_title_parts = stream_details.stream_title.split(" - ", 1)
-                self._attr_media_title = stream_title_parts[1]
-                self._attr_media_artist = stream_title_parts[0]
-            else:
-                self._attr_media_title = stream_details.stream_title
-            return
-
-        if not (media_item := cur_item.media_item):
-            # queue is not playing a regular media item (edge case?!)
-            self._attr_media_title = cur_item.name
-            return
-
-        # queue is playing regular media item
-        self._attr_media_title = media_item.name
-        # for tracks we can extract more info
-        if media_item.media_type == MediaType.TRACK:
-            if TYPE_CHECKING:
-                assert isinstance(media_item, Track)
-            self._attr_media_artist = media_item.artist_str
-            if media_item.version:
-                self._attr_media_title += f" ({media_item.version})"
-            if media_item.album:
-                self._attr_media_album_name = media_item.album.name
-                self._attr_media_album_artist = getattr(
-                    media_item.album, "artist_str", None
-                )
-
-    def _convert_queueoption_to_media_player_enqueue(
-        self, queue_option: MediaPlayerEnqueue | QueueOption | None
-    ) -> QueueOption | None:
-        """Convert a QueueOption to a MediaPlayerEnqueue."""
-        if isinstance(queue_option, MediaPlayerEnqueue):
-            queue_option = QUEUE_OPTION_MAP.get(queue_option)
-        return queue_option
diff --git a/homeassistant/components/music_assistant/strings.json b/homeassistant/components/music_assistant/strings.json
deleted file mode 100644
index f15b0b1b306..00000000000
--- a/homeassistant/components/music_assistant/strings.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "config": {
-    "step": {
-      "init": {
-        "data": {
-          "url": "URL of the Music Assistant server"
-        }
-      },
-      "manual": {
-        "title": "Manually add Music Assistant Server",
-        "description": "Enter the URL to your already running Music Assistant Server. If you do not have the Music Assistant Server running, you should install it first.",
-        "data": {
-          "url": "URL of the Music Assistant server"
-        }
-      },
-      "discovery_confirm": {
-        "description": "Do you want to add the Music Assistant Server `{url}` to Home Assistant?",
-        "title": "Discovered Music Assistant Server"
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_server_version": "The Music Assistant server is not the correct version",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Configuration flow is already in progress",
-      "reconfiguration_successful": "Successfully reconfigured the Music Assistant integration.",
-      "cannot_connect": "Failed to connect",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
-    }
-  },
-  "issues": {
-    "invalid_server_version": {
-      "title": "The Music Assistant server is not the correct version",
-      "description": "Check if there are updates available for the Music Assistant Server and/or integration."
-    }
-  },
-  "selector": {
-    "enqueue": {
-      "options": {
-        "play": "Play",
-        "next": "Play next",
-        "add": "Add to queue",
-        "replace": "Play now and clear queue",
-        "replace_next": "Play next and clear queue"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/mutesync/__init__.py b/homeassistant/components/mutesync/__init__.py
index d5d2e3414d5..75eefaf6784 100644
--- a/homeassistant/components/mutesync/__init__.py
+++ b/homeassistant/components/mutesync/__init__.py
@@ -45,7 +45,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         update_coordinator.DataUpdateCoordinator(
             hass,
             logging.getLogger(__name__),
-            config_entry=entry,
             name=DOMAIN,
             update_interval=UPDATE_INTERVAL_NOT_IN_MEETING,
             update_method=update_data,
diff --git a/homeassistant/components/myuplink/binary_sensor.py b/homeassistant/components/myuplink/binary_sensor.py
index 953859986d0..1478ed9c8b0 100644
--- a/homeassistant/components/myuplink/binary_sensor.py
+++ b/homeassistant/components/myuplink/binary_sensor.py
@@ -12,17 +12,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
 from .entity import MyUplinkEntity, MyUplinkSystemEntity
-from .helpers import find_matching_platform, transform_model_series
+from .helpers import find_matching_platform
 
 CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, BinarySensorEntityDescription]] = {
-    F_SERIES: {
-        "43161": BinarySensorEntityDescription(
-            key="elect_add",
-            translation_key="elect_add",
-        ),
-    },
     "NIBEF": {
         "43161": BinarySensorEntityDescription(
             key="elect_add",
@@ -51,7 +44,6 @@ def get_description(device_point: DevicePoint) -> BinarySensorEntityDescription
     2. Default to None
     """
     prefix, _, _ = device_point.category.partition(" ")
-    prefix = transform_model_series(prefix)
     return CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(device_point.parameter_id)
 
 
diff --git a/homeassistant/components/myuplink/const.py b/homeassistant/components/myuplink/const.py
index 6fd354a21ec..3541a8078c3 100644
--- a/homeassistant/components/myuplink/const.py
+++ b/homeassistant/components/myuplink/const.py
@@ -6,5 +6,3 @@ API_ENDPOINT = "https://api.myuplink.com"
 OAUTH2_AUTHORIZE = "https://api.myuplink.com/oauth/authorize"
 OAUTH2_TOKEN = "https://api.myuplink.com/oauth/token"
 OAUTH2_SCOPES = ["WRITESYSTEM", "READSYSTEM", "offline_access"]
-
-F_SERIES = "f-series"
diff --git a/homeassistant/components/myuplink/helpers.py b/homeassistant/components/myuplink/helpers.py
index de5486d8dea..ac3d2a2d7fa 100644
--- a/homeassistant/components/myuplink/helpers.py
+++ b/homeassistant/components/myuplink/helpers.py
@@ -6,8 +6,6 @@ from homeassistant.components.number import NumberEntityDescription
 from homeassistant.components.sensor import SensorEntityDescription
 from homeassistant.const import Platform
 
-from .const import F_SERIES
-
 
 def find_matching_platform(
     device_point: DevicePoint,
@@ -38,93 +36,17 @@ def find_matching_platform(
     return Platform.SENSOR
 
 
-WEEKDAYS = (
-    "monday",
-    "tuesday",
-    "wednesday",
-    "thursday",
-    "friday",
-    "saturday",
-    "sunday",
-)
-
-PARAMETER_ID_TO_EXCLUDE_F730 = (
-    "40940",
-    "47007",
-    "47015",
-    "47020",
-    "47021",
-    "47022",
-    "47023",
-    "47024",
-    "47025",
-    "47026",
-    "47027",
-    "47028",
-    "47032",
-    "47050",
-    "47051",
-    "47206",
-    "47209",
-    "47271",
-    "47272",
-    "47273",
-    "47274",
-    "47375",
-    "47376",
-    "47538",
-    "47539",
-    "47635",
-    "47669",
-    "47703",
-    "47737",
-    "47771",
-    "47772",
-    "47805",
-    "47806",
-    "47839",
-    "47840",
-    "47907",
-    "47941",
-    "47975",
-    "48009",
-    "48072",
-    "48442",
-    "49909",
-    "50113",
-)
-
-PARAMETER_ID_TO_INCLUDE_SMO20 = (
-    "40940",
-    "47011",
-    "47015",
-    "47028",
-    "47032",
-    "50004",
-)
-
-
 def skip_entity(model: str, device_point: DevicePoint) -> bool:
     """Check if entity should be skipped for this device model."""
     if model == "SMO 20":
-        if (
-            len(device_point.smart_home_categories) > 0
-            or device_point.parameter_id in PARAMETER_ID_TO_INCLUDE_SMO20
+        if len(device_point.smart_home_categories) > 0 or device_point.parameter_id in (
+            "40940",
+            "47011",
+            "47015",
+            "47028",
+            "47032",
+            "50004",
         ):
             return False
         return True
-    if model.lower().startswith("f"):
-        # Entity names containing weekdays are used for advanced scheduling in the
-        # heat pump and should not be exposed in the integration
-        if any(d in device_point.parameter_name.lower() for d in WEEKDAYS):
-            return True
-        if device_point.parameter_id in PARAMETER_ID_TO_EXCLUDE_F730:
-            return True
     return False
-
-
-def transform_model_series(prefix: str) -> str:
-    """Remap all F-series models."""
-    if prefix.lower().startswith("f"):
-        return F_SERIES
-    return prefix
diff --git a/homeassistant/components/myuplink/number.py b/homeassistant/components/myuplink/number.py
index b05ab5d46c9..7c63a8ec8a2 100644
--- a/homeassistant/components/myuplink/number.py
+++ b/homeassistant/components/myuplink/number.py
@@ -10,9 +10,8 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
 from .entity import MyUplinkEntity
-from .helpers import find_matching_platform, skip_entity, transform_model_series
+from .helpers import find_matching_platform, skip_entity
 
 DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, NumberEntityDescription] = {
     "DM": NumberEntityDescription(
@@ -23,13 +22,6 @@ DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, NumberEntityDescription] = {
 }
 
 CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, NumberEntityDescription]] = {
-    F_SERIES: {
-        "40940": NumberEntityDescription(
-            key="degree_minutes",
-            translation_key="degree_minutes",
-            native_unit_of_measurement="DM",
-        ),
-    },
     "NIBEF": {
         "40940": NumberEntityDescription(
             key="degree_minutes",
@@ -49,7 +41,6 @@ def get_description(device_point: DevicePoint) -> NumberEntityDescription | None
     3. Default to None
     """
     prefix, _, _ = device_point.category.partition(" ")
-    prefix = transform_model_series(prefix)
     description = CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(
         device_point.parameter_id
     )
diff --git a/homeassistant/components/myuplink/sensor.py b/homeassistant/components/myuplink/sensor.py
index ef827fc1fb1..e7c8054e304 100644
--- a/homeassistant/components/myuplink/sensor.py
+++ b/homeassistant/components/myuplink/sensor.py
@@ -25,9 +25,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
 from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
 from .entity import MyUplinkEntity
-from .helpers import find_matching_platform, skip_entity, transform_model_series
+from .helpers import find_matching_platform, skip_entity
 
 DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
     "°C": SensorEntityDescription(
@@ -140,32 +139,6 @@ DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
 MARKER_FOR_UNKNOWN_VALUE = -32768
 
 CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, SensorEntityDescription]] = {
-    F_SERIES: {
-        "43108": SensorEntityDescription(
-            key="fan_mode",
-            translation_key="fan_mode",
-        ),
-        "43427": SensorEntityDescription(
-            key="status_compressor",
-            translation_key="status_compressor",
-            device_class=SensorDeviceClass.ENUM,
-        ),
-        "49993": SensorEntityDescription(
-            key="elect_add",
-            translation_key="elect_add",
-            device_class=SensorDeviceClass.ENUM,
-        ),
-        "49994": SensorEntityDescription(
-            key="priority",
-            translation_key="priority",
-            device_class=SensorDeviceClass.ENUM,
-        ),
-        "50095": SensorEntityDescription(
-            key="status",
-            translation_key="status",
-            device_class=SensorDeviceClass.ENUM,
-        ),
-    },
     "NIBEF": {
         "43108": SensorEntityDescription(
             key="fan_mode",
@@ -201,7 +174,6 @@ def get_description(device_point: DevicePoint) -> SensorEntityDescription | None
     """
     description = None
     prefix, _, _ = device_point.category.partition(" ")
-    prefix = transform_model_series(prefix)
     description = CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(
         device_point.parameter_id
     )
diff --git a/homeassistant/components/myuplink/strings.json b/homeassistant/components/myuplink/strings.json
index 9ec5c355d78..3351901b50b 100644
--- a/homeassistant/components/myuplink/strings.json
+++ b/homeassistant/components/myuplink/strings.json
@@ -34,11 +34,6 @@
       "alarm": {
         "name": "Alarm"
       }
-    },
-    "sensor": {
-      "status": {
-        "name": "Status"
-      }
     }
   }
 }
diff --git a/homeassistant/components/myuplink/switch.py b/homeassistant/components/myuplink/switch.py
index 75ba6bd7819..1589701fcbc 100644
--- a/homeassistant/components/myuplink/switch.py
+++ b/homeassistant/components/myuplink/switch.py
@@ -12,21 +12,10 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
 from .entity import MyUplinkEntity
-from .helpers import find_matching_platform, skip_entity, transform_model_series
+from .helpers import find_matching_platform, skip_entity
 
 CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, SwitchEntityDescription]] = {
-    F_SERIES: {
-        "50004": SwitchEntityDescription(
-            key="temporary_lux",
-            translation_key="temporary_lux",
-        ),
-        "50005": SwitchEntityDescription(
-            key="boost_ventilation",
-            translation_key="boost_ventilation",
-        ),
-    },
     "NIBEF": {
         "50004": SwitchEntityDescription(
             key="temporary_lux",
@@ -48,7 +37,6 @@ def get_description(device_point: DevicePoint) -> SwitchEntityDescription | None
     2. Default to None
     """
     prefix, _, _ = device_point.category.partition(" ")
-    prefix = transform_model_series(prefix)
     return CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(device_point.parameter_id)
 
 
diff --git a/homeassistant/components/nasweb/__init__.py b/homeassistant/components/nasweb/__init__.py
deleted file mode 100644
index 1992cc41c75..00000000000
--- a/homeassistant/components/nasweb/__init__.py
+++ /dev/null
@@ -1,125 +0,0 @@
-"""The NASweb integration."""
-
-from __future__ import annotations
-
-import logging
-
-from webio_api import WebioAPI
-from webio_api.api_client import AuthError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.network import NoURLAvailableError
-from homeassistant.util.hass_dict import HassKey
-
-from .const import DOMAIN, MANUFACTURER, SUPPORT_EMAIL
-from .coordinator import NASwebCoordinator
-from .nasweb_data import NASwebData
-
-PLATFORMS: list[Platform] = [Platform.SWITCH]
-
-NASWEB_CONFIG_URL = "https://{host}/page"
-
-_LOGGER = logging.getLogger(__name__)
-type NASwebConfigEntry = ConfigEntry[NASwebCoordinator]
-DATA_NASWEB: HassKey[NASwebData] = HassKey(DOMAIN)
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: NASwebConfigEntry) -> bool:
-    """Set up NASweb from a config entry."""
-
-    if DATA_NASWEB not in hass.data:
-        data = NASwebData()
-        data.initialize(hass)
-        hass.data[DATA_NASWEB] = data
-    nasweb_data = hass.data[DATA_NASWEB]
-
-    webio_api = WebioAPI(
-        entry.data[CONF_HOST], entry.data[CONF_USERNAME], entry.data[CONF_PASSWORD]
-    )
-    try:
-        if not await webio_api.check_connection():
-            raise ConfigEntryNotReady(
-                f"[{entry.data[CONF_HOST]}] Check connection failed"
-            )
-        if not await webio_api.refresh_device_info():
-            _LOGGER.error("[%s] Refresh device info failed", entry.data[CONF_HOST])
-            raise ConfigEntryError(
-                translation_key="config_entry_error_internal_error",
-                translation_placeholders={"support_email": SUPPORT_EMAIL},
-            )
-        webio_serial = webio_api.get_serial_number()
-        if webio_serial is None:
-            _LOGGER.error("[%s] Serial number not available", entry.data[CONF_HOST])
-            raise ConfigEntryError(
-                translation_key="config_entry_error_internal_error",
-                translation_placeholders={"support_email": SUPPORT_EMAIL},
-            )
-        if entry.unique_id != webio_serial:
-            _LOGGER.error(
-                "[%s] Serial number doesn't match config entry", entry.data[CONF_HOST]
-            )
-            raise ConfigEntryError(translation_key="config_entry_error_serial_mismatch")
-
-        coordinator = NASwebCoordinator(
-            hass, webio_api, name=f"NASweb[{webio_api.get_name()}]"
-        )
-        entry.runtime_data = coordinator
-        nasweb_data.notify_coordinator.add_coordinator(webio_serial, entry.runtime_data)
-
-        webhook_url = nasweb_data.get_webhook_url(hass)
-        if not await webio_api.status_subscription(webhook_url, True):
-            _LOGGER.error("Failed to subscribe for status updates from webio")
-            raise ConfigEntryError(
-                translation_key="config_entry_error_internal_error",
-                translation_placeholders={"support_email": SUPPORT_EMAIL},
-            )
-        if not await nasweb_data.notify_coordinator.check_connection(webio_serial):
-            _LOGGER.error("Did not receive status from device")
-            raise ConfigEntryError(
-                translation_key="config_entry_error_no_status_update",
-                translation_placeholders={"support_email": SUPPORT_EMAIL},
-            )
-    except TimeoutError as error:
-        raise ConfigEntryNotReady(
-            f"[{entry.data[CONF_HOST]}] Check connection reached timeout"
-        ) from error
-    except AuthError as error:
-        raise ConfigEntryError(
-            translation_key="config_entry_error_invalid_authentication"
-        ) from error
-    except NoURLAvailableError as error:
-        raise ConfigEntryError(
-            translation_key="config_entry_error_missing_internal_url"
-        ) from error
-
-    device_registry = dr.async_get(hass)
-    device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id,
-        identifiers={(DOMAIN, webio_serial)},
-        manufacturer=MANUFACTURER,
-        name=webio_api.get_name(),
-        configuration_url=NASWEB_CONFIG_URL.format(host=entry.data[CONF_HOST]),
-    )
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: NASwebConfigEntry) -> bool:
-    """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        nasweb_data = hass.data[DATA_NASWEB]
-        coordinator = entry.runtime_data
-        serial = entry.unique_id
-        if serial is not None:
-            nasweb_data.notify_coordinator.remove_coordinator(serial)
-        if nasweb_data.can_be_deinitialized():
-            nasweb_data.deinitialize(hass)
-            hass.data.pop(DATA_NASWEB)
-        webhook_url = nasweb_data.get_webhook_url(hass)
-        await coordinator.webio_api.status_subscription(webhook_url, False)
-
-    return unload_ok
diff --git a/homeassistant/components/nasweb/config_flow.py b/homeassistant/components/nasweb/config_flow.py
deleted file mode 100644
index 3a9ad3f7d49..00000000000
--- a/homeassistant/components/nasweb/config_flow.py
+++ /dev/null
@@ -1,137 +0,0 @@
-"""Config flow for NASweb integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-import voluptuous as vol
-from webio_api import WebioAPI
-from webio_api.api_client import AuthError
-
-from homeassistant import config_entries
-from homeassistant.config_entries import ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_UNIQUE_ID, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import AbortFlow
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.network import NoURLAvailableError
-
-from .const import DOMAIN
-from .coordinator import NASwebCoordinator
-from .nasweb_data import NASwebData
-
-NASWEB_SCHEMA_IMG_URL = (
-    "https://home-assistant.io/images/integrations/nasweb/nasweb_scheme.png"
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_HOST): str,
-        vol.Required(CONF_USERNAME): str,
-        vol.Required(CONF_PASSWORD): str,
-    }
-)
-
-
-async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
-    """Validate user-provided data."""
-    webio_api = WebioAPI(data[CONF_HOST], data[CONF_USERNAME], data[CONF_PASSWORD])
-    if not await webio_api.check_connection():
-        raise CannotConnect
-    try:
-        await webio_api.refresh_device_info()
-    except AuthError as e:
-        raise InvalidAuth from e
-
-    nasweb_data = NASwebData()
-    nasweb_data.initialize(hass)
-    try:
-        webio_serial = webio_api.get_serial_number()
-        if webio_serial is None:
-            raise MissingNASwebData("Device serial number is not available")
-
-        coordinator = NASwebCoordinator(hass, webio_api)
-        webhook_url = nasweb_data.get_webhook_url(hass)
-        nasweb_data.notify_coordinator.add_coordinator(webio_serial, coordinator)
-        subscription = await webio_api.status_subscription(webhook_url, True)
-        if not subscription:
-            nasweb_data.notify_coordinator.remove_coordinator(webio_serial)
-            raise MissingNASwebData(
-                "Failed to subscribe for status updates from device"
-            )
-
-        result = await nasweb_data.notify_coordinator.check_connection(webio_serial)
-        nasweb_data.notify_coordinator.remove_coordinator(webio_serial)
-        if not result:
-            if subscription:
-                await webio_api.status_subscription(webhook_url, False)
-            raise MissingNASwebStatus("Did not receive status from device")
-
-        name = webio_api.get_name()
-    finally:
-        nasweb_data.deinitialize(hass)
-    return {"title": name, CONF_UNIQUE_ID: webio_serial}
-
-
-class NASwebConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for NASweb."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            try:
-                info = await validate_input(self.hass, user_input)
-                await self.async_set_unique_id(info[CONF_UNIQUE_ID])
-                self._abort_if_unique_id_configured()
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except InvalidAuth:
-                errors["base"] = "invalid_auth"
-            except NoURLAvailableError:
-                errors["base"] = "missing_internal_url"
-            except MissingNASwebData:
-                errors["base"] = "missing_nasweb_data"
-            except MissingNASwebStatus:
-                errors["base"] = "missing_status"
-            except AbortFlow:
-                raise
-            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=self.add_suggested_values_to_schema(
-                STEP_USER_DATA_SCHEMA, user_input
-            ),
-            errors=errors,
-            description_placeholders={
-                "nasweb_schema_img": '<img src="' + NASWEB_SCHEMA_IMG_URL + '"/><br>',
-            },
-        )
-
-
-class CannotConnect(HomeAssistantError):
-    """Error to indicate we cannot connect."""
-
-
-class InvalidAuth(HomeAssistantError):
-    """Error to indicate there is invalid auth."""
-
-
-class MissingNASwebData(HomeAssistantError):
-    """Error to indicate missing information from NASweb."""
-
-
-class MissingNASwebStatus(HomeAssistantError):
-    """Error to indicate there was no status received from NASweb."""
diff --git a/homeassistant/components/nasweb/const.py b/homeassistant/components/nasweb/const.py
deleted file mode 100644
index ec750c90c8c..00000000000
--- a/homeassistant/components/nasweb/const.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""Constants for the NASweb integration."""
-
-DOMAIN = "nasweb"
-MANUFACTURER = "chomtech.pl"
-STATUS_UPDATE_MAX_TIME_INTERVAL = 60
-SUPPORT_EMAIL = "support@chomtech.eu"
-WEBHOOK_URL = "{internal_url}/api/webhook/{webhook_id}"
diff --git a/homeassistant/components/nasweb/coordinator.py b/homeassistant/components/nasweb/coordinator.py
deleted file mode 100644
index 90dca0f3022..00000000000
--- a/homeassistant/components/nasweb/coordinator.py
+++ /dev/null
@@ -1,191 +0,0 @@
-"""Message routing coordinators for handling NASweb push notifications."""
-
-from __future__ import annotations
-
-import asyncio
-from collections.abc import Callable
-from datetime import datetime, timedelta
-import logging
-import time
-from typing import Any
-
-from aiohttp.web import Request, Response
-from webio_api import WebioAPI
-from webio_api.const import KEY_DEVICE_SERIAL, KEY_OUTPUTS, KEY_TYPE, TYPE_STATUS_UPDATE
-
-from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
-from homeassistant.helpers import event
-from homeassistant.helpers.update_coordinator import BaseDataUpdateCoordinatorProtocol
-
-from .const import STATUS_UPDATE_MAX_TIME_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class NotificationCoordinator:
-    """Coordinator redirecting push notifications for this integration to appropriate NASwebCoordinator."""
-
-    def __init__(self) -> None:
-        """Initialize coordinator."""
-        self._coordinators: dict[str, NASwebCoordinator] = {}
-
-    def add_coordinator(self, serial: str, coordinator: NASwebCoordinator) -> None:
-        """Add NASwebCoordinator to possible notification targets."""
-        self._coordinators[serial] = coordinator
-        _LOGGER.debug("Added NASwebCoordinator for NASweb[%s]", serial)
-
-    def remove_coordinator(self, serial: str) -> None:
-        """Remove NASwebCoordinator from possible notification targets."""
-        self._coordinators.pop(serial)
-        _LOGGER.debug("Removed NASwebCoordinator for NASweb[%s]", serial)
-
-    def has_coordinators(self) -> bool:
-        """Check if there is any registered coordinator for push notifications."""
-        return len(self._coordinators) > 0
-
-    async def check_connection(self, serial: str) -> bool:
-        """Wait for first status update to confirm connection with NASweb."""
-        nasweb_coordinator = self._coordinators.get(serial)
-        if nasweb_coordinator is None:
-            _LOGGER.error("Cannot check connection. No device match serial number")
-            return False
-        for counter in range(10):
-            _LOGGER.debug("Checking connection with: %s (%s)", serial, counter)
-            if nasweb_coordinator.is_connection_confirmed():
-                return True
-            await asyncio.sleep(1)
-        return False
-
-    async def handle_webhook_request(
-        self, hass: HomeAssistant, webhook_id: str, request: Request
-    ) -> Response | None:
-        """Handle webhook request from Push API."""
-        if not self.has_coordinators():
-            return None
-        notification = await request.json()
-        serial = notification.get(KEY_DEVICE_SERIAL, None)
-        _LOGGER.debug("Received push: %s", notification)
-        if serial is None:
-            _LOGGER.warning("Received notification without nasweb identifier")
-            return None
-        nasweb_coordinator = self._coordinators.get(serial)
-        if nasweb_coordinator is None:
-            _LOGGER.warning("Received notification for not registered nasweb")
-            return None
-        await nasweb_coordinator.handle_push_notification(notification)
-        return Response(body='{"response": "ok"}', content_type="application/json")
-
-
-class NASwebCoordinator(BaseDataUpdateCoordinatorProtocol):
-    """Coordinator managing status of single NASweb device.
-
-    Since status updates are managed through push notifications, this class schedules
-    periodic checks to ensure that devices are marked unavailable if updates
-    haven't been received for a prolonged period.
-    """
-
-    def __init__(
-        self, hass: HomeAssistant, webio_api: WebioAPI, name: str = "NASweb[default]"
-    ) -> None:
-        """Initialize NASweb coordinator."""
-        self._hass = hass
-        self.name = name
-        self.webio_api = webio_api
-        self._last_update: float | None = None
-        job_name = f"NASwebCoordinator[{name}]"
-        self._job = HassJob(self._handle_max_update_interval, job_name)
-        self._unsub_last_update_check: CALLBACK_TYPE | None = None
-        self._listeners: dict[CALLBACK_TYPE, tuple[CALLBACK_TYPE, object | None]] = {}
-        data: dict[str, Any] = {}
-        data[KEY_OUTPUTS] = self.webio_api.outputs
-        self.async_set_updated_data(data)
-
-    def is_connection_confirmed(self) -> bool:
-        """Check whether coordinator received status update from NASweb."""
-        return self._last_update is not None
-
-    @callback
-    def async_add_listener(
-        self, update_callback: CALLBACK_TYPE, context: Any = None
-    ) -> Callable[[], None]:
-        """Listen for data updates."""
-        schedule_update_check = not self._listeners
-
-        @callback
-        def remove_listener() -> None:
-            """Remove update listener."""
-            self._listeners.pop(remove_listener)
-            if not self._listeners:
-                self._async_unsub_last_update_check()
-
-        self._listeners[remove_listener] = (update_callback, context)
-        # This is the first listener, set up interval.
-        if schedule_update_check:
-            self._schedule_last_update_check()
-        return remove_listener
-
-    @callback
-    def async_set_updated_data(self, data: dict[str, Any]) -> None:
-        """Update data and notify listeners."""
-        self.data = data
-        self.last_update = self._hass.loop.time()
-        _LOGGER.debug("Updated %s data", self.name)
-        if self._listeners:
-            self._schedule_last_update_check()
-        self.async_update_listeners()
-
-    @callback
-    def async_update_listeners(self) -> None:
-        """Update all registered listeners."""
-        for update_callback, _ in list(self._listeners.values()):
-            update_callback()
-
-    async def _handle_max_update_interval(self, now: datetime) -> None:
-        """Handle max update interval occurrence.
-
-        This method is called when `STATUS_UPDATE_MAX_TIME_INTERVAL` has passed without
-        receiving a status update. It only needs to trigger state update of entities
-        which then change their state accordingly.
-        """
-        self._unsub_last_update_check = None
-        if self._listeners:
-            self.async_update_listeners()
-
-    def _schedule_last_update_check(self) -> None:
-        """Schedule a task to trigger entities state update after `STATUS_UPDATE_MAX_TIME_INTERVAL`.
-
-        This method schedules a task (`_handle_max_update_interval`) to be executed after
-        `STATUS_UPDATE_MAX_TIME_INTERVAL` seconds without status update, which enables entities
-        to change their state to unavailable. After each status update this task is rescheduled.
-        """
-        self._async_unsub_last_update_check()
-        now = self._hass.loop.time()
-        next_check = (
-            now + timedelta(seconds=STATUS_UPDATE_MAX_TIME_INTERVAL).total_seconds()
-        )
-        self._unsub_last_update_check = event.async_call_at(
-            self._hass,
-            self._job,
-            next_check,
-        )
-
-    def _async_unsub_last_update_check(self) -> None:
-        """Cancel any scheduled update check call."""
-        if self._unsub_last_update_check:
-            self._unsub_last_update_check()
-            self._unsub_last_update_check = None
-
-    async def handle_push_notification(self, notification: dict) -> None:
-        """Handle incoming push notification from NASweb."""
-        msg_type = notification.get(KEY_TYPE)
-        _LOGGER.debug("Received push notification: %s", msg_type)
-
-        if msg_type == TYPE_STATUS_UPDATE:
-            await self.process_status_update(notification)
-            self._last_update = time.time()
-
-    async def process_status_update(self, new_status: dict) -> None:
-        """Process status update from NASweb."""
-        self.webio_api.update_device_status(new_status)
-        new_data = {KEY_OUTPUTS: self.webio_api.outputs}
-        self.async_set_updated_data(new_data)
diff --git a/homeassistant/components/nasweb/manifest.json b/homeassistant/components/nasweb/manifest.json
deleted file mode 100644
index e7e06419dad..00000000000
--- a/homeassistant/components/nasweb/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "domain": "nasweb",
-  "name": "NASweb",
-  "codeowners": ["@nasWebio"],
-  "config_flow": true,
-  "dependencies": ["webhook"],
-  "documentation": "https://www.home-assistant.io/integrations/nasweb",
-  "homekit": {},
-  "integration_type": "hub",
-  "iot_class": "local_push",
-  "requirements": ["webio-api==0.1.8"],
-  "ssdp": [],
-  "zeroconf": []
-}
diff --git a/homeassistant/components/nasweb/nasweb_data.py b/homeassistant/components/nasweb/nasweb_data.py
deleted file mode 100644
index 4f6a37e6cc7..00000000000
--- a/homeassistant/components/nasweb/nasweb_data.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""Dataclass storing integration data in hass.data[DOMAIN]."""
-
-from dataclasses import dataclass, field
-import logging
-
-from aiohttp.hdrs import METH_POST
-
-from homeassistant.components.webhook import (
-    async_generate_id,
-    async_register as webhook_register,
-    async_unregister as webhook_unregister,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.network import get_url
-
-from .const import DOMAIN, WEBHOOK_URL
-from .coordinator import NotificationCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class NASwebData:
-    """Class storing integration data."""
-
-    notify_coordinator: NotificationCoordinator = field(
-        default_factory=NotificationCoordinator
-    )
-    webhook_id = ""
-
-    def is_initialized(self) -> bool:
-        """Return True if instance was initialized and is ready for use."""
-        return bool(self.webhook_id)
-
-    def can_be_deinitialized(self) -> bool:
-        """Return whether this instance can be deinitialized."""
-        return not self.notify_coordinator.has_coordinators()
-
-    def initialize(self, hass: HomeAssistant) -> None:
-        """Initialize NASwebData instance."""
-        if self.is_initialized():
-            return
-        new_webhook_id = async_generate_id()
-        webhook_register(
-            hass,
-            DOMAIN,
-            "NASweb",
-            new_webhook_id,
-            self.notify_coordinator.handle_webhook_request,
-            allowed_methods=[METH_POST],
-        )
-        self.webhook_id = new_webhook_id
-        _LOGGER.debug("Registered webhook: %s", self.webhook_id)
-
-    def deinitialize(self, hass: HomeAssistant) -> None:
-        """Deinitialize NASwebData instance."""
-        if not self.is_initialized():
-            return
-        webhook_unregister(hass, self.webhook_id)
-
-    def get_webhook_url(self, hass: HomeAssistant) -> str:
-        """Return webhook url for Push API."""
-        hass_url = get_url(hass, allow_external=False)
-        return WEBHOOK_URL.format(internal_url=hass_url, webhook_id=self.webhook_id)
diff --git a/homeassistant/components/nasweb/strings.json b/homeassistant/components/nasweb/strings.json
deleted file mode 100644
index b8af8cd54db..00000000000
--- a/homeassistant/components/nasweb/strings.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "config": {
-    "step": {
-      "user": {
-        "title": "Add NASweb device",
-        "description": "{nasweb_schema_img}NASweb combines the functions of a control panel and the ability to manage building automation. The device monitors the flow of information from sensors and programmable switches and stores settings, definitions and configured actions.",
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "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%]",
-      "missing_internal_url": "Make sure Home Assistant has valid internal url",
-      "missing_nasweb_data": "Something isn't right with device internal configuration. Try restarting the device and HomeAssistant.",
-      "missing_status": "Did not received any status updates within the expected time window. Make sure the Home Assistant Internal URL is reachable from the NASweb device.",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    }
-  },
-  "exceptions": {
-    "config_entry_error_invalid_authentication": {
-      "message": "Invalid username/password. Most likely user changed password or was removed. Delete this entry and create new one with correct username/password."
-    },
-    "config_entry_error_internal_error": {
-      "message": "Something isn't right with device internal configuration. Try restarting the device and HomeAssistant. If the issue persists contact support at {support_email}"
-    },
-    "config_entry_error_no_status_update": {
-      "message": "Did not received any status updates within the expected time window. Make sure the Home Assistant Internal URL is reachable from the NASweb device. If the issue persists contact support at {support_email}"
-    },
-    "config_entry_error_missing_internal_url": {
-      "message": "[%key:component::nasweb::config::error::missing_internal_url%]"
-    },
-    "serial_mismatch": {
-      "message": "Connected to different NASweb device (serial number mismatch)."
-    }
-  },
-  "entity": {
-    "switch": {
-      "switch_output": {
-        "name": "Relay Switch {index}"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/nasweb/switch.py b/homeassistant/components/nasweb/switch.py
deleted file mode 100644
index 00e5a21da18..00000000000
--- a/homeassistant/components/nasweb/switch.py
+++ /dev/null
@@ -1,133 +0,0 @@
-"""Platform for NASweb output."""
-
-from __future__ import annotations
-
-import logging
-import time
-from typing import Any
-
-from webio_api import Output as NASwebOutput
-
-from homeassistant.components.switch import DOMAIN as DOMAIN_SWITCH, SwitchEntity
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
-from homeassistant.helpers.typing import DiscoveryInfoType
-from homeassistant.helpers.update_coordinator import (
-    BaseCoordinatorEntity,
-    BaseDataUpdateCoordinatorProtocol,
-)
-
-from . import NASwebConfigEntry
-from .const import DOMAIN, STATUS_UPDATE_MAX_TIME_INTERVAL
-from .coordinator import NASwebCoordinator
-
-OUTPUT_TRANSLATION_KEY = "switch_output"
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def _get_output(coordinator: NASwebCoordinator, index: int) -> NASwebOutput | None:
-    for out in coordinator.webio_api.outputs:
-        if out.index == index:
-            return out
-    return None
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config: NASwebConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up switch platform."""
-    coordinator = config.runtime_data
-    current_outputs: set[int] = set()
-
-    @callback
-    def _check_entities() -> None:
-        received_outputs = {out.index for out in coordinator.webio_api.outputs}
-        added = {i for i in received_outputs if i not in current_outputs}
-        removed = {i for i in current_outputs if i not in received_outputs}
-        entities_to_add: list[RelaySwitch] = []
-        for index in added:
-            webio_output = _get_output(coordinator, index)
-            if not isinstance(webio_output, NASwebOutput):
-                _LOGGER.error("Cannot create RelaySwitch entity without NASwebOutput")
-                continue
-            new_output = RelaySwitch(coordinator, webio_output)
-            entities_to_add.append(new_output)
-            current_outputs.add(index)
-        async_add_entities(entities_to_add)
-        entity_registry = er.async_get(hass)
-        for index in removed:
-            unique_id = f"{DOMAIN}.{config.unique_id}.relay_switch.{index}"
-            if entity_id := entity_registry.async_get_entity_id(
-                DOMAIN_SWITCH, DOMAIN, unique_id
-            ):
-                entity_registry.async_remove(entity_id)
-                current_outputs.remove(index)
-            else:
-                _LOGGER.warning("Failed to remove old output: no entity_id")
-
-    coordinator.async_add_listener(_check_entities)
-    _check_entities()
-
-
-class RelaySwitch(SwitchEntity, BaseCoordinatorEntity):
-    """Entity representing NASweb Output."""
-
-    def __init__(
-        self,
-        coordinator: BaseDataUpdateCoordinatorProtocol,
-        nasweb_output: NASwebOutput,
-    ) -> None:
-        """Initialize RelaySwitch."""
-        super().__init__(coordinator)
-        self._output = nasweb_output
-        self._attr_icon = "mdi:export"
-        self._attr_has_entity_name = True
-        self._attr_translation_key = OUTPUT_TRANSLATION_KEY
-        self._attr_translation_placeholders = {"index": f"{nasweb_output.index:2d}"}
-        self._attr_unique_id = (
-            f"{DOMAIN}.{self._output.webio_serial}.relay_switch.{self._output.index}"
-        )
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._output.webio_serial)},
-        )
-
-    async def async_added_to_hass(self) -> None:
-        """When entity is added to hass."""
-        await super().async_added_to_hass()
-        self._handle_coordinator_update()
-
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        self._attr_is_on = self._output.state
-        if (
-            self.coordinator.last_update is None
-            or time.time() - self._output.last_update >= STATUS_UPDATE_MAX_TIME_INTERVAL
-        ):
-            self._attr_available = False
-        else:
-            self._attr_available = (
-                self._output.available if self._output.available is not None else False
-            )
-        self.async_write_ha_state()
-
-    async def async_update(self) -> None:
-        """Update the entity.
-
-        Only used by the generic entity update service.
-        Scheduling updates is not necessary, the coordinator takes care of updates via push notifications.
-        """
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn On RelaySwitch."""
-        await self._output.turn_on()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn Off RelaySwitch."""
-        await self._output.turn_off()
diff --git a/homeassistant/components/ness_alarm/alarm_control_panel.py b/homeassistant/components/ness_alarm/alarm_control_panel.py
index 64b764c6872..e44c06ecc85 100644
--- a/homeassistant/components/ness_alarm/alarm_control_panel.py
+++ b/homeassistant/components/ness_alarm/alarm_control_panel.py
@@ -9,9 +9,18 @@ from nessclient import ArmingMode, ArmingState, Client
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -22,12 +31,12 @@ from . import DATA_NESS, SIGNAL_ARMING_STATE_CHANGED
 _LOGGER = logging.getLogger(__name__)
 
 ARMING_MODE_TO_STATE = {
-    ArmingMode.ARMED_AWAY: AlarmControlPanelState.ARMED_AWAY,
-    ArmingMode.ARMED_HOME: AlarmControlPanelState.ARMED_HOME,
-    ArmingMode.ARMED_DAY: AlarmControlPanelState.ARMED_AWAY,  # no applicable state, fallback to away
-    ArmingMode.ARMED_NIGHT: AlarmControlPanelState.ARMED_NIGHT,
-    ArmingMode.ARMED_VACATION: AlarmControlPanelState.ARMED_VACATION,
-    ArmingMode.ARMED_HIGHEST: AlarmControlPanelState.ARMED_AWAY,  # no applicable state, fallback to away
+    ArmingMode.ARMED_AWAY: STATE_ALARM_ARMED_AWAY,
+    ArmingMode.ARMED_HOME: STATE_ALARM_ARMED_HOME,
+    ArmingMode.ARMED_DAY: STATE_ALARM_ARMED_AWAY,  # no applicable state, fallback to away
+    ArmingMode.ARMED_NIGHT: STATE_ALARM_ARMED_NIGHT,
+    ArmingMode.ARMED_VACATION: STATE_ALARM_ARMED_VACATION,
+    ArmingMode.ARMED_HIGHEST: STATE_ALARM_ARMED_AWAY,  # no applicable state, fallback to away
 }
 
 
@@ -92,19 +101,19 @@ class NessAlarmPanel(AlarmControlPanelEntity):
         """Handle arming state update."""
 
         if arming_state == ArmingState.UNKNOWN:
-            self._attr_alarm_state = None
+            self._attr_state = None
         elif arming_state == ArmingState.DISARMED:
-            self._attr_alarm_state = AlarmControlPanelState.DISARMED
+            self._attr_state = STATE_ALARM_DISARMED
         elif arming_state in (ArmingState.ARMING, ArmingState.EXIT_DELAY):
-            self._attr_alarm_state = AlarmControlPanelState.ARMING
+            self._attr_state = STATE_ALARM_ARMING
         elif arming_state == ArmingState.ARMED:
-            self._attr_alarm_state = ARMING_MODE_TO_STATE.get(
-                arming_mode, AlarmControlPanelState.ARMED_AWAY
+            self._attr_state = ARMING_MODE_TO_STATE.get(
+                arming_mode, STATE_ALARM_ARMED_AWAY
             )
         elif arming_state == ArmingState.ENTRY_DELAY:
-            self._attr_alarm_state = AlarmControlPanelState.PENDING
+            self._attr_state = STATE_ALARM_PENDING
         elif arming_state == ArmingState.TRIGGERED:
-            self._attr_alarm_state = AlarmControlPanelState.TRIGGERED
+            self._attr_state = STATE_ALARM_TRIGGERED
         else:
             _LOGGER.warning("Unhandled arming state: %s", arming_state)
 
diff --git a/homeassistant/components/nest/__init__.py b/homeassistant/components/nest/__init__.py
index 6b094c68cb0..0f378fcc737 100644
--- a/homeassistant/components/nest/__init__.py
+++ b/homeassistant/components/nest/__init__.py
@@ -59,7 +59,6 @@ from .const import (
     CONF_PROJECT_ID,
     CONF_SUBSCRIBER_ID,
     CONF_SUBSCRIBER_ID_IMPORTED,
-    CONF_SUBSCRIPTION_NAME,
     DATA_DEVICE_MANAGER,
     DATA_SDM,
     DATA_SUBSCRIBER,
@@ -290,9 +289,7 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle removal of pubsub subscriptions created during config flow."""
     if (
         DATA_SDM not in entry.data
-        or not (
-            CONF_SUBSCRIPTION_NAME in entry.data or CONF_SUBSCRIBER_ID in entry.data
-        )
+        or CONF_SUBSCRIBER_ID not in entry.data
         or CONF_SUBSCRIBER_ID_IMPORTED in entry.data
     ):
         return
diff --git a/homeassistant/components/nest/api.py b/homeassistant/components/nest/api.py
index 5c65a70c75d..bcffc9b5ded 100644
--- a/homeassistant/components/nest/api.py
+++ b/homeassistant/components/nest/api.py
@@ -8,7 +8,6 @@ from typing import cast
 
 from aiohttp import ClientSession
 from google.oauth2.credentials import Credentials
-from google_nest_sdm.admin_client import PUBSUB_API_HOST, AdminClient
 from google_nest_sdm.auth import AbstractAuth
 from google_nest_sdm.google_nest_subscriber import GoogleNestSubscriber
 
@@ -20,7 +19,6 @@ from .const import (
     API_URL,
     CONF_PROJECT_ID,
     CONF_SUBSCRIBER_ID,
-    CONF_SUBSCRIPTION_NAME,
     OAUTH2_TOKEN,
     SDM_SCOPES,
 )
@@ -82,10 +80,9 @@ class AccessTokenAuthImpl(AbstractAuth):
         self,
         websession: ClientSession,
         access_token: str,
-        host: str,
     ) -> None:
         """Init the Nest client library auth implementation."""
-        super().__init__(websession, host)
+        super().__init__(websession, API_URL)
         self._access_token = access_token
 
     async def async_get_access_token(self) -> str:
@@ -114,46 +111,29 @@ async def new_subscriber(
         implementation, config_entry_oauth2_flow.LocalOAuth2Implementation
     ):
         raise TypeError(f"Unexpected auth implementation {implementation}")
-    if (subscription_name := entry.data.get(CONF_SUBSCRIPTION_NAME)) is None:
-        subscription_name = entry.data[CONF_SUBSCRIBER_ID]
+    if not (subscriber_id := entry.data.get(CONF_SUBSCRIBER_ID)):
+        raise ValueError("Configuration option 'subscriber_id' missing")
     auth = AsyncConfigEntryAuth(
         aiohttp_client.async_get_clientsession(hass),
         config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation),
         implementation.client_id,
         implementation.client_secret,
     )
-    return GoogleNestSubscriber(auth, entry.data[CONF_PROJECT_ID], subscription_name)
+    return GoogleNestSubscriber(auth, entry.data[CONF_PROJECT_ID], subscriber_id)
 
 
 def new_subscriber_with_token(
     hass: HomeAssistant,
     access_token: str,
     project_id: str,
-    subscription_name: str,
+    subscriber_id: str,
 ) -> GoogleNestSubscriber:
     """Create a GoogleNestSubscriber with an access token."""
     return GoogleNestSubscriber(
         AccessTokenAuthImpl(
             aiohttp_client.async_get_clientsession(hass),
             access_token,
-            API_URL,
         ),
         project_id,
-        subscription_name,
-    )
-
-
-def new_pubsub_admin_client(
-    hass: HomeAssistant,
-    access_token: str,
-    cloud_project_id: str,
-) -> AdminClient:
-    """Create a Nest AdminClient with an access token."""
-    return AdminClient(
-        auth=AccessTokenAuthImpl(
-            aiohttp_client.async_get_clientsession(hass),
-            access_token,
-            PUBSUB_API_HOST,
-        ),
-        cloud_project_id=cloud_project_id,
+        subscriber_id,
     )
diff --git a/homeassistant/components/nest/camera.py b/homeassistant/components/nest/camera.py
index 0a46d67a3ad..e25ff82694f 100644
--- a/homeassistant/components/nest/camera.py
+++ b/homeassistant/components/nest/camera.py
@@ -2,36 +2,29 @@
 
 from __future__ import annotations
 
-from abc import ABC
 import asyncio
-from collections.abc import Awaitable, Callable
+from collections.abc import Callable
 import datetime
 import functools
 import logging
 from pathlib import Path
+from typing import cast
 
 from google_nest_sdm.camera_traits import (
+    CameraImageTrait,
     CameraLiveStreamTrait,
     RtspStream,
     StreamingProtocol,
-    WebRtcStream,
 )
 from google_nest_sdm.device import Device
 from google_nest_sdm.device_manager import DeviceManager
 from google_nest_sdm.exceptions import ApiException
-from webrtc_models import RTCIceCandidate
 
-from homeassistant.components.camera import (
-    Camera,
-    CameraEntityFeature,
-    StreamType,
-    WebRTCAnswer,
-    WebRTCClientConfiguration,
-    WebRTCSendMessage,
-)
+from homeassistant.components.camera import Camera, CameraEntityFeature, StreamType
+from homeassistant.components.camera.webrtc import WebRTCClientConfiguration
 from homeassistant.components.stream import CONF_EXTRA_PART_WAIT_TIME
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_point_in_utc_time
@@ -47,11 +40,6 @@ PLACEHOLDER = Path(__file__).parent / "placeholder.png"
 # Used to schedule an alarm to refresh the stream before expiration
 STREAM_EXPIRATION_BUFFER = datetime.timedelta(seconds=30)
 
-# Refresh streams with a bounded interval and backoff on failure
-MIN_REFRESH_BACKOFF_INTERVAL = datetime.timedelta(minutes=1)
-MAX_REFRESH_BACKOFF_INTERVAL = datetime.timedelta(minutes=10)
-BACKOFF_MULTIPLIER = 1.5
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
@@ -61,87 +49,19 @@ async def async_setup_entry(
     device_manager: DeviceManager = hass.data[DOMAIN][entry.entry_id][
         DATA_DEVICE_MANAGER
     ]
-    entities: list[NestCameraBaseEntity] = []
-    for device in device_manager.devices.values():
-        if (live_stream := device.traits.get(CameraLiveStreamTrait.NAME)) is None:
-            continue
-        if StreamingProtocol.WEB_RTC in live_stream.supported_protocols:
-            entities.append(NestWebRTCEntity(device))
-        elif StreamingProtocol.RTSP in live_stream.supported_protocols:
-            entities.append(NestRTSPEntity(device))
-
-    async_add_entities(entities)
+    async_add_entities(
+        NestCamera(device)
+        for device in device_manager.devices.values()
+        if CameraImageTrait.NAME in device.traits
+        or CameraLiveStreamTrait.NAME in device.traits
+    )
 
 
-class StreamRefresh:
-    """Class that will refresh an expiring stream.
-
-    This class will schedule an alarm for the next expiration time of a stream.
-    When the alarm fires, it runs the provided `refresh_cb` to extend the
-    lifetime of the stream and return a new expiration time.
-
-    A simple backoff will be applied when the refresh callback fails.
-    """
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        expires_at: datetime.datetime,
-        refresh_cb: Callable[[], Awaitable[datetime.datetime | None]],
-    ) -> None:
-        """Initialize StreamRefresh."""
-        self._hass = hass
-        self._unsub: Callable[[], None] | None = None
-        self._min_refresh_interval = MIN_REFRESH_BACKOFF_INTERVAL
-        self._refresh_cb = refresh_cb
-        self._schedule_stream_refresh(expires_at - STREAM_EXPIRATION_BUFFER)
-
-    def unsub(self) -> None:
-        """Invalidates the stream."""
-        if self._unsub:
-            self._unsub()
-
-    async def _handle_refresh(self, _: datetime.datetime) -> None:
-        """Alarm that fires to check if the stream should be refreshed."""
-        self._unsub = None
-        try:
-            expires_at = await self._refresh_cb()
-        except ApiException as err:
-            _LOGGER.debug("Failed to refresh stream: %s", err)
-            # Increase backoff until the max backoff interval is reached
-            self._min_refresh_interval = min(
-                self._min_refresh_interval * BACKOFF_MULTIPLIER,
-                MAX_REFRESH_BACKOFF_INTERVAL,
-            )
-            refresh_time = utcnow() + self._min_refresh_interval
-        else:
-            if expires_at is None:
-                return
-            self._min_refresh_interval = MIN_REFRESH_BACKOFF_INTERVAL  # Reset backoff
-            # Defend against invalid stream expiration time in the past
-            refresh_time = max(
-                expires_at - STREAM_EXPIRATION_BUFFER,
-                utcnow() + self._min_refresh_interval,
-            )
-        self._schedule_stream_refresh(refresh_time)
-
-    def _schedule_stream_refresh(self, refresh_time: datetime.datetime) -> None:
-        """Schedules an alarm to refresh any streams before expiration."""
-        _LOGGER.debug("Scheduling stream refresh for %s", refresh_time)
-        self._unsub = async_track_point_in_utc_time(
-            self._hass,
-            self._handle_refresh,
-            refresh_time,
-        )
-
-
-class NestCameraBaseEntity(Camera, ABC):
+class NestCamera(Camera):
     """Devices that support cameras."""
 
     _attr_has_entity_name = True
     _attr_name = None
-    _attr_is_streaming = True
-    _attr_supported_features = CameraEntityFeature.STREAM
 
     def __init__(self, device: Device) -> None:
         """Initialize the camera."""
@@ -151,34 +71,38 @@ class NestCameraBaseEntity(Camera, ABC):
         self._attr_device_info = nest_device_info.device_info
         self._attr_brand = nest_device_info.device_brand
         self._attr_model = nest_device_info.device_model
+        self._stream: RtspStream | None = None
+        self._create_stream_url_lock = asyncio.Lock()
+        self._stream_refresh_unsub: Callable[[], None] | None = None
+        self._attr_is_streaming = False
+        self._attr_supported_features = CameraEntityFeature(0)
+        self._rtsp_live_stream_trait: CameraLiveStreamTrait | None = None
+        if CameraLiveStreamTrait.NAME in self._device.traits:
+            self._attr_is_streaming = True
+            self._attr_supported_features |= CameraEntityFeature.STREAM
+            trait = cast(
+                CameraLiveStreamTrait, self._device.traits[CameraLiveStreamTrait.NAME]
+            )
+            if StreamingProtocol.RTSP in trait.supported_protocols:
+                self._rtsp_live_stream_trait = trait
         self.stream_options[CONF_EXTRA_PART_WAIT_TIME] = 3
         # The API "name" field is a unique device identifier.
         self._attr_unique_id = f"{self._device.name}-camera"
 
-    async def async_added_to_hass(self) -> None:
-        """Run when entity is added to register update signal handler."""
-        self.async_on_remove(
-            self._device.add_update_listener(self.async_write_ha_state)
-        )
-
-
-class NestRTSPEntity(NestCameraBaseEntity):
-    """Nest cameras that use RTSP."""
-
-    _rtsp_stream: RtspStream | None = None
-    _rtsp_live_stream_trait: CameraLiveStreamTrait
-
-    def __init__(self, device: Device) -> None:
-        """Initialize the camera."""
-        super().__init__(device)
-        self._create_stream_url_lock = asyncio.Lock()
-        self._rtsp_live_stream_trait = device.traits[CameraLiveStreamTrait.NAME]
-        self._refresh_unsub: Callable[[], None] | None = None
-
     @property
     def use_stream_for_stills(self) -> bool:
-        """Always use the RTSP stream to generate snapshots."""
-        return True
+        """Whether or not to use stream to generate stills."""
+        return self._rtsp_live_stream_trait is not None
+
+    @property
+    def frontend_stream_type(self) -> StreamType | None:
+        """Return the type of stream supported by this camera."""
+        if CameraLiveStreamTrait.NAME not in self._device.traits:
+            return None
+        trait = self._device.traits[CameraLiveStreamTrait.NAME]
+        if StreamingProtocol.WEB_RTC in trait.supported_protocols:
+            return StreamType.WEB_RTC
+        return super().frontend_stream_type
 
     @property
     def available(self) -> bool:
@@ -192,88 +116,83 @@ class NestRTSPEntity(NestCameraBaseEntity):
 
     async def stream_source(self) -> str | None:
         """Return the source of the stream."""
+        if not self._rtsp_live_stream_trait:
+            return None
         async with self._create_stream_url_lock:
-            if not self._rtsp_stream:
+            if not self._stream:
                 _LOGGER.debug("Fetching stream url")
                 try:
-                    self._rtsp_stream = (
+                    self._stream = (
                         await self._rtsp_live_stream_trait.generate_rtsp_stream()
                     )
                 except ApiException as err:
                     raise HomeAssistantError(f"Nest API error: {err}") from err
-                refresh = StreamRefresh(
-                    self.hass,
-                    self._rtsp_stream.expires_at,
-                    self._async_refresh_stream,
-                )
-                self._refresh_unsub = refresh.unsub
-        assert self._rtsp_stream
-        if self._rtsp_stream.expires_at < utcnow():
+                self._schedule_stream_refresh()
+        assert self._stream
+        if self._stream.expires_at < utcnow():
             _LOGGER.warning("Stream already expired")
-        return self._rtsp_stream.rtsp_stream_url
+        return self._stream.rtsp_stream_url
 
-    async def _async_refresh_stream(self) -> datetime.datetime | None:
-        """Refresh stream to extend expiration time."""
-        if not self._rtsp_stream:
-            return None
-        _LOGGER.debug("Extending RTSP stream")
+    def _schedule_stream_refresh(self) -> None:
+        """Schedules an alarm to refresh the stream url before expiration."""
+        assert self._stream
+        _LOGGER.debug("New stream url expires at %s", self._stream.expires_at)
+        refresh_time = self._stream.expires_at - STREAM_EXPIRATION_BUFFER
+        # Schedule an alarm to extend the stream
+        if self._stream_refresh_unsub is not None:
+            self._stream_refresh_unsub()
+
+        self._stream_refresh_unsub = async_track_point_in_utc_time(
+            self.hass,
+            self._handle_stream_refresh,
+            refresh_time,
+        )
+
+    async def _handle_stream_refresh(self, now: datetime.datetime) -> None:
+        """Alarm that fires to check if the stream should be refreshed."""
+        if not self._stream:
+            return
+        _LOGGER.debug("Extending stream url")
         try:
-            self._rtsp_stream = await self._rtsp_stream.extend_rtsp_stream()
+            self._stream = await self._stream.extend_rtsp_stream()
         except ApiException as err:
             _LOGGER.debug("Failed to extend stream: %s", err)
             # Next attempt to catch a url will get a new one
-            self._rtsp_stream = None
+            self._stream = None
             if self.stream:
                 await self.stream.stop()
                 self.stream = None
-            return None
+            return
         # Update the stream worker with the latest valid url
         if self.stream:
-            self.stream.update_source(self._rtsp_stream.rtsp_stream_url)
-        return self._rtsp_stream.expires_at
+            self.stream.update_source(self._stream.rtsp_stream_url)
+        self._schedule_stream_refresh()
 
     async def async_will_remove_from_hass(self) -> None:
         """Invalidates the RTSP token when unloaded."""
-        await super().async_will_remove_from_hass()
-        if self._refresh_unsub is not None:
-            self._refresh_unsub()
-        if self._rtsp_stream:
+        if self._stream:
+            _LOGGER.debug("Invalidating stream")
             try:
-                await self._rtsp_stream.stop_stream()
+                await self._stream.stop_rtsp_stream()
             except ApiException as err:
-                _LOGGER.debug("Error stopping stream: %s", err)
-            self._rtsp_stream = None
+                _LOGGER.debug(
+                    "Failed to revoke stream token, will rely on ttl: %s", err
+                )
+        if self._stream_refresh_unsub:
+            self._stream_refresh_unsub()
 
-
-class NestWebRTCEntity(NestCameraBaseEntity):
-    """Nest cameras that use WebRTC."""
-
-    def __init__(self, device: Device) -> None:
-        """Initialize the camera."""
-        super().__init__(device)
-        self._webrtc_sessions: dict[str, WebRtcStream] = {}
-        self._refresh_unsub: dict[str, Callable[[], None]] = {}
-
-    @property
-    def frontend_stream_type(self) -> StreamType | None:
-        """Return the type of stream supported by this camera."""
-        return StreamType.WEB_RTC
-
-    async def _async_refresh_stream(self, session_id: str) -> datetime.datetime | None:
-        """Refresh stream to extend expiration time."""
-        if not (webrtc_stream := self._webrtc_sessions.get(session_id)):
-            return None
-        _LOGGER.debug("Extending WebRTC stream %s", webrtc_stream.media_session_id)
-        webrtc_stream = await webrtc_stream.extend_stream()
-        if session_id in self._webrtc_sessions:
-            self._webrtc_sessions[session_id] = webrtc_stream
-            return webrtc_stream.expires_at
-        return None
+    async def async_added_to_hass(self) -> None:
+        """Run when entity is added to register update signal handler."""
+        self.async_on_remove(
+            self._device.add_update_listener(self.async_write_ha_state)
+        )
 
     async def async_camera_image(
         self, width: int | None = None, height: int | None = None
     ) -> bytes | None:
-        """Return a placeholder image for WebRTC cameras that don't support snapshots."""
+        """Return bytes of camera image."""
+        # Use the thumbnail from RTSP stream, or a placeholder if stream is
+        # not supported (e.g. WebRTC) as a fallback when 'use_stream_for_stills' if False
         return await self.hass.async_add_executor_job(self.placeholder_image)
 
     @classmethod
@@ -282,59 +201,17 @@ class NestWebRTCEntity(NestCameraBaseEntity):
         """Return placeholder image to use when no stream is available."""
         return PLACEHOLDER.read_bytes()
 
-    async def async_handle_async_webrtc_offer(
-        self, offer_sdp: str, session_id: str, send_message: WebRTCSendMessage
-    ) -> None:
+    async def async_handle_web_rtc_offer(self, offer_sdp: str) -> str | None:
         """Return the source of the stream."""
         trait: CameraLiveStreamTrait = self._device.traits[CameraLiveStreamTrait.NAME]
+        if StreamingProtocol.WEB_RTC not in trait.supported_protocols:
+            return await super().async_handle_web_rtc_offer(offer_sdp)
         try:
             stream = await trait.generate_web_rtc_stream(offer_sdp)
         except ApiException as err:
             raise HomeAssistantError(f"Nest API error: {err}") from err
-        _LOGGER.debug(
-            "Started WebRTC session %s, %s", session_id, stream.media_session_id
-        )
-        self._webrtc_sessions[session_id] = stream
-        send_message(WebRTCAnswer(stream.answer_sdp))
-        refresh = StreamRefresh(
-            self.hass,
-            stream.expires_at,
-            functools.partial(self._async_refresh_stream, session_id),
-        )
-        self._refresh_unsub[session_id] = refresh.unsub
+        return stream.answer_sdp
 
-    async def async_on_webrtc_candidate(
-        self, session_id: str, candidate: RTCIceCandidate
-    ) -> None:
-        """Ignore WebRTC candidates for Nest cloud based cameras."""
-        return
-
-    @callback
-    def close_webrtc_session(self, session_id: str) -> None:
-        """Close a WebRTC session."""
-        if (stream := self._webrtc_sessions.pop(session_id, None)) is not None:
-            _LOGGER.debug(
-                "Closing WebRTC session %s, %s", session_id, stream.media_session_id
-            )
-            unsub = self._refresh_unsub.pop(session_id)
-            unsub()
-
-            async def stop_stream() -> None:
-                try:
-                    await stream.stop_stream()
-                except ApiException as err:
-                    _LOGGER.debug("Error stopping stream: %s", err)
-
-            self.hass.async_create_task(stop_stream())
-        super().close_webrtc_session(session_id)
-
-    @callback
-    def _async_get_webrtc_client_configuration(self) -> WebRTCClientConfiguration:
+    async def _async_get_webrtc_client_configuration(self) -> WebRTCClientConfiguration:
         """Return the WebRTC client configuration adjustable per integration."""
         return WebRTCClientConfiguration(data_channel="dataSendChannel")
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Invalidates the RTSP token when unloaded."""
-        await super().async_will_remove_from_hass()
-        for session_id in list(self._webrtc_sessions.keys()):
-            self.close_webrtc_session(session_id)
diff --git a/homeassistant/components/nest/config_flow.py b/homeassistant/components/nest/config_flow.py
index 274e4c288b4..22fe315b905 100644
--- a/homeassistant/components/nest/config_flow.py
+++ b/homeassistant/components/nest/config_flow.py
@@ -12,14 +12,14 @@ from __future__ import annotations
 
 from collections.abc import Iterable, Mapping
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
-from google_nest_sdm.admin_client import (
-    AdminClient,
-    EligibleSubscriptions,
-    EligibleTopics,
+from google_nest_sdm.exceptions import (
+    ApiException,
+    AuthException,
+    ConfigurationException,
+    SubscriberException,
 )
-from google_nest_sdm.exceptions import ApiException
 from google_nest_sdm.structure import Structure
 import voluptuous as vol
 
@@ -31,9 +31,8 @@ from . import api
 from .const import (
     CONF_CLOUD_PROJECT_ID,
     CONF_PROJECT_ID,
-    CONF_SUBSCRIBER_ID_IMPORTED,
-    CONF_SUBSCRIPTION_NAME,
-    CONF_TOPIC_NAME,
+    CONF_SUBSCRIBER_ID,
+    DATA_NEST_CONFIG,
     DATA_SDM,
     DOMAIN,
     OAUTH2_AUTHORIZE,
@@ -59,7 +58,7 @@ DEVICE_ACCESS_CONSOLE_URL = "https://console.nest.google.com/device-access/"
 DEVICE_ACCESS_CONSOLE_EDIT_URL = (
     "https://console.nest.google.com/device-access/project/{project_id}/information"
 )
-CREATE_NEW_SUBSCRIPTION_KEY = "create_new_subscription"
+
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -96,9 +95,6 @@ class NestFlowHandler(
         self._data: dict[str, Any] = {DATA_SDM: {}}
         # Possible name to use for config entry based on the Google Home name
         self._structure_config_title: str | None = None
-        self._admin_client: AdminClient | None = None
-        self._eligible_topics: EligibleTopics | None = None
-        self._eligible_subscriptions: EligibleSubscriptions | None = None
 
     @property
     def logger(self) -> logging.Logger:
@@ -117,7 +113,8 @@ class NestFlowHandler(
 
     async def async_generate_authorize_url(self) -> str:
         """Generate a url for the user to authorize based on user input."""
-        project_id = self._data.get(CONF_PROJECT_ID)
+        config = self.hass.data.get(DOMAIN, {}).get(DATA_NEST_CONFIG, {})
+        project_id = self._data.get(CONF_PROJECT_ID, config.get(CONF_PROJECT_ID, ""))
         query = await super().async_generate_authorize_url()
         authorize_url = OAUTH2_AUTHORIZE.format(project_id=project_id)
         return f"{authorize_url}{query}"
@@ -126,7 +123,6 @@ class NestFlowHandler(
         """Complete OAuth setup and finish pubsub or finish."""
         _LOGGER.debug("Finishing post-oauth configuration")
         self._data.update(data)
-        _LOGGER.debug("self.source=%s", self.source)
         if self.source == SOURCE_REAUTH:
             _LOGGER.debug("Skipping Pub/Sub configuration")
             return await self._async_finish()
@@ -136,7 +132,6 @@ class NestFlowHandler(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Perform reauth upon an API authentication error."""
-        _LOGGER.debug("async_step_reauth %s", self.source)
         self._data.update(entry_data)
 
         return await self.async_step_reauth_confirm()
@@ -243,114 +238,40 @@ class NestFlowHandler(
     async def async_step_pubsub(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Configure and the pre-requisites to configure Pub/Sub topics and subscriptions."""
+        """Configure and create Pub/Sub subscriber."""
         data = {
             **self._data,
             **(user_input if user_input is not None else {}),
         }
         cloud_project_id = data.get(CONF_CLOUD_PROJECT_ID, "").strip()
-        device_access_project_id = data[CONF_PROJECT_ID]
+        config = self.hass.data.get(DOMAIN, {}).get(DATA_NEST_CONFIG, {})
+        project_id = data.get(CONF_PROJECT_ID, config.get(CONF_PROJECT_ID))
 
         errors: dict[str, str] = {}
         if cloud_project_id:
-            access_token = self._data["token"]["access_token"]
-            self._admin_client = api.new_pubsub_admin_client(
-                self.hass, access_token=access_token, cloud_project_id=cloud_project_id
+            # Create the subscriber id and/or verify it already exists. Note that
+            # the existing id is used, and create call below is idempotent
+            if not (subscriber_id := data.get(CONF_SUBSCRIBER_ID, "")):
+                subscriber_id = _generate_subscription_id(cloud_project_id)
+            _LOGGER.debug("Creating subscriber id '%s'", subscriber_id)
+            subscriber = api.new_subscriber_with_token(
+                self.hass,
+                self._data["token"]["access_token"],
+                project_id,
+                subscriber_id,
             )
             try:
-                eligible_topics = await self._admin_client.list_eligible_topics(
-                    device_access_project_id=device_access_project_id
-                )
-            except ApiException as err:
-                _LOGGER.error("Error listing eligible Pub/Sub topics: %s", err)
-                errors["base"] = "pubsub_api_error"
-            else:
-                if not eligible_topics.topic_names:
-                    errors["base"] = "no_pubsub_topics"
+                await subscriber.create_subscription()
+            except AuthException as err:
+                _LOGGER.error("Subscriber authentication error: %s", err)
+                return self.async_abort(reason="invalid_access_token")
+            except ConfigurationException as err:
+                _LOGGER.error("Configuration error creating subscription: %s", err)
+                errors[CONF_CLOUD_PROJECT_ID] = "bad_project_id"
+            except SubscriberException as err:
+                _LOGGER.error("Error creating subscription: %s", err)
+                errors[CONF_CLOUD_PROJECT_ID] = "subscriber_error"
             if not errors:
-                self._data[CONF_CLOUD_PROJECT_ID] = cloud_project_id
-                self._eligible_topics = eligible_topics
-                return await self.async_step_pubsub_topic()
-
-        return self.async_show_form(
-            step_id="pubsub",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_CLOUD_PROJECT_ID, default=cloud_project_id): str,
-                }
-            ),
-            description_placeholders={
-                "url": CLOUD_CONSOLE_URL,
-                "device_access_console_url": DEVICE_ACCESS_CONSOLE_URL,
-                "more_info_url": MORE_INFO_URL,
-            },
-            errors=errors,
-        )
-
-    async def async_step_pubsub_topic(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Configure and create Pub/Sub topic."""
-        if TYPE_CHECKING:
-            assert self._eligible_topics
-        if user_input is not None:
-            self._data.update(user_input)
-            return await self.async_step_pubsub_subscription()
-        topics = list(self._eligible_topics.topic_names)
-        return self.async_show_form(
-            step_id="pubsub_topic",
-            data_schema=vol.Schema(
-                {
-                    vol.Optional(CONF_TOPIC_NAME, default=topics[0]): vol.In(topics),
-                }
-            ),
-            description_placeholders={
-                "device_access_console_url": DEVICE_ACCESS_CONSOLE_URL,
-                "more_info_url": MORE_INFO_URL,
-            },
-        )
-
-    async def async_step_pubsub_subscription(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Configure and create Pub/Sub subscription."""
-        if TYPE_CHECKING:
-            assert self._admin_client
-        errors = {}
-        if user_input is not None:
-            subscription_name = user_input[CONF_SUBSCRIPTION_NAME]
-            if subscription_name == CREATE_NEW_SUBSCRIPTION_KEY:
-                topic_name = self._data[CONF_TOPIC_NAME]
-                subscription_name = _generate_subscription_id(
-                    self._data[CONF_CLOUD_PROJECT_ID]
-                )
-                _LOGGER.debug(
-                    "Creating subscription %s on topic %s",
-                    subscription_name,
-                    topic_name,
-                )
-                try:
-                    await self._admin_client.create_subscription(
-                        topic_name,
-                        subscription_name,
-                    )
-                except ApiException as err:
-                    _LOGGER.error("Error creatingPub/Sub subscription: %s", err)
-                    errors["base"] = "pubsub_api_error"
-                else:
-                    user_input[CONF_SUBSCRIPTION_NAME] = subscription_name
-            else:
-                # The user created this subscription themselves so do not delete when removing the integration.
-                user_input[CONF_SUBSCRIBER_ID_IMPORTED] = True
-
-            if not errors:
-                self._data.update(user_input)
-                subscriber = api.new_subscriber_with_token(
-                    self.hass,
-                    self._data["token"]["access_token"],
-                    self._data[CONF_PROJECT_ID],
-                    subscription_name,
-                )
                 try:
                     device_manager = await subscriber.async_get_device_manager()
                 except ApiException as err:
@@ -360,39 +281,23 @@ class NestFlowHandler(
                     self._structure_config_title = generate_config_title(
                         device_manager.structures.values()
                     )
+
+                self._data.update(
+                    {
+                        CONF_SUBSCRIBER_ID: subscriber_id,
+                        CONF_CLOUD_PROJECT_ID: cloud_project_id,
+                    }
+                )
                 return await self._async_finish()
 
-        subscriptions = {}
-        try:
-            eligible_subscriptions = (
-                await self._admin_client.list_eligible_subscriptions(
-                    expected_topic_name=self._data[CONF_TOPIC_NAME],
-                )
-            )
-        except ApiException as err:
-            _LOGGER.error(
-                "Error talking to API to list eligible Pub/Sub subscriptions: %s", err
-            )
-            errors["base"] = "pubsub_api_error"
-        else:
-            subscriptions.update(
-                {name: name for name in eligible_subscriptions.subscription_names}
-            )
-        subscriptions[CREATE_NEW_SUBSCRIPTION_KEY] = "Create New"
         return self.async_show_form(
-            step_id="pubsub_subscription",
+            step_id="pubsub",
             data_schema=vol.Schema(
                 {
-                    vol.Optional(
-                        CONF_SUBSCRIPTION_NAME,
-                        default=next(iter(subscriptions)),
-                    ): vol.In(subscriptions),
+                    vol.Required(CONF_CLOUD_PROJECT_ID, default=cloud_project_id): str,
                 }
             ),
-            description_placeholders={
-                "topic": self._data[CONF_TOPIC_NAME],
-                "more_info_url": MORE_INFO_URL,
-            },
+            description_placeholders={"url": CLOUD_CONSOLE_URL},
             errors=errors,
         )
 
diff --git a/homeassistant/components/nest/const.py b/homeassistant/components/nest/const.py
index 0a828dcbf78..853e778977d 100644
--- a/homeassistant/components/nest/const.py
+++ b/homeassistant/components/nest/const.py
@@ -4,14 +4,13 @@ DOMAIN = "nest"
 DATA_SDM = "sdm"
 DATA_SUBSCRIBER = "subscriber"
 DATA_DEVICE_MANAGER = "device_manager"
+DATA_NEST_CONFIG = "nest_config"
 
 WEB_AUTH_DOMAIN = DOMAIN
 INSTALLED_AUTH_DOMAIN = f"{DOMAIN}.installed"
 
 CONF_PROJECT_ID = "project_id"
-CONF_TOPIC_NAME = "topic_name"
-CONF_SUBSCRIPTION_NAME = "subscription_name"
-CONF_SUBSCRIBER_ID = "subscriber_id"  # Old format
+CONF_SUBSCRIBER_ID = "subscriber_id"
 CONF_SUBSCRIBER_ID_IMPORTED = "subscriber_id_imported"
 CONF_CLOUD_PROJECT_ID = "cloud_project_id"
 
diff --git a/homeassistant/components/nest/manifest.json b/homeassistant/components/nest/manifest.json
index 44eaeeaf62d..976e870cc83 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"],
   "quality_scale": "platinum",
-  "requirements": ["google-nest-sdm==6.1.5"]
+  "requirements": ["google-nest-sdm==6.1.3"]
 }
diff --git a/homeassistant/components/nest/strings.json b/homeassistant/components/nest/strings.json
index f6a64dd66e6..dd02818a0eb 100644
--- a/homeassistant/components/nest/strings.json
+++ b/homeassistant/components/nest/strings.json
@@ -26,26 +26,12 @@
         "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
       },
       "pubsub": {
-        "title": "Configure Google Cloud Pub/Sub",
-        "description": "Home Assistant uses Cloud Pub/Sub receive realtime Nest device updates. Nest servers publish updates to a Pub/Sub topic and Home Assistant receives the updates through a Pub/Sub subscription.\n\n1. Visit the [Device Access Console]({device_access_console_url}) and ensure a Pub/Sub topic is configured.\n2. Visit the [Cloud Console]({url}) to find your Google Cloud Project ID and confirm it is correct below.\n3. The next step will attempt to auto-discover Pub/Sub topics and subscriptions.\n\nSee the integration documentation for [more info]({more_info_url}).",
+        "title": "Configure Google Cloud",
+        "description": "Visit the [Cloud Console]({url}) to find your Google Cloud Project ID.",
         "data": {
           "cloud_project_id": "[%key:component::nest::config::step::cloud_project::data::cloud_project_id%]"
         }
       },
-      "pubsub_topic": {
-        "title": "Configure Cloud Pub/Sub topic",
-        "description": "Nest devices publish updates on a Cloud Pub/Sub topic. Select the Pub/Sub topic below that is the same as the [Device Access Console]({device_access_console_url}). See the integration documentation for [more info]({more_info_url}).",
-        "data": {
-          "topic_name": "Pub/Sub topic Name"
-        }
-      },
-      "pubsub_subscription": {
-        "title": "Configure Cloud Pub/Sub subscription",
-        "description": "Home Assistant receives realtime Nest device updates with a Cloud Pub/Sub subscription for topic `{topic}`.\n\nSelect an existing subscription below if one already exists, or the next step will create a new one for you. See the integration documentation for [more info]({more_info_url}).",
-        "data": {
-          "subscription_name": "Pub/Sub subscription Name"
-        }
-      },
       "reauth_confirm": {
         "title": "[%key:common::config_flow::title::reauth%]",
         "description": "The Nest integration needs to re-authenticate your account"
@@ -54,9 +40,7 @@
     "error": {
       "bad_project_id": "Please enter a valid Cloud Project ID (check Cloud Console)",
       "wrong_project_id": "Please enter a valid Cloud Project ID (was same as Device Access Project ID)",
-      "subscriber_error": "Unknown subscriber error, see logs",
-      "no_pubsub_topics": "No eligible Pub/Sub topics found, please ensure Device Access Console has a Pub/Sub topic.",
-      "pubsub_api_error": "Unknown error talking to Cloud Pub/Sub, see logs"
+      "subscriber_error": "Unknown subscriber error, see logs"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
diff --git a/homeassistant/components/netatmo/config_flow.py b/homeassistant/components/netatmo/config_flow.py
index d853694ffea..0da4d6f16b7 100644
--- a/homeassistant/components/netatmo/config_flow.py
+++ b/homeassistant/components/netatmo/config_flow.py
@@ -101,6 +101,7 @@ class NetatmoOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize Netatmo options flow."""
+        self.config_entry = config_entry
         self.options = dict(config_entry.options)
         self.options.setdefault(CONF_WEATHER_AREAS, {})
 
diff --git a/homeassistant/components/netgear/__init__.py b/homeassistant/components/netgear/__init__.py
index fa18c3510ba..58f63e5212a 100644
--- a/homeassistant/components/netgear/__init__.py
+++ b/homeassistant/components/netgear/__init__.py
@@ -93,7 +93,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{router.device_name} Devices",
         update_method=async_update_devices,
         update_interval=SCAN_INTERVAL,
@@ -101,7 +100,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator_traffic_meter = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{router.device_name} Traffic meter",
         update_method=async_update_traffic_meter,
         update_interval=SCAN_INTERVAL,
@@ -109,7 +107,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator_speed_test = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{router.device_name} Speed test",
         update_method=async_update_speed_test,
         update_interval=SPEED_TEST_INTERVAL,
@@ -117,7 +114,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator_firmware = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{router.device_name} Firmware",
         update_method=async_check_firmware,
         update_interval=SCAN_INTERVAL_FIRMWARE,
@@ -125,7 +121,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator_utilization = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{router.device_name} Utilization",
         update_method=async_update_utilization,
         update_interval=SCAN_INTERVAL,
@@ -133,7 +128,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator_link = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"{router.device_name} Ethernet Link Status",
         update_method=async_check_link_status,
         update_interval=SCAN_INTERVAL,
diff --git a/homeassistant/components/netgear/config_flow.py b/homeassistant/components/netgear/config_flow.py
index 965e3618645..fba934af38d 100644
--- a/homeassistant/components/netgear/config_flow.py
+++ b/homeassistant/components/netgear/config_flow.py
@@ -63,6 +63,10 @@ def _ordered_shared_schema(schema_input):
 class OptionsFlowHandler(OptionsFlow):
     """Options for the component."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Init object."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, int] | None = None
     ) -> ConfigFlowResult:
@@ -105,7 +109,7 @@ class NetgearFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def _show_setup_form(
         self,
diff --git a/homeassistant/components/network/websocket.py b/homeassistant/components/network/websocket.py
index 22f7dc23f1e..b97bd2d58d1 100644
--- a/homeassistant/components/network/websocket.py
+++ b/homeassistant/components/network/websocket.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from contextlib import suppress
 from typing import Any
 
 import voluptuous as vol
@@ -10,7 +9,6 @@ import voluptuous as vol
 from homeassistant.components import websocket_api
 from homeassistant.components.websocket_api import ActiveConnection
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.network import NoURLAvailableError, get_url
 
 from .const import ATTR_ADAPTERS, ATTR_CONFIGURED_ADAPTERS, NETWORK_CONFIG_SCHEMA
 from .network import async_get_network
@@ -21,7 +19,6 @@ def async_register_websocket_commands(hass: HomeAssistant) -> None:
     """Register network websocket commands."""
     websocket_api.async_register_command(hass, websocket_network_adapters)
     websocket_api.async_register_command(hass, websocket_network_adapters_configure)
-    websocket_api.async_register_command(hass, websocket_network_url)
 
 
 @websocket_api.require_admin
@@ -65,40 +62,3 @@ async def websocket_network_adapters_configure(
         msg["id"],
         {ATTR_CONFIGURED_ADAPTERS: network.configured_adapters},
     )
-
-
-@callback
-@websocket_api.require_admin
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "network/url",
-    }
-)
-def websocket_network_url(
-    hass: HomeAssistant,
-    connection: ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Get the internal, external, and cloud URLs."""
-    internal_url = None
-    external_url = None
-    cloud_url = None
-    with suppress(NoURLAvailableError):
-        internal_url = get_url(
-            hass, allow_internal=True, allow_external=False, allow_cloud=False
-        )
-    with suppress(NoURLAvailableError):
-        external_url = get_url(
-            hass, allow_internal=False, allow_external=True, prefer_external=True
-        )
-    with suppress(NoURLAvailableError):
-        cloud_url = get_url(hass, allow_internal=False, require_cloud=True)
-
-    connection.send_result(
-        msg["id"],
-        {
-            "internal": internal_url,
-            "external": external_url,
-            "cloud": cloud_url,
-        },
-    )
diff --git a/homeassistant/components/nexia/switch.py b/homeassistant/components/nexia/switch.py
index 9505538e86a..f92443517c8 100644
--- a/homeassistant/components/nexia/switch.py
+++ b/homeassistant/components/nexia/switch.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .coordinator import NexiaDataUpdateCoordinator
-from .entity import NexiaThermostatEntity, NexiaThermostatZoneEntity
+from .entity import NexiaThermostatZoneEntity
 from .types import NexiaConfigEntry
 
 
@@ -28,11 +28,11 @@ async def async_setup_entry(
     entities: list[NexiaHoldSwitch | NexiaEmergencyHeatSwitch] = []
     for thermostat_id in nexia_home.get_thermostat_ids():
         thermostat: NexiaThermostat = nexia_home.get_thermostat_by_id(thermostat_id)
-        if thermostat.has_emergency_heat():
-            entities.append(NexiaEmergencyHeatSwitch(coordinator, thermostat))
         for zone_id in thermostat.get_zone_ids():
             zone: NexiaThermostatZone = thermostat.get_zone_by_id(zone_id)
             entities.append(NexiaHoldSwitch(coordinator, zone))
+            if thermostat.has_emergency_heat():
+                entities.append(NexiaEmergencyHeatSwitch(coordinator, zone))
 
     async_add_entities(entities)
 
@@ -68,20 +68,17 @@ class NexiaHoldSwitch(NexiaThermostatZoneEntity, SwitchEntity):
         self._signal_zone_update()
 
 
-class NexiaEmergencyHeatSwitch(NexiaThermostatEntity, SwitchEntity):
+class NexiaEmergencyHeatSwitch(NexiaThermostatZoneEntity, SwitchEntity):
     """Provides Nexia emergency heat switch support."""
 
     _attr_translation_key = "emergency_heat"
 
     def __init__(
-        self, coordinator: NexiaDataUpdateCoordinator, thermostat: NexiaThermostat
+        self, coordinator: NexiaDataUpdateCoordinator, zone: NexiaThermostatZone
     ) -> None:
         """Initialize the emergency heat mode switch."""
-        super().__init__(
-            coordinator,
-            thermostat,
-            unique_id=f"{thermostat.thermostat_id}_emergency_heat",
-        )
+        zone_id = zone.zone_id
+        super().__init__(coordinator, zone, zone_id)
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/nice_go/const.py b/homeassistant/components/nice_go/const.py
index a6635368f7b..c3caa92c8be 100644
--- a/homeassistant/components/nice_go/const.py
+++ b/homeassistant/components/nice_go/const.py
@@ -2,8 +2,6 @@
 
 from datetime import timedelta
 
-from homeassistant.const import Platform
-
 DOMAIN = "nice_go"
 
 # Configuration
@@ -13,22 +11,3 @@ CONF_REFRESH_TOKEN = "refresh_token"
 CONF_REFRESH_TOKEN_CREATION_TIME = "refresh_token_creation_time"
 
 REFRESH_TOKEN_EXPIRY_TIME = timedelta(days=30)
-
-SUPPORTED_DEVICE_TYPES = {
-    Platform.LIGHT: ["WallStation"],
-    Platform.SWITCH: ["WallStation"],
-}
-KNOWN_UNSUPPORTED_DEVICE_TYPES = {
-    Platform.LIGHT: ["Mms100"],
-    Platform.SWITCH: ["Mms100"],
-}
-
-UNSUPPORTED_DEVICE_WARNING = (
-    "Device '%s' has unknown device type '%s', "
-    "which is not supported by this integration. "
-    "We try to support it with a cover and event entity, but nothing else. "
-    "Please create an issue with your device model in additional info"
-    " at https://github.com/home-assistant/core/issues/new"
-    "?assignees=&labels=&projects=&template=bug_report.yml"
-    "&title=New%%20Nice%%20G.O.%%20device%%20type%%20'%s'%%20found"
-)
diff --git a/homeassistant/components/nice_go/coordinator.py b/homeassistant/components/nice_go/coordinator.py
index 29c0d8233fe..dd2d7ccb45e 100644
--- a/homeassistant/components/nice_go/coordinator.py
+++ b/homeassistant/components/nice_go/coordinator.py
@@ -44,14 +44,13 @@ RECONNECT_DELAY = 5
 class NiceGODevice:
     """Nice G.O. device dataclass."""
 
-    type: str
     id: str
     name: str
     barrier_status: str
     light_status: bool | None
     fw_version: str
     connected: bool
-    vacation_mode: bool | None
+    vacation_mode: bool
 
 
 class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
@@ -86,9 +85,7 @@ class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
         """Stop reconnecting if hass is stopping."""
         self._hass_stopping = True
 
-    async def _parse_barrier(
-        self, device_type: str, barrier_state: BarrierState
-    ) -> NiceGODevice | None:
+    async def _parse_barrier(self, barrier_state: BarrierState) -> NiceGODevice | None:
         """Parse barrier data."""
 
         device_id = barrier_state.deviceId
@@ -124,15 +121,11 @@ class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
         fw_version = barrier_state.reported["deviceFwVersion"]
         if barrier_state.connectionState:
             connected = barrier_state.connectionState.connected
-        elif device_type == "Mms100":
-            connected = barrier_state.reported.get("radioConnected", 0) == 1
         else:
-            # Assume connected
-            connected = True
-        vacation_mode = barrier_state.reported.get("vcnMode", None)
+            connected = False
+        vacation_mode = barrier_state.reported["vcnMode"]
 
         return NiceGODevice(
-            type=device_type,
             id=device_id,
             name=name,
             barrier_status=barrier_status,
@@ -163,8 +156,7 @@ class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
 
                 barriers = await self.api.get_all_barriers()
                 parsed_barriers = [
-                    await self._parse_barrier(barrier.type, barrier.state)
-                    for barrier in barriers
+                    await self._parse_barrier(barrier.state) for barrier in barriers
                 ]
 
                 # Parse the barriers and save them in a dictionary
@@ -234,9 +226,6 @@ class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
         _LOGGER.debug(data)
         raw_data = data["data"]["devicesStatesUpdateFeed"]["item"]
         parsed_data = await self._parse_barrier(
-            self.data[
-                raw_data["deviceId"]
-            ].type,  # Device type is not sent in device state update, and it can't change, so we just reuse the existing one
             BarrierState(
                 deviceId=raw_data["deviceId"],
                 desired=json.loads(raw_data["desired"]),
@@ -249,7 +238,7 @@ class NiceGOUpdateCoordinator(DataUpdateCoordinator[dict[str, NiceGODevice]]):
                 else None,
                 version=raw_data["version"],
                 timestamp=raw_data["timestamp"],
-            ),
+            )
         )
         if parsed_data is None:
             return
diff --git a/homeassistant/components/nice_go/cover.py b/homeassistant/components/nice_go/cover.py
index a823e931804..7ded43de165 100644
--- a/homeassistant/components/nice_go/cover.py
+++ b/homeassistant/components/nice_go/cover.py
@@ -18,10 +18,6 @@ from . import NiceGOConfigEntry
 from .const import DOMAIN
 from .entity import NiceGOEntity
 
-DEVICE_CLASSES = {
-    "WallStation": CoverDeviceClass.GARAGE,
-    "Mms100": CoverDeviceClass.GATE,
-}
 PARALLEL_UPDATES = 1
 
 
@@ -44,11 +40,7 @@ class NiceGOCoverEntity(NiceGOEntity, CoverEntity):
 
     _attr_supported_features = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
     _attr_name = None
-
-    @property
-    def device_class(self) -> CoverDeviceClass:
-        """Return the class of this device, from component DEVICE_CLASSES."""
-        return DEVICE_CLASSES.get(self.data.type, CoverDeviceClass.GARAGE)
+    _attr_device_class = CoverDeviceClass.GARAGE
 
     @property
     def is_closed(self) -> bool:
diff --git a/homeassistant/components/nice_go/light.py b/homeassistant/components/nice_go/light.py
index abb192adde1..6b5f5cd39ee 100644
--- a/homeassistant/components/nice_go/light.py
+++ b/homeassistant/components/nice_go/light.py
@@ -1,28 +1,19 @@
 """Nice G.O. light."""
 
-import logging
 from typing import TYPE_CHECKING, Any
 
 from aiohttp import ClientError
 from nice_go import ApiError
 
 from homeassistant.components.light import ColorMode, LightEntity
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import NiceGOConfigEntry
-from .const import (
-    DOMAIN,
-    KNOWN_UNSUPPORTED_DEVICE_TYPES,
-    SUPPORTED_DEVICE_TYPES,
-    UNSUPPORTED_DEVICE_WARNING,
-)
+from .const import DOMAIN
 from .entity import NiceGOEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -33,20 +24,11 @@ async def async_setup_entry(
 
     coordinator = config_entry.runtime_data
 
-    entities = []
-
-    for device_id, device_data in coordinator.data.items():
-        if device_data.type in SUPPORTED_DEVICE_TYPES[Platform.LIGHT]:
-            entities.append(NiceGOLightEntity(coordinator, device_id, device_data.name))
-        elif device_data.type not in KNOWN_UNSUPPORTED_DEVICE_TYPES[Platform.LIGHT]:
-            _LOGGER.warning(
-                UNSUPPORTED_DEVICE_WARNING,
-                device_data.name,
-                device_data.type,
-                device_data.type,
-            )
-
-    async_add_entities(entities)
+    async_add_entities(
+        NiceGOLightEntity(coordinator, device_id, device_data.name)
+        for device_id, device_data in coordinator.data.items()
+        if device_data.light_status is not None
+    )
 
 
 class NiceGOLightEntity(NiceGOEntity, LightEntity):
diff --git a/homeassistant/components/nice_go/manifest.json b/homeassistant/components/nice_go/manifest.json
index 817d7ef9bc9..d3f54e5e668 100644
--- a/homeassistant/components/nice_go/manifest.json
+++ b/homeassistant/components/nice_go/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["nice_go"],
-  "requirements": ["nice-go==0.3.10"]
+  "requirements": ["nice-go==0.3.9"]
 }
diff --git a/homeassistant/components/nice_go/switch.py b/homeassistant/components/nice_go/switch.py
index e3b85528f3b..a74a18328c9 100644
--- a/homeassistant/components/nice_go/switch.py
+++ b/homeassistant/components/nice_go/switch.py
@@ -3,24 +3,18 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from aiohttp import ClientError
 from nice_go import ApiError
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import NiceGOConfigEntry
-from .const import (
-    DOMAIN,
-    KNOWN_UNSUPPORTED_DEVICE_TYPES,
-    SUPPORTED_DEVICE_TYPES,
-    UNSUPPORTED_DEVICE_WARNING,
-)
+from .const import DOMAIN
 from .entity import NiceGOEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -34,22 +28,10 @@ async def async_setup_entry(
     """Set up Nice G.O. switch."""
     coordinator = config_entry.runtime_data
 
-    entities = []
-
-    for device_id, device_data in coordinator.data.items():
-        if device_data.type in SUPPORTED_DEVICE_TYPES[Platform.SWITCH]:
-            entities.append(
-                NiceGOSwitchEntity(coordinator, device_id, device_data.name)
-            )
-        elif device_data.type not in KNOWN_UNSUPPORTED_DEVICE_TYPES[Platform.SWITCH]:
-            _LOGGER.warning(
-                UNSUPPORTED_DEVICE_WARNING,
-                device_data.name,
-                device_data.type,
-                device_data.type,
-            )
-
-    async_add_entities(entities)
+    async_add_entities(
+        NiceGOSwitchEntity(coordinator, device_id, device_data.name)
+        for device_id, device_data in coordinator.data.items()
+    )
 
 
 class NiceGOSwitchEntity(NiceGOEntity, SwitchEntity):
@@ -61,8 +43,6 @@ class NiceGOSwitchEntity(NiceGOEntity, SwitchEntity):
     @property
     def is_on(self) -> bool:
         """Return if switch is on."""
-        if TYPE_CHECKING:
-            assert self.data.vacation_mode is not None
         return self.data.vacation_mode
 
     async def async_turn_on(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/nightscout/sensor.py b/homeassistant/components/nightscout/sensor.py
index 620349ec3c3..92291bdc4f9 100644
--- a/homeassistant/components/nightscout/sensor.py
+++ b/homeassistant/components/nightscout/sensor.py
@@ -9,9 +9,9 @@ from typing import Any
 from aiohttp import ClientError
 from py_nightscout import Api as NightscoutAPI
 
-from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_DATE, UnitOfBloodGlucoseConcentration
+from homeassistant.const import ATTR_DATE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -37,10 +37,7 @@ async def async_setup_entry(
 class NightscoutSensor(SensorEntity):
     """Implementation of a Nightscout sensor."""
 
-    _attr_device_class = SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION
-    _attr_native_unit_of_measurement = (
-        UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER
-    )
+    _attr_native_unit_of_measurement = "mg/dL"
     _attr_icon = "mdi:cloud-question"
 
     def __init__(self, api: NightscoutAPI, name: str, unique_id: str | None) -> None:
diff --git a/homeassistant/components/nina/config_flow.py b/homeassistant/components/nina/config_flow.py
index a1ba9ae0c61..dd4319d566b 100644
--- a/homeassistant/components/nina/config_flow.py
+++ b/homeassistant/components/nina/config_flow.py
@@ -171,7 +171,8 @@ class OptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
-        self.data = dict(config_entry.data)
+        self.config_entry = config_entry
+        self.data = dict(self.config_entry.data)
 
         self._all_region_codes_sorted: dict[str, str] = {}
         self.regions: dict[str, dict[str, Any]] = {}
diff --git a/homeassistant/components/nina/strings.json b/homeassistant/components/nina/strings.json
index 98ea88d8798..9747feaddb7 100644
--- a/homeassistant/components/nina/strings.json
+++ b/homeassistant/components/nina/strings.json
@@ -38,10 +38,12 @@
         }
       }
     },
+    "abort": {
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
     "error": {
       "no_selection": "[%key:component::nina::config::error::no_selection%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
 }
diff --git a/homeassistant/components/nmap_tracker/config_flow.py b/homeassistant/components/nmap_tracker/config_flow.py
index e05150995aa..b724dca1a81 100644
--- a/homeassistant/components/nmap_tracker/config_flow.py
+++ b/homeassistant/components/nmap_tracker/config_flow.py
@@ -213,6 +213,6 @@ class NmapTrackerConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
         return OptionsFlowHandler(config_entry)
diff --git a/homeassistant/components/nmap_tracker/manifest.json b/homeassistant/components/nmap_tracker/manifest.json
index 5b2dab50812..08d9b94cf2d 100644
--- a/homeassistant/components/nmap_tracker/manifest.json
+++ b/homeassistant/components/nmap_tracker/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nmap_tracker",
   "iot_class": "local_polling",
   "loggers": ["nmap"],
-  "requirements": ["netmap==0.7.0.2", "getmac==0.9.4", "aiooui==0.1.7"]
+  "requirements": ["netmap==0.7.0.2", "getmac==0.9.4", "aiooui==0.1.6"]
 }
diff --git a/homeassistant/components/nobo_hub/config_flow.py b/homeassistant/components/nobo_hub/config_flow.py
index 7e1ae4c1d9b..8aed520f21e 100644
--- a/homeassistant/components/nobo_hub/config_flow.py
+++ b/homeassistant/components/nobo_hub/config_flow.py
@@ -175,7 +175,7 @@ class NoboHubConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class NoboHubConnectError(HomeAssistantError):
@@ -190,6 +190,10 @@ class NoboHubConnectError(HomeAssistantError):
 class OptionsFlowHandler(OptionsFlow):
     """Handles options flow for the component."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize the options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(self, user_input=None) -> ConfigFlowResult:
         """Manage the options."""
 
diff --git a/homeassistant/components/nordpool/__init__.py b/homeassistant/components/nordpool/__init__.py
deleted file mode 100644
index b688bf74a37..00000000000
--- a/homeassistant/components/nordpool/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""The Nord Pool component."""
-
-from __future__ import annotations
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.util import dt as dt_util
-
-from .const import PLATFORMS
-from .coordinator import NordPoolDataUpdateCoordinator
-
-type NordPoolConfigEntry = ConfigEntry[NordPoolDataUpdateCoordinator]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: NordPoolConfigEntry) -> bool:
-    """Set up Nord Pool from a config entry."""
-
-    coordinator = NordPoolDataUpdateCoordinator(hass, entry)
-    await coordinator.fetch_data(dt_util.utcnow())
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: NordPoolConfigEntry) -> bool:
-    """Unload Nord Pool config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/nordpool/config_flow.py b/homeassistant/components/nordpool/config_flow.py
deleted file mode 100644
index 1d75d825e47..00000000000
--- a/homeassistant/components/nordpool/config_flow.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""Adds config flow for Nord Pool integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from pynordpool import (
-    Currency,
-    NordPoolClient,
-    NordPoolEmptyResponseError,
-    NordPoolError,
-)
-from pynordpool.const import AREAS
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_CURRENCY
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import (
-    SelectOptionDict,
-    SelectSelector,
-    SelectSelectorConfig,
-    SelectSelectorMode,
-)
-from homeassistant.util import dt as dt_util
-
-from .const import CONF_AREAS, DEFAULT_NAME, DOMAIN
-
-SELECT_AREAS = [
-    SelectOptionDict(value=area, label=name) for area, name in AREAS.items()
-]
-SELECT_CURRENCY = [currency.value for currency in Currency]
-
-DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_AREAS, default=[]): SelectSelector(
-            SelectSelectorConfig(
-                options=SELECT_AREAS,
-                multiple=True,
-                mode=SelectSelectorMode.DROPDOWN,
-                sort=True,
-            )
-        ),
-        vol.Required(CONF_CURRENCY, default="SEK"): SelectSelector(
-            SelectSelectorConfig(
-                options=SELECT_CURRENCY,
-                multiple=False,
-                mode=SelectSelectorMode.DROPDOWN,
-                sort=True,
-            )
-        ),
-    }
-)
-
-
-async def test_api(hass: HomeAssistant, user_input: dict[str, Any]) -> dict[str, str]:
-    """Test fetch data from Nord Pool."""
-    client = NordPoolClient(async_get_clientsession(hass))
-    try:
-        await client.async_get_delivery_period(
-            dt_util.now(),
-            Currency(user_input[CONF_CURRENCY]),
-            user_input[CONF_AREAS],
-        )
-    except NordPoolEmptyResponseError:
-        return {"base": "no_data"}
-    except NordPoolError:
-        return {"base": "cannot_connect"}
-
-    return {}
-
-
-class NordpoolConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Nord Pool integration."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        if user_input:
-            errors = await test_api(self.hass, user_input)
-            if not errors:
-                return self.async_create_entry(
-                    title=DEFAULT_NAME,
-                    data=user_input,
-                )
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=DATA_SCHEMA,
-            errors=errors,
-        )
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the reconfiguration step."""
-        errors: dict[str, str] = {}
-        if user_input:
-            errors = await test_api(self.hass, user_input)
-            reconfigure_entry = self._get_reconfigure_entry()
-            if not errors:
-                return self.async_update_reload_and_abort(
-                    reconfigure_entry, data_updates=user_input
-                )
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=DATA_SCHEMA,
-            errors=errors,
-        )
diff --git a/homeassistant/components/nordpool/const.py b/homeassistant/components/nordpool/const.py
deleted file mode 100644
index 19a978d946c..00000000000
--- a/homeassistant/components/nordpool/const.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""Constants for Nord Pool."""
-
-import logging
-
-from homeassistant.const import Platform
-
-LOGGER = logging.getLogger(__package__)
-
-DEFAULT_SCAN_INTERVAL = 60
-DOMAIN = "nordpool"
-PLATFORMS = [Platform.SENSOR]
-DEFAULT_NAME = "Nord Pool"
-
-CONF_AREAS = "areas"
diff --git a/homeassistant/components/nordpool/coordinator.py b/homeassistant/components/nordpool/coordinator.py
deleted file mode 100644
index fa4e9ca2548..00000000000
--- a/homeassistant/components/nordpool/coordinator.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""DataUpdateCoordinator for the Nord Pool integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from datetime import datetime, timedelta
-from typing import TYPE_CHECKING
-
-from pynordpool import (
-    Currency,
-    DeliveryPeriodData,
-    NordPoolClient,
-    NordPoolEmptyResponseError,
-    NordPoolError,
-    NordPoolResponseError,
-)
-
-from homeassistant.const import CONF_CURRENCY
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.event import async_track_point_in_utc_time
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-from homeassistant.util import dt as dt_util
-
-from .const import CONF_AREAS, DOMAIN, LOGGER
-
-if TYPE_CHECKING:
-    from . import NordPoolConfigEntry
-
-
-class NordPoolDataUpdateCoordinator(DataUpdateCoordinator[DeliveryPeriodData]):
-    """A Nord Pool Data Update Coordinator."""
-
-    config_entry: NordPoolConfigEntry
-
-    def __init__(self, hass: HomeAssistant, config_entry: NordPoolConfigEntry) -> None:
-        """Initialize the Nord Pool coordinator."""
-        super().__init__(
-            hass,
-            LOGGER,
-            config_entry=config_entry,
-            name=DOMAIN,
-        )
-        self.client = NordPoolClient(session=async_get_clientsession(hass))
-        self.unsub: Callable[[], None] | None = None
-
-    def get_next_interval(self, now: datetime) -> datetime:
-        """Compute next time an update should occur."""
-        next_hour = dt_util.utcnow() + timedelta(hours=1)
-        next_run = datetime(
-            next_hour.year,
-            next_hour.month,
-            next_hour.day,
-            next_hour.hour,
-            tzinfo=dt_util.UTC,
-        )
-        LOGGER.debug("Next update at %s", next_run)
-        return next_run
-
-    async def async_shutdown(self) -> None:
-        """Cancel any scheduled call, and ignore new runs."""
-        await super().async_shutdown()
-        if self.unsub:
-            self.unsub()
-            self.unsub = None
-
-    async def fetch_data(self, now: datetime) -> None:
-        """Fetch data from Nord Pool."""
-        self.unsub = async_track_point_in_utc_time(
-            self.hass, self.fetch_data, self.get_next_interval(dt_util.utcnow())
-        )
-        try:
-            data = await self.client.async_get_delivery_period(
-                dt_util.now(),
-                Currency(self.config_entry.data[CONF_CURRENCY]),
-                self.config_entry.data[CONF_AREAS],
-            )
-        except NordPoolEmptyResponseError as error:
-            LOGGER.debug("Empty response error: %s", error)
-            self.async_set_update_error(error)
-            return
-        except NordPoolResponseError as error:
-            LOGGER.debug("Response error: %s", error)
-            self.async_set_update_error(error)
-            return
-        except NordPoolError as error:
-            LOGGER.debug("Connection error: %s", error)
-            self.async_set_update_error(error)
-            return
-
-        self.async_set_updated_data(data)
diff --git a/homeassistant/components/nordpool/diagnostics.py b/homeassistant/components/nordpool/diagnostics.py
deleted file mode 100644
index 3160c2bfa6d..00000000000
--- a/homeassistant/components/nordpool/diagnostics.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""Diagnostics support for Nord Pool."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.core import HomeAssistant
-
-from . import NordPoolConfigEntry
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: NordPoolConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for Nord Pool config entry."""
-    return {"raw": entry.runtime_data.data.raw}
diff --git a/homeassistant/components/nordpool/entity.py b/homeassistant/components/nordpool/entity.py
deleted file mode 100644
index 32240aad12c..00000000000
--- a/homeassistant/components/nordpool/entity.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""Base entity for Nord Pool."""
-
-from __future__ import annotations
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import NordPoolDataUpdateCoordinator
-
-
-class NordpoolBaseEntity(CoordinatorEntity[NordPoolDataUpdateCoordinator]):
-    """Representation of a Nord Pool base entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: NordPoolDataUpdateCoordinator,
-        entity_description: EntityDescription,
-        area: str,
-    ) -> None:
-        """Initiate Nord Pool base entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._attr_unique_id = f"{area}-{entity_description.key}"
-        self.area = area
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, area)},
-            name=f"Nord Pool {area}",
-        )
diff --git a/homeassistant/components/nordpool/icons.json b/homeassistant/components/nordpool/icons.json
deleted file mode 100644
index 85434a2d09b..00000000000
--- a/homeassistant/components/nordpool/icons.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "entity": {
-    "sensor": {
-      "updated_at": {
-        "default": "mdi:clock-outline"
-      },
-      "currency": {
-        "default": "mdi:currency-usd"
-      },
-      "exchange_rate": {
-        "default": "mdi:currency-usd"
-      },
-      "current_price": {
-        "default": "mdi:cash"
-      },
-      "last_price": {
-        "default": "mdi:cash"
-      },
-      "next_price": {
-        "default": "mdi:cash"
-      },
-      "block_average": {
-        "default": "mdi:cash-multiple"
-      },
-      "block_min": {
-        "default": "mdi:cash-multiple"
-      },
-      "block_max": {
-        "default": "mdi:cash-multiple"
-      },
-      "block_start_time": {
-        "default": "mdi:clock-time-twelve-outline"
-      },
-      "block_end_time": {
-        "default": "mdi:clock-time-two-outline"
-      },
-      "daily_average": {
-        "default": "mdi:cash-multiple"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/nordpool/manifest.json b/homeassistant/components/nordpool/manifest.json
deleted file mode 100644
index bf093eb3ee9..00000000000
--- a/homeassistant/components/nordpool/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "domain": "nordpool",
-  "name": "Nord Pool",
-  "codeowners": ["@gjohansson-ST"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/nordpool",
-  "integration_type": "hub",
-  "iot_class": "cloud_polling",
-  "loggers": ["pynordpool"],
-  "requirements": ["pynordpool==0.2.2"],
-  "single_config_entry": true
-}
diff --git a/homeassistant/components/nordpool/sensor.py b/homeassistant/components/nordpool/sensor.py
deleted file mode 100644
index e7e655a6657..00000000000
--- a/homeassistant/components/nordpool/sensor.py
+++ /dev/null
@@ -1,328 +0,0 @@
-"""Sensor platform for Nord Pool integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from datetime import datetime, timedelta
-
-from pynordpool import DeliveryPeriodData
-
-from homeassistant.components.sensor import (
-    EntityCategory,
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt as dt_util, slugify
-
-from . import NordPoolConfigEntry
-from .const import LOGGER
-from .coordinator import NordPoolDataUpdateCoordinator
-from .entity import NordpoolBaseEntity
-
-PARALLEL_UPDATES = 0
-
-
-def get_prices(data: DeliveryPeriodData) -> dict[str, tuple[float, float, float]]:
-    """Return previous, current and next prices.
-
-    Output: {"SE3": (10.0, 10.5, 12.1)}
-    """
-    last_price_entries: dict[str, float] = {}
-    current_price_entries: dict[str, float] = {}
-    next_price_entries: dict[str, float] = {}
-    current_time = dt_util.utcnow()
-    previous_time = current_time - timedelta(hours=1)
-    next_time = current_time + timedelta(hours=1)
-    price_data = data.entries
-    for entry in price_data:
-        if entry.start <= current_time <= entry.end:
-            current_price_entries = entry.entry
-        if entry.start <= previous_time <= entry.end:
-            last_price_entries = entry.entry
-        if entry.start <= next_time <= entry.end:
-            next_price_entries = entry.entry
-
-    result = {}
-    for area, price in current_price_entries.items():
-        result[area] = (last_price_entries[area], price, next_price_entries[area])
-    LOGGER.debug("Prices: %s", result)
-    return result
-
-
-def get_blockprices(
-    data: DeliveryPeriodData,
-) -> dict[str, dict[str, tuple[datetime, datetime, float, float, float]]]:
-    """Return average, min and max for block prices.
-
-    Output: {"SE3": {"Off-peak 1": (_datetime_, _datetime_, 9.3, 10.5, 12.1)}}
-    """
-    result: dict[str, dict[str, tuple[datetime, datetime, float, float, float]]] = {}
-    block_prices = data.block_prices
-    for entry in block_prices:
-        for _area in entry.average:
-            if _area not in result:
-                result[_area] = {}
-            result[_area][entry.name] = (
-                entry.start,
-                entry.end,
-                entry.average[_area]["average"],
-                entry.average[_area]["min"],
-                entry.average[_area]["max"],
-            )
-
-    LOGGER.debug("Block prices: %s", result)
-    return result
-
-
-@dataclass(frozen=True, kw_only=True)
-class NordpoolDefaultSensorEntityDescription(SensorEntityDescription):
-    """Describes Nord Pool default sensor entity."""
-
-    value_fn: Callable[[DeliveryPeriodData], str | float | datetime | None]
-
-
-@dataclass(frozen=True, kw_only=True)
-class NordpoolPricesSensorEntityDescription(SensorEntityDescription):
-    """Describes Nord Pool prices sensor entity."""
-
-    value_fn: Callable[[tuple[float, float, float]], float | None]
-
-
-@dataclass(frozen=True, kw_only=True)
-class NordpoolBlockPricesSensorEntityDescription(SensorEntityDescription):
-    """Describes Nord Pool block prices sensor entity."""
-
-    value_fn: Callable[
-        [tuple[datetime, datetime, float, float, float]], float | datetime | None
-    ]
-
-
-DEFAULT_SENSOR_TYPES: tuple[NordpoolDefaultSensorEntityDescription, ...] = (
-    NordpoolDefaultSensorEntityDescription(
-        key="updated_at",
-        translation_key="updated_at",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=lambda data: data.updated_at,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    NordpoolDefaultSensorEntityDescription(
-        key="currency",
-        translation_key="currency",
-        value_fn=lambda data: data.currency,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    NordpoolDefaultSensorEntityDescription(
-        key="exchange_rate",
-        translation_key="exchange_rate",
-        value_fn=lambda data: data.exchange_rate,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-)
-PRICES_SENSOR_TYPES: tuple[NordpoolPricesSensorEntityDescription, ...] = (
-    NordpoolPricesSensorEntityDescription(
-        key="current_price",
-        translation_key="current_price",
-        value_fn=lambda data: data[1] / 1000,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
-    ),
-    NordpoolPricesSensorEntityDescription(
-        key="last_price",
-        translation_key="last_price",
-        value_fn=lambda data: data[0] / 1000,
-        suggested_display_precision=2,
-    ),
-    NordpoolPricesSensorEntityDescription(
-        key="next_price",
-        translation_key="next_price",
-        value_fn=lambda data: data[2] / 1000,
-        suggested_display_precision=2,
-    ),
-)
-BLOCK_PRICES_SENSOR_TYPES: tuple[NordpoolBlockPricesSensorEntityDescription, ...] = (
-    NordpoolBlockPricesSensorEntityDescription(
-        key="block_average",
-        translation_key="block_average",
-        value_fn=lambda data: data[2] / 1000,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
-        entity_registry_enabled_default=False,
-    ),
-    NordpoolBlockPricesSensorEntityDescription(
-        key="block_min",
-        translation_key="block_min",
-        value_fn=lambda data: data[3] / 1000,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
-        entity_registry_enabled_default=False,
-    ),
-    NordpoolBlockPricesSensorEntityDescription(
-        key="block_max",
-        translation_key="block_max",
-        value_fn=lambda data: data[4] / 1000,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
-        entity_registry_enabled_default=False,
-    ),
-    NordpoolBlockPricesSensorEntityDescription(
-        key="block_start_time",
-        translation_key="block_start_time",
-        value_fn=lambda data: data[0],
-        device_class=SensorDeviceClass.TIMESTAMP,
-        entity_registry_enabled_default=False,
-    ),
-    NordpoolBlockPricesSensorEntityDescription(
-        key="block_end_time",
-        translation_key="block_end_time",
-        value_fn=lambda data: data[1],
-        device_class=SensorDeviceClass.TIMESTAMP,
-        entity_registry_enabled_default=False,
-    ),
-)
-DAILY_AVERAGE_PRICES_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
-    SensorEntityDescription(
-        key="daily_average",
-        translation_key="daily_average",
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
-        entity_registry_enabled_default=False,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: NordPoolConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Nord Pool sensor platform."""
-
-    coordinator = entry.runtime_data
-
-    entities: list[NordpoolBaseEntity] = []
-    currency = entry.runtime_data.data.currency
-
-    for area in get_prices(entry.runtime_data.data):
-        LOGGER.debug("Setting up base sensors for area %s", area)
-        entities.extend(
-            NordpoolSensor(coordinator, description, area)
-            for description in DEFAULT_SENSOR_TYPES
-        )
-        LOGGER.debug(
-            "Setting up price sensors for area %s with currency %s", area, currency
-        )
-        entities.extend(
-            NordpoolPriceSensor(coordinator, description, area, currency)
-            for description in PRICES_SENSOR_TYPES
-        )
-        entities.extend(
-            NordpoolDailyAveragePriceSensor(coordinator, description, area, currency)
-            for description in DAILY_AVERAGE_PRICES_SENSOR_TYPES
-        )
-        for block_name in get_blockprices(coordinator.data)[area]:
-            LOGGER.debug(
-                "Setting up block price sensors for area %s with currency %s in block %s",
-                area,
-                currency,
-                block_name,
-            )
-            entities.extend(
-                NordpoolBlockPriceSensor(
-                    coordinator, description, area, currency, block_name
-                )
-                for description in BLOCK_PRICES_SENSOR_TYPES
-            )
-    async_add_entities(entities)
-
-
-class NordpoolSensor(NordpoolBaseEntity, SensorEntity):
-    """Representation of a Nord Pool sensor."""
-
-    entity_description: NordpoolDefaultSensorEntityDescription
-
-    @property
-    def native_value(self) -> str | float | datetime | None:
-        """Return value of sensor."""
-        return self.entity_description.value_fn(self.coordinator.data)
-
-
-class NordpoolPriceSensor(NordpoolBaseEntity, SensorEntity):
-    """Representation of a Nord Pool price sensor."""
-
-    entity_description: NordpoolPricesSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: NordPoolDataUpdateCoordinator,
-        entity_description: NordpoolPricesSensorEntityDescription,
-        area: str,
-        currency: str,
-    ) -> None:
-        """Initiate Nord Pool sensor."""
-        super().__init__(coordinator, entity_description, area)
-        self._attr_native_unit_of_measurement = f"{currency}/kWh"
-
-    @property
-    def native_value(self) -> float | None:
-        """Return value of sensor."""
-        return self.entity_description.value_fn(
-            get_prices(self.coordinator.data)[self.area]
-        )
-
-
-class NordpoolBlockPriceSensor(NordpoolBaseEntity, SensorEntity):
-    """Representation of a Nord Pool block price sensor."""
-
-    entity_description: NordpoolBlockPricesSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: NordPoolDataUpdateCoordinator,
-        entity_description: NordpoolBlockPricesSensorEntityDescription,
-        area: str,
-        currency: str,
-        block_name: str,
-    ) -> None:
-        """Initiate Nord Pool sensor."""
-        super().__init__(coordinator, entity_description, area)
-        if entity_description.device_class is not SensorDeviceClass.TIMESTAMP:
-            self._attr_native_unit_of_measurement = f"{currency}/kWh"
-        self._attr_unique_id = f"{slugify(block_name)}-{area}-{entity_description.key}"
-        self.block_name = block_name
-        self._attr_translation_placeholders = {"block": block_name}
-
-    @property
-    def native_value(self) -> float | datetime | None:
-        """Return value of sensor."""
-        return self.entity_description.value_fn(
-            get_blockprices(self.coordinator.data)[self.area][self.block_name]
-        )
-
-
-class NordpoolDailyAveragePriceSensor(NordpoolBaseEntity, SensorEntity):
-    """Representation of a Nord Pool daily average price sensor."""
-
-    entity_description: SensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: NordPoolDataUpdateCoordinator,
-        entity_description: SensorEntityDescription,
-        area: str,
-        currency: str,
-    ) -> None:
-        """Initiate Nord Pool sensor."""
-        super().__init__(coordinator, entity_description, area)
-        self._attr_native_unit_of_measurement = f"{currency}/kWh"
-
-    @property
-    def native_value(self) -> float | None:
-        """Return value of sensor."""
-        return self.coordinator.data.area_average[self.area] / 1000
diff --git a/homeassistant/components/nordpool/strings.json b/homeassistant/components/nordpool/strings.json
deleted file mode 100644
index 59ba009eb90..00000000000
--- a/homeassistant/components/nordpool/strings.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "no_data": "API connected but the response was empty"
-    },
-    "step": {
-      "user": {
-        "data": {
-          "currency": "Currency",
-          "areas": "Areas"
-        }
-      },
-      "reconfigure": {
-        "data": {
-          "currency": "[%key:component::nordpool::config::step::user::data::currency%]",
-          "areas": "[%key:component::nordpool::config::step::user::data::areas%]"
-        }
-      }
-    }
-  },
-  "entity": {
-    "sensor": {
-      "updated_at": {
-        "name": "Last updated"
-      },
-      "currency": {
-        "name": "Currency"
-      },
-      "exchange_rate": {
-        "name": "Exchange rate"
-      },
-      "current_price": {
-        "name": "Current price"
-      },
-      "last_price": {
-        "name": "Previous price"
-      },
-      "next_price": {
-        "name": "Next price"
-      },
-      "block_average": {
-        "name": "{block} average"
-      },
-      "block_min": {
-        "name": "{block} lowest price"
-      },
-      "block_max": {
-        "name": "{block} highest price"
-      },
-      "block_start_time": {
-        "name": "{block} time from"
-      },
-      "block_end_time": {
-        "name": "{block} time until"
-      },
-      "daily_average": {
-        "name": "Daily average"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/notify/strings.json b/homeassistant/components/notify/strings.json
index b7d4ec1ad25..d1deca0a6c4 100644
--- a/homeassistant/components/notify/strings.json
+++ b/homeassistant/components/notify/strings.json
@@ -74,7 +74,7 @@
       }
     },
     "migrate_notify_service": {
-      "title": "Legacy action notify.{service_name} still being used",
+      "title": "Legacy action notify.{service_name} stll being used",
       "fix_flow": {
         "step": {
           "confirm": {
diff --git a/homeassistant/components/nsw_fuel_station/__init__.py b/homeassistant/components/nsw_fuel_station/__init__.py
index 85e204b6f51..76dc9d4c6ff 100644
--- a/homeassistant/components/nsw_fuel_station/__init__.py
+++ b/homeassistant/components/nsw_fuel_station/__init__.py
@@ -33,7 +33,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=None,
         name="sensor",
         update_interval=SCAN_INTERVAL,
         update_method=async_update_data,
diff --git a/homeassistant/components/nuheat/__init__.py b/homeassistant/components/nuheat/__init__.py
index fb17e6b45bf..fdb49688eba 100644
--- a/homeassistant/components/nuheat/__init__.py
+++ b/homeassistant/components/nuheat/__init__.py
@@ -60,7 +60,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"nuheat {serial_number}",
         update_method=_async_update_data,
         update_interval=timedelta(minutes=5),
diff --git a/homeassistant/components/number/const.py b/homeassistant/components/number/const.py
index 23e3ce0910b..ad95c9b5358 100644
--- a/homeassistant/components/number/const.py
+++ b/homeassistant/components/number/const.py
@@ -17,7 +17,6 @@ from homeassistant.const import (
     SIGNAL_STRENGTH_DECIBELS,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     UnitOfApparentPower,
-    UnitOfBloodGlucoseConcentration,
     UnitOfConductivity,
     UnitOfDataRate,
     UnitOfElectricCurrent,
@@ -110,12 +109,6 @@ class NumberDeviceClass(StrEnum):
     Unit of measurement: `%`
     """
 
-    BLOOD_GLUCOSE_CONCENTRATION = "blood_glucose_concentration"
-    """Blood glucose concentration.
-
-    Unit of measurement: `mg/dL`, `mmol/L`
-    """
-
     CO = "carbon_monoxide"
     """Carbon Monoxide gas concentration.
 
@@ -169,7 +162,7 @@ class NumberDeviceClass(StrEnum):
     ENERGY = "energy"
     """Energy.
 
-    Unit of measurement: `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `MJ`, `GJ`
+    Unit of measurement: `Wh`, `kWh`, `MWh`, `MJ`, `GJ`
     """
 
     ENERGY_STORAGE = "energy_storage"
@@ -178,7 +171,7 @@ class NumberDeviceClass(StrEnum):
     Use this device class for sensors measuring stored energy, for example the amount
     of electric energy currently stored in a battery or the capacity of a battery.
 
-    Unit of measurement: `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `MJ`, `GJ`
+    Unit of measurement: `Wh`, `kWh`, `MWh`, `MJ`, `GJ`
     """
 
     FREQUENCY = "frequency"
@@ -286,7 +279,7 @@ class NumberDeviceClass(StrEnum):
     POWER = "power"
     """Power.
 
-    Unit of measurement: `W`, `kW`, `MW`, `GW`, `TW`
+    Unit of measurement: `W`, `kW`
     """
 
     PRECIPITATION = "precipitation"
@@ -436,7 +429,6 @@ DEVICE_CLASS_UNITS: dict[NumberDeviceClass, set[type[StrEnum] | str | None]] = {
     NumberDeviceClass.AQI: {None},
     NumberDeviceClass.ATMOSPHERIC_PRESSURE: set(UnitOfPressure),
     NumberDeviceClass.BATTERY: {PERCENTAGE},
-    NumberDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: set(UnitOfBloodGlucoseConcentration),
     NumberDeviceClass.CO: {CONCENTRATION_PARTS_PER_MILLION},
     NumberDeviceClass.CO2: {CONCENTRATION_PARTS_PER_MILLION},
     NumberDeviceClass.CONDUCTIVITY: set(UnitOfConductivity),
diff --git a/homeassistant/components/number/icons.json b/homeassistant/components/number/icons.json
index 5e0fc6e44d2..a122aaecb09 100644
--- a/homeassistant/components/number/icons.json
+++ b/homeassistant/components/number/icons.json
@@ -15,9 +15,6 @@
     "battery": {
       "default": "mdi:battery"
     },
-    "blood_glucose_concentration": {
-      "default": "mdi:spoon-sugar"
-    },
     "carbon_dioxide": {
       "default": "mdi:molecule-co2"
     },
diff --git a/homeassistant/components/number/strings.json b/homeassistant/components/number/strings.json
index b9aec880ecc..580385172e3 100644
--- a/homeassistant/components/number/strings.json
+++ b/homeassistant/components/number/strings.json
@@ -43,9 +43,6 @@
     "battery": {
       "name": "[%key:component::sensor::entity_component::battery::name%]"
     },
-    "blood_glucose_concentration": {
-      "name": "[%key:component::sensor::entity_component::blood_glucose_concentration::name%]"
-    },
     "carbon_dioxide": {
       "name": "[%key:component::sensor::entity_component::carbon_dioxide::name%]"
     },
diff --git a/homeassistant/components/nut/__init__.py b/homeassistant/components/nut/__init__.py
index 169dbbbff5d..2ce67c76649 100644
--- a/homeassistant/components/nut/__init__.py
+++ b/homeassistant/components/nut/__init__.py
@@ -86,7 +86,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: NutConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="NUT resource status",
         update_method=async_update_data,
         update_interval=timedelta(seconds=scan_interval),
@@ -130,10 +129,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NutConfigEntry) -> bool:
         name=data.name.title(),
         manufacturer=data.device_info.manufacturer,
         model=data.device_info.model,
-        model_id=data.device_info.model_id,
         sw_version=data.device_info.firmware,
-        serial_number=data.device_info.serial,
-        suggested_area=data.device_info.device_location,
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@@ -211,10 +207,7 @@ class NUTDeviceInfo:
 
     manufacturer: str | None = None
     model: str | None = None
-    model_id: str | None = None
     firmware: str | None = None
-    serial: str | None = None
-    device_location: str | None = None
 
 
 class PyNUTData:
@@ -273,13 +266,8 @@ class PyNUTData:
 
         manufacturer = _manufacturer_from_status(self._status)
         model = _model_from_status(self._status)
-        model_id: str | None = self._status.get("device.part")
         firmware = _firmware_from_status(self._status)
-        serial = _serial_from_status(self._status)
-        device_location: str | None = self._status.get("device.location")
-        return NUTDeviceInfo(
-            manufacturer, model, model_id, firmware, serial, device_location
-        )
+        return NUTDeviceInfo(manufacturer, model, firmware)
 
     async def _async_get_status(self) -> dict[str, str]:
         """Get the ups status from NUT."""
diff --git a/homeassistant/components/nut/config_flow.py b/homeassistant/components/nut/config_flow.py
index 966c51e98e9..d0a2da124a6 100644
--- a/homeassistant/components/nut/config_flow.py
+++ b/homeassistant/components/nut/config_flow.py
@@ -235,12 +235,16 @@ class NutConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for nut."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/nut/sensor.py b/homeassistant/components/nut/sensor.py
index bb702873052..7f211d5452b 100644
--- a/homeassistant/components/nut/sensor.py
+++ b/homeassistant/components/nut/sensor.py
@@ -15,7 +15,6 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ATTR_MANUFACTURER,
     ATTR_MODEL,
-    ATTR_SERIAL_NUMBER,
     ATTR_SW_VERSION,
     PERCENTAGE,
     STATE_UNKNOWN,
@@ -43,7 +42,6 @@ NUT_DEV_INFO_TO_DEV_INFO: dict[str, str] = {
     "manufacturer": ATTR_MANUFACTURER,
     "model": ATTR_MODEL,
     "firmware": ATTR_SW_VERSION,
-    "serial": ATTR_SERIAL_NUMBER,
 }
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/nws/__init__.py b/homeassistant/components/nws/__init__.py
index c700476ed3d..2e643d7dbc6 100644
--- a/homeassistant/components/nws/__init__.py
+++ b/homeassistant/components/nws/__init__.py
@@ -110,7 +110,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: NWSConfigEntry) -> bool:
     coordinator_forecast = TimestampDataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"NWS forecast station {station}",
         update_method=async_setup_update_forecast(0, 0),
         update_interval=DEFAULT_SCAN_INTERVAL,
@@ -122,7 +121,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: NWSConfigEntry) -> bool:
     coordinator_forecast_hourly = TimestampDataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"NWS forecast hourly station {station}",
         update_method=async_setup_update_forecast_hourly(0, 0),
         update_interval=DEFAULT_SCAN_INTERVAL,
diff --git a/homeassistant/components/nx584/alarm_control_panel.py b/homeassistant/components/nx584/alarm_control_panel.py
index 6622eec530f..61de4f611b8 100644
--- a/homeassistant/components/nx584/alarm_control_panel.py
+++ b/homeassistant/components/nx584/alarm_control_panel.py
@@ -13,10 +13,17 @@ from homeassistant.components.alarm_control_panel import (
     PLATFORM_SCHEMA as ALARM_CONTROL_PANEL_PLATFORM_SCHEMA,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_NAME,
+    CONF_PORT,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers import config_validation as cv, entity_platform
@@ -88,6 +95,7 @@ class NX584Alarm(AlarmControlPanelEntity):
     """Representation of a NX584-based alarm panel."""
 
     _attr_code_format = CodeFormat.NUMBER
+    _attr_state: str | None
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
@@ -110,11 +118,11 @@ class NX584Alarm(AlarmControlPanelEntity):
                 "Unable to connect to %(host)s: %(reason)s",
                 {"host": self._url, "reason": ex},
             )
-            self._attr_alarm_state = None
+            self._attr_state = None
             zones = []
         except IndexError:
             _LOGGER.error("NX584 reports no partitions")
-            self._attr_alarm_state = None
+            self._attr_state = None
             zones = []
 
         bypassed = False
@@ -128,15 +136,15 @@ class NX584Alarm(AlarmControlPanelEntity):
                 break
 
         if not part["armed"]:
-            self._attr_alarm_state = AlarmControlPanelState.DISARMED
+            self._attr_state = STATE_ALARM_DISARMED
         elif bypassed:
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+            self._attr_state = STATE_ALARM_ARMED_HOME
         else:
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+            self._attr_state = STATE_ALARM_ARMED_AWAY
 
         for flag in part["condition_flags"]:
             if flag == "Siren on":
-                self._attr_alarm_state = AlarmControlPanelState.TRIGGERED
+                self._attr_state = STATE_ALARM_TRIGGERED
 
     def alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
diff --git a/homeassistant/components/nyt_games/manifest.json b/homeassistant/components/nyt_games/manifest.json
index c32de754782..a2cd5629ed1 100644
--- a/homeassistant/components/nyt_games/manifest.json
+++ b/homeassistant/components/nyt_games/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nyt_games",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["nyt_games==0.4.4"]
+  "requirements": ["nyt_games==0.4.3"]
 }
diff --git a/homeassistant/components/nyt_games/sensor.py b/homeassistant/components/nyt_games/sensor.py
index 01b2db4620b..57759fb354d 100644
--- a/homeassistant/components/nyt_games/sensor.py
+++ b/homeassistant/components/nyt_games/sensor.py
@@ -139,7 +139,7 @@ CONNECTIONS_SENSORS: tuple[NYTGamesConnectionsSensorEntityDescription, ...] = (
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfTime.DAYS,
         device_class=SensorDeviceClass.DURATION,
-        value_fn=lambda connections: connections.max_streak,
+        value_fn=lambda connections: connections.current_streak,
     ),
 )
 
diff --git a/homeassistant/components/ollama/config_flow.py b/homeassistant/components/ollama/config_flow.py
index 1024a824c25..65b8efaf525 100644
--- a/homeassistant/components/ollama/config_flow.py
+++ b/homeassistant/components/ollama/config_flow.py
@@ -207,8 +207,9 @@ class OllamaOptionsFlow(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
-        self.url: str = config_entry.data[CONF_URL]
-        self.model: str = config_entry.data[CONF_MODEL]
+        self.config_entry = config_entry
+        self.url: str = self.config_entry.data[CONF_URL]
+        self.model: str = self.config_entry.data[CONF_MODEL]
 
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/ollama/const.py b/homeassistant/components/ollama/const.py
index 69c0a3d6296..6152b223d6d 100644
--- a/homeassistant/components/ollama/const.py
+++ b/homeassistant/components/ollama/const.py
@@ -24,12 +24,8 @@ MAX_HISTORY_SECONDS = 60 * 60  # 1 hour
 MODEL_NAMES = [  # https://ollama.com/library
     "alfred",
     "all-minilm",
-    "aya-expanse",
     "aya",
     "bakllava",
-    "bespoke-minicheck",
-    "bge-large",
-    "bge-m3",
     "codebooga",
     "codegeex4",
     "codegemma",
@@ -37,19 +33,18 @@ MODEL_NAMES = [  # https://ollama.com/library
     "codeqwen",
     "codestral",
     "codeup",
-    "command-r-plus",
     "command-r",
+    "command-r-plus",
     "dbrx",
-    "deepseek-coder-v2",
     "deepseek-coder",
+    "deepseek-coder-v2",
     "deepseek-llm",
-    "deepseek-v2.5",
     "deepseek-v2",
+    "dolphincoder",
     "dolphin-llama3",
     "dolphin-mistral",
     "dolphin-mixtral",
     "dolphin-phi",
-    "dolphincoder",
     "duckdb-nsql",
     "everythinglm",
     "falcon",
@@ -60,97 +55,74 @@ MODEL_NAMES = [  # https://ollama.com/library
     "glm4",
     "goliath",
     "granite-code",
-    "granite3-dense",
-    "granite3-guardian" "granite3-moe",
-    "hermes3",
     "internlm2",
-    "llama-guard3",
-    "llama-pro",
+    "llama2",
     "llama2-chinese",
     "llama2-uncensored",
-    "llama2",
+    "llama3",
     "llama3-chatqa",
     "llama3-gradient",
     "llama3-groq-tool-use",
-    "llama3.1",
-    "llama3.2",
-    "llama3",
+    "llama-pro",
+    "llava",
     "llava-llama3",
     "llava-phi3",
-    "llava",
     "magicoder",
     "mathstral",
     "meditron",
     "medllama2",
     "megadolphin",
-    "minicpm-v",
-    "mistral-large",
-    "mistral-nemo",
-    "mistral-openorca",
-    "mistral-small",
     "mistral",
     "mistrallite",
+    "mistral-nemo",
+    "mistral-openorca",
     "mixtral",
     "moondream",
     "mxbai-embed-large",
-    "nemotron-mini",
-    "nemotron",
     "neural-chat",
     "nexusraven",
     "nomic-embed-text",
     "notus",
     "notux",
     "nous-hermes",
-    "nous-hermes2-mixtral",
     "nous-hermes2",
+    "nous-hermes2-mixtral",
     "nuextract",
-    "open-orca-platypus2",
     "openchat",
     "openhermes",
-    "orca-mini",
+    "open-orca-platypus2",
     "orca2",
-    "paraphrase-multilingual",
+    "orca-mini",
     "phi",
-    "phi3.5",
     "phi3",
     "phind-codellama",
     "qwen",
-    "qwen2-math",
-    "qwen2.5-coder",
-    "qwen2.5",
     "qwen2",
-    "reader-lm",
-    "reflection",
     "samantha-mistral",
-    "shieldgemma",
-    "smollm",
-    "smollm2",
     "snowflake-arctic-embed",
-    "solar-pro",
     "solar",
     "sqlcoder",
     "stable-beluga",
     "stable-code",
-    "stablelm-zephyr",
     "stablelm2",
+    "stablelm-zephyr",
     "starcoder",
     "starcoder2",
     "starling-lm",
     "tinydolphin",
     "tinyllama",
     "vicuna",
-    "wizard-math",
-    "wizard-vicuna-uncensored",
-    "wizard-vicuna",
     "wizardcoder",
-    "wizardlm-uncensored",
     "wizardlm",
     "wizardlm2",
+    "wizardlm-uncensored",
+    "wizard-math",
+    "wizard-vicuna",
+    "wizard-vicuna-uncensored",
     "xwinlm",
     "yarn-llama2",
     "yarn-mistral",
-    "yi-coder",
     "yi",
     "zephyr",
 ]
-DEFAULT_MODEL = "llama3.2:latest"
+DEFAULT_MODEL = "llama3.1:latest"
diff --git a/homeassistant/components/ollama/strings.json b/homeassistant/components/ollama/strings.json
index 248cac34f11..c307f160228 100644
--- a/homeassistant/components/ollama/strings.json
+++ b/homeassistant/components/ollama/strings.json
@@ -11,11 +11,9 @@
         "title": "Downloading model"
       }
     },
-    "abort": {
-      "download_failed": "Model downloading failed"
-    },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "download_failed": "Model downloading failed",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "progress": {
diff --git a/homeassistant/components/omnilogic/config_flow.py b/homeassistant/components/omnilogic/config_flow.py
index dfbd010ea98..489c8e6f601 100644
--- a/homeassistant/components/omnilogic/config_flow.py
+++ b/homeassistant/components/omnilogic/config_flow.py
@@ -34,7 +34,7 @@ class OmniLogicConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -78,6 +78,10 @@ class OmniLogicConfigFlow(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Handle Omnilogic client options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/onboarding/views.py b/homeassistant/components/onboarding/views.py
index b33440a9eb7..1ecfc10d974 100644
--- a/homeassistant/components/onboarding/views.py
+++ b/homeassistant/components/onboarding/views.py
@@ -20,7 +20,6 @@ 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 area_registry as ar
-from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.system_info import async_get_system_info
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.setup import async_setup_component
@@ -217,7 +216,7 @@ class CoreConfigOnboardingView(_BaseOnboardingView):
             from homeassistant.components import hassio
 
             if (
-                is_hassio(hass)
+                hassio.is_hassio(hass)
                 and (core_info := hassio.get_core_info(hass))
                 and "raspberrypi" in core_info["machine"]
             ):
diff --git a/homeassistant/components/oncue/__init__.py b/homeassistant/components/oncue/__init__.py
index 19d134a398f..53443b9ed81 100644
--- a/homeassistant/components/oncue/__init__.py
+++ b/homeassistant/components/oncue/__init__.py
@@ -43,7 +43,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: OncueConfigEntry) -> boo
     coordinator = DataUpdateCoordinator[dict[str, OncueDevice]](
         hass,
         _LOGGER,
-        config_entry=entry,
         name=f"Oncue {entry.data[CONF_USERNAME]}",
         update_interval=timedelta(minutes=10),
         update_method=_async_update,
diff --git a/homeassistant/components/onewire/config_flow.py b/homeassistant/components/onewire/config_flow.py
index abb4c884974..a217674e3b4 100644
--- a/homeassistant/components/onewire/config_flow.py
+++ b/homeassistant/components/onewire/config_flow.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from copy import deepcopy
 from typing import Any
 
 import voluptuous as vol
@@ -11,7 +10,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant, callback
@@ -101,14 +100,12 @@ class OneWireFlowHandler(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> OnewireOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OnewireOptionsFlowHandler:
         """Get the options flow for this handler."""
         return OnewireOptionsFlowHandler(config_entry)
 
 
-class OnewireOptionsFlowHandler(OptionsFlow):
+class OnewireOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle OneWire Config options."""
 
     configurable_devices: dict[str, str]
@@ -126,10 +123,6 @@ class OnewireOptionsFlowHandler(OptionsFlow):
     current_device: str
     """Friendly name of the currently selected device."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialize options flow."""
-        self.options = deepcopy(dict(config_entry.options))
-
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/onkyo/__init__.py b/homeassistant/components/onkyo/__init__.py
index fd5c0ba634a..02c026d1973 100644
--- a/homeassistant/components/onkyo/__init__.py
+++ b/homeassistant/components/onkyo/__init__.py
@@ -1,76 +1 @@
 """The onkyo component."""
-
-from dataclasses import dataclass
-
-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 homeassistant.helpers.typing import ConfigType
-
-from .const import DOMAIN, OPTION_INPUT_SOURCES, InputSource
-from .receiver import Receiver, async_interview
-from .services import DATA_MP_ENTITIES, async_register_services
-
-PLATFORMS = [Platform.MEDIA_PLAYER]
-
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
-
-@dataclass
-class OnkyoData:
-    """Config Entry data."""
-
-    receiver: Receiver
-    sources: dict[InputSource, str]
-
-
-type OnkyoConfigEntry = ConfigEntry[OnkyoData]
-
-
-async def async_setup(hass: HomeAssistant, _: ConfigType) -> bool:
-    """Set up Onkyo component."""
-    await async_register_services(hass)
-    return True
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: OnkyoConfigEntry) -> bool:
-    """Set up the Onkyo config entry."""
-    entry.async_on_unload(entry.add_update_listener(update_listener))
-
-    host = entry.data[CONF_HOST]
-
-    info = await async_interview(host)
-    if info is None:
-        raise ConfigEntryNotReady(f"Unable to connect to: {host}")
-
-    receiver = await Receiver.async_create(info)
-
-    sources_store: dict[str, str] = entry.options[OPTION_INPUT_SOURCES]
-    sources = {InputSource(k): v for k, v in sources_store.items()}
-
-    entry.runtime_data = OnkyoData(receiver, sources)
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    await receiver.conn.connect()
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: OnkyoConfigEntry) -> bool:
-    """Unload Onkyo config entry."""
-    del hass.data[DATA_MP_ENTITIES][entry.entry_id]
-
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-    receiver = entry.runtime_data.receiver
-    receiver.conn.close()
-
-    return unload_ok
-
-
-async def update_listener(hass: HomeAssistant, entry: OnkyoConfigEntry) -> None:
-    """Handle options update."""
-    await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/onkyo/config_flow.py b/homeassistant/components/onkyo/config_flow.py
deleted file mode 100644
index a8ced6fae64..00000000000
--- a/homeassistant/components/onkyo/config_flow.py
+++ /dev/null
@@ -1,371 +0,0 @@
-"""Config flow for Onkyo."""
-
-import logging
-from typing import Any
-
-import voluptuous as vol
-
-from homeassistant.config_entries import (
-    SOURCE_RECONFIGURE,
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
-from homeassistant.const import CONF_HOST, CONF_NAME
-from homeassistant.core import callback
-from homeassistant.helpers.selector import (
-    NumberSelector,
-    NumberSelectorConfig,
-    NumberSelectorMode,
-    Selector,
-    SelectSelector,
-    SelectSelectorConfig,
-    SelectSelectorMode,
-    TextSelector,
-)
-
-from .const import (
-    CONF_RECEIVER_MAX_VOLUME,
-    CONF_SOURCES,
-    DOMAIN,
-    OPTION_INPUT_SOURCES,
-    OPTION_MAX_VOLUME,
-    OPTION_MAX_VOLUME_DEFAULT,
-    OPTION_VOLUME_RESOLUTION,
-    OPTION_VOLUME_RESOLUTION_DEFAULT,
-    VOLUME_RESOLUTION_ALLOWED,
-    InputSource,
-)
-from .receiver import ReceiverInfo, async_discover, async_interview
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_DEVICE = "device"
-
-INPUT_SOURCES_ALL_MEANINGS = [
-    input_source.value_meaning for input_source in InputSource
-]
-STEP_MANUAL_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str})
-STEP_CONFIGURE_SCHEMA = vol.Schema(
-    {
-        vol.Required(OPTION_VOLUME_RESOLUTION): vol.In(VOLUME_RESOLUTION_ALLOWED),
-        vol.Required(OPTION_INPUT_SOURCES): SelectSelector(
-            SelectSelectorConfig(
-                options=INPUT_SOURCES_ALL_MEANINGS,
-                multiple=True,
-                mode=SelectSelectorMode.DROPDOWN,
-            )
-        ),
-    }
-)
-
-
-class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Onkyo config flow."""
-
-    _receiver_info: ReceiverInfo
-    _discovered_infos: dict[str, ReceiverInfo]
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initialized by the user."""
-        return self.async_show_menu(
-            step_id="user", menu_options=["manual", "eiscp_discovery"]
-        )
-
-    async def async_step_manual(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle manual device entry."""
-        errors = {}
-
-        if user_input is not None:
-            host = user_input[CONF_HOST]
-            _LOGGER.debug("Config flow start manual: %s", host)
-            try:
-                info = await async_interview(host)
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                if info is None:
-                    errors["base"] = "cannot_connect"
-                else:
-                    self._receiver_info = info
-
-                    await self.async_set_unique_id(
-                        info.identifier, raise_on_progress=False
-                    )
-                    if self.source == SOURCE_RECONFIGURE:
-                        self._abort_if_unique_id_mismatch()
-                    else:
-                        self._abort_if_unique_id_configured()
-
-                    return await self.async_step_configure_receiver()
-
-        suggested_values = user_input
-        if suggested_values is None and self.source == SOURCE_RECONFIGURE:
-            suggested_values = {
-                CONF_HOST: self._get_reconfigure_entry().data[CONF_HOST]
-            }
-
-        return self.async_show_form(
-            step_id="manual",
-            data_schema=self.add_suggested_values_to_schema(
-                STEP_MANUAL_SCHEMA, suggested_values
-            ),
-            errors=errors,
-        )
-
-    async def async_step_eiscp_discovery(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Start eiscp discovery and handle user device selection."""
-        if user_input is not None:
-            self._receiver_info = self._discovered_infos[user_input[CONF_DEVICE]]
-            await self.async_set_unique_id(
-                self._receiver_info.identifier, raise_on_progress=False
-            )
-            self._abort_if_unique_id_configured(
-                updates={CONF_HOST: self._receiver_info.host}
-            )
-            return await self.async_step_configure_receiver()
-
-        _LOGGER.debug("Config flow start eiscp discovery")
-
-        try:
-            infos = await async_discover()
-        except Exception:
-            _LOGGER.exception("Unexpected exception")
-            return self.async_abort(reason="unknown")
-
-        _LOGGER.debug("Discovered devices: %s", infos)
-
-        self._discovered_infos = {}
-        discovered_names = {}
-        current_unique_ids = self._async_current_ids()
-        for info in infos:
-            if info.identifier in current_unique_ids:
-                continue
-            self._discovered_infos[info.identifier] = info
-            device_name = f"{info.model_name} ({info.host})"
-            discovered_names[info.identifier] = device_name
-
-        _LOGGER.debug("Discovered new devices: %s", self._discovered_infos)
-
-        if not discovered_names:
-            return self.async_abort(reason="no_devices_found")
-
-        return self.async_show_form(
-            step_id="eiscp_discovery",
-            data_schema=vol.Schema(
-                {vol.Required(CONF_DEVICE): vol.In(discovered_names)}
-            ),
-        )
-
-    async def async_step_configure_receiver(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the configuration of a single receiver."""
-        errors = {}
-
-        entry = None
-        entry_options = None
-        if self.source == SOURCE_RECONFIGURE:
-            entry = self._get_reconfigure_entry()
-            entry_options = entry.options
-
-        if user_input is not None:
-            source_meanings: list[str] = user_input[OPTION_INPUT_SOURCES]
-            if not source_meanings:
-                errors[OPTION_INPUT_SOURCES] = "empty_input_source_list"
-            else:
-                sources_store: dict[str, str] = {}
-                for source_meaning in source_meanings:
-                    source = InputSource.from_meaning(source_meaning)
-
-                    source_name = source_meaning
-                    if entry_options is not None:
-                        source_name = entry_options[OPTION_INPUT_SOURCES].get(
-                            source.value, source_name
-                        )
-                    sources_store[source.value] = source_name
-
-                volume_resolution = user_input[OPTION_VOLUME_RESOLUTION]
-
-                if entry_options is None:
-                    result = self.async_create_entry(
-                        title=self._receiver_info.model_name,
-                        data={
-                            CONF_HOST: self._receiver_info.host,
-                        },
-                        options={
-                            OPTION_VOLUME_RESOLUTION: volume_resolution,
-                            OPTION_MAX_VOLUME: OPTION_MAX_VOLUME_DEFAULT,
-                            OPTION_INPUT_SOURCES: sources_store,
-                        },
-                    )
-                else:
-                    assert entry is not None
-                    result = self.async_update_reload_and_abort(
-                        entry,
-                        data={
-                            CONF_HOST: self._receiver_info.host,
-                        },
-                        options={
-                            OPTION_VOLUME_RESOLUTION: volume_resolution,
-                            OPTION_MAX_VOLUME: entry_options[OPTION_MAX_VOLUME],
-                            OPTION_INPUT_SOURCES: sources_store,
-                        },
-                    )
-
-                _LOGGER.debug("Configured receiver, result: %s", result)
-                return result
-
-        _LOGGER.debug("Configuring receiver, info: %s", self._receiver_info)
-
-        suggested_values = user_input
-        if suggested_values is None:
-            if entry_options is None:
-                suggested_values = {
-                    OPTION_VOLUME_RESOLUTION: OPTION_VOLUME_RESOLUTION_DEFAULT,
-                    OPTION_INPUT_SOURCES: [],
-                }
-            else:
-                suggested_values = {
-                    OPTION_VOLUME_RESOLUTION: entry_options[OPTION_VOLUME_RESOLUTION],
-                    OPTION_INPUT_SOURCES: [
-                        InputSource(input_source).value_meaning
-                        for input_source in entry_options[OPTION_INPUT_SOURCES]
-                    ],
-                }
-
-        return self.async_show_form(
-            step_id="configure_receiver",
-            data_schema=self.add_suggested_values_to_schema(
-                STEP_CONFIGURE_SCHEMA, suggested_values
-            ),
-            errors=errors,
-            description_placeholders={
-                "name": f"{self._receiver_info.model_name} ({self._receiver_info.host})"
-            },
-        )
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of the receiver."""
-        return await self.async_step_manual()
-
-    async def async_step_import(self, user_input: dict[str, Any]) -> ConfigFlowResult:
-        """Import the yaml config."""
-        _LOGGER.debug("Import flow user input: %s", user_input)
-
-        host: str = user_input[CONF_HOST]
-        name: str | None = user_input.get(CONF_NAME)
-        user_max_volume: int = user_input[OPTION_MAX_VOLUME]
-        user_volume_resolution: int = user_input[CONF_RECEIVER_MAX_VOLUME]
-        user_sources: dict[InputSource, str] = user_input[CONF_SOURCES]
-
-        info: ReceiverInfo | None = user_input.get("info")
-        if info is None:
-            try:
-                info = await async_interview(host)
-            except Exception:
-                _LOGGER.exception("Import flow interview error for host %s", host)
-                return self.async_abort(reason="cannot_connect")
-
-        if info is None:
-            _LOGGER.error("Import flow interview error for host %s", host)
-            return self.async_abort(reason="cannot_connect")
-
-        unique_id = info.identifier
-        await self.async_set_unique_id(unique_id)
-        self._abort_if_unique_id_configured()
-
-        name = name or info.model_name
-
-        volume_resolution = VOLUME_RESOLUTION_ALLOWED[-1]
-        for volume_resolution_allowed in VOLUME_RESOLUTION_ALLOWED:
-            if user_volume_resolution <= volume_resolution_allowed:
-                volume_resolution = volume_resolution_allowed
-                break
-
-        max_volume = min(
-            100, user_max_volume * user_volume_resolution / volume_resolution
-        )
-
-        sources_store: dict[str, str] = {}
-        for source, source_name in user_sources.items():
-            sources_store[source.value] = source_name
-
-        return self.async_create_entry(
-            title=name,
-            data={
-                CONF_HOST: host,
-            },
-            options={
-                OPTION_VOLUME_RESOLUTION: volume_resolution,
-                OPTION_MAX_VOLUME: max_volume,
-                OPTION_INPUT_SOURCES: sources_store,
-            },
-        )
-
-    @staticmethod
-    @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> OptionsFlow:
-        """Return the options flow."""
-        return OnkyoOptionsFlowHandler(config_entry)
-
-
-class OnkyoOptionsFlowHandler(OptionsFlow):
-    """Handle an options flow for Onkyo."""
-
-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialize options flow."""
-        sources_store: dict[str, str] = config_entry.options[OPTION_INPUT_SOURCES]
-        self._input_sources = {InputSource(k): v for k, v in sources_store.items()}
-
-    async def async_step_init(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Manage the options."""
-        if user_input is not None:
-            sources_store: dict[str, str] = {}
-            for source_meaning, source_name in user_input.items():
-                if source_meaning in INPUT_SOURCES_ALL_MEANINGS:
-                    source = InputSource.from_meaning(source_meaning)
-                    sources_store[source.value] = source_name
-
-            return self.async_create_entry(
-                data={
-                    OPTION_VOLUME_RESOLUTION: self.config_entry.options[
-                        OPTION_VOLUME_RESOLUTION
-                    ],
-                    OPTION_MAX_VOLUME: user_input[OPTION_MAX_VOLUME],
-                    OPTION_INPUT_SOURCES: sources_store,
-                }
-            )
-
-        schema_dict: dict[Any, Selector] = {}
-
-        max_volume: float = self.config_entry.options[OPTION_MAX_VOLUME]
-        schema_dict[vol.Required(OPTION_MAX_VOLUME, default=max_volume)] = (
-            NumberSelector(
-                NumberSelectorConfig(min=1, max=100, mode=NumberSelectorMode.BOX)
-            )
-        )
-
-        for source, source_name in self._input_sources.items():
-            schema_dict[vol.Required(source.value_meaning, default=source_name)] = (
-                TextSelector()
-            )
-
-        return self.async_show_form(
-            step_id="init",
-            data_schema=vol.Schema(schema_dict),
-        )
diff --git a/homeassistant/components/onkyo/const.py b/homeassistant/components/onkyo/const.py
deleted file mode 100644
index bd4fe98ae7d..00000000000
--- a/homeassistant/components/onkyo/const.py
+++ /dev/null
@@ -1,141 +0,0 @@
-"""Constants for the Onkyo integration."""
-
-from enum import Enum
-import typing
-from typing import ClassVar, Literal, Self
-
-import pyeiscp
-
-DOMAIN = "onkyo"
-
-DEVICE_INTERVIEW_TIMEOUT = 5
-DEVICE_DISCOVERY_TIMEOUT = 5
-
-CONF_SOURCES = "sources"
-CONF_RECEIVER_MAX_VOLUME = "receiver_max_volume"
-
-type VolumeResolution = Literal[50, 80, 100, 200]
-OPTION_VOLUME_RESOLUTION = "volume_resolution"
-OPTION_VOLUME_RESOLUTION_DEFAULT: VolumeResolution = 50
-VOLUME_RESOLUTION_ALLOWED: tuple[VolumeResolution, ...] = typing.get_args(
-    VolumeResolution.__value__
-)
-
-OPTION_MAX_VOLUME = "max_volume"
-OPTION_MAX_VOLUME_DEFAULT = 100.0
-
-OPTION_INPUT_SOURCES = "input_sources"
-
-_INPUT_SOURCE_MEANINGS = {
-    "00": "VIDEO1 ··· VCR/DVR ··· STB/DVR",
-    "01": "VIDEO2 ··· CBL/SAT",
-    "02": "VIDEO3 ··· GAME/TV ··· GAME",
-    "03": "VIDEO4 ··· AUX",
-    "04": "VIDEO5 ··· AUX2 ··· GAME2",
-    "05": "VIDEO6 ··· PC",
-    "06": "VIDEO7",
-    "07": "HIDDEN1 ··· EXTRA1",
-    "08": "HIDDEN2 ··· EXTRA2",
-    "09": "HIDDEN3 ··· EXTRA3",
-    "10": "DVD ··· BD/DVD",
-    "11": "STRM BOX",
-    "12": "TV",
-    "20": "TAPE ··· TV/TAPE",
-    "21": "TAPE2",
-    "22": "PHONO",
-    "23": "CD ··· TV/CD",
-    "24": "FM",
-    "25": "AM",
-    "26": "TUNER",
-    "27": "MUSIC SERVER ··· P4S ··· DLNA",
-    "28": "INTERNET RADIO ··· IRADIO FAVORITE",
-    "29": "USB ··· USB(FRONT)",
-    "2A": "USB(REAR)",
-    "2B": "NETWORK ··· NET",
-    "2D": "AIRPLAY",
-    "2E": "BLUETOOTH",
-    "2F": "USB DAC IN",
-    "30": "MULTI CH",
-    "31": "XM",
-    "32": "SIRIUS",
-    "33": "DAB",
-    "40": "UNIVERSAL PORT",
-    "41": "LINE",
-    "42": "LINE2",
-    "44": "OPTICAL",
-    "45": "COAXIAL",
-    "55": "HDMI 5",
-    "56": "HDMI 6",
-    "57": "HDMI 7",
-    "80": "MAIN SOURCE",
-}
-
-
-class InputSource(Enum):
-    """Receiver input source."""
-
-    DVR = "00"
-    CBL = "01"
-    GAME = "02"
-    AUX = "03"
-    GAME2 = "04"
-    PC = "05"
-    VIDEO7 = "06"
-    EXTRA1 = "07"
-    EXTRA2 = "08"
-    EXTRA3 = "09"
-    DVD = "10"
-    STRM_BOX = "11"
-    TV = "12"
-    TAPE = "20"
-    TAPE2 = "21"
-    PHONO = "22"
-    CD = "23"
-    FM = "24"
-    AM = "25"
-    TUNER = "26"
-    MUSIC_SERVER = "27"
-    INTERNET_RADIO = "28"
-    USB = "29"
-    USB_REAR = "2A"
-    NETWORK = "2B"
-    AIRPLAY = "2D"
-    BLUETOOTH = "2E"
-    USB_DAC_IN = "2F"
-    MULTI_CH = "30"
-    XM = "31"
-    SIRIUS = "32"
-    DAB = "33"
-    UNIVERSAL_PORT = "40"
-    LINE = "41"
-    LINE2 = "42"
-    OPTICAL = "44"
-    COAXIAL = "45"
-    HDMI_5 = "55"
-    HDMI_6 = "56"
-    HDMI_7 = "57"
-    MAIN_SOURCE = "80"
-
-    __meaning_mapping: ClassVar[dict[str, Self]] = {}  # type: ignore[misc]
-
-    value_meaning: str
-
-    def __new__(cls, value: str) -> Self:
-        """Create InputSource enum."""
-        obj = object.__new__(cls)
-        obj._value_ = value
-        obj.value_meaning = _INPUT_SOURCE_MEANINGS[value]
-
-        cls.__meaning_mapping[obj.value_meaning] = obj
-
-        return obj
-
-    @classmethod
-    def from_meaning(cls, meaning: str) -> Self:
-        """Get InputSource enum from its meaning."""
-        return cls.__meaning_mapping[meaning]
-
-
-ZONES = {"main": "Main", "zone2": "Zone 2", "zone3": "Zone 3", "zone4": "Zone 4"}
-
-PYEISCP_COMMANDS = pyeiscp.commands.COMMANDS
diff --git a/homeassistant/components/onkyo/manifest.json b/homeassistant/components/onkyo/manifest.json
index 0e75404b3eb..072dc9f9e3b 100644
--- a/homeassistant/components/onkyo/manifest.json
+++ b/homeassistant/components/onkyo/manifest.json
@@ -2,9 +2,7 @@
   "domain": "onkyo",
   "name": "Onkyo",
   "codeowners": ["@arturpragacz"],
-  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/onkyo",
-  "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["pyeiscp"],
   "requirements": ["pyeiscp==0.0.7"]
diff --git a/homeassistant/components/onkyo/media_player.py b/homeassistant/components/onkyo/media_player.py
index 41e36a7f237..af4285e2abd 100644
--- a/homeassistant/components/onkyo/media_player.py
+++ b/homeassistant/components/onkyo/media_player.py
@@ -6,73 +6,45 @@ import asyncio
 import logging
 from typing import Any, Literal
 
+import pyeiscp
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
+    DOMAIN as MEDIA_PLAYER_DOMAIN,
     PLATFORM_SCHEMA as MEDIA_PLAYER_PLATFORM_SCHEMA,
     MediaPlayerEntity,
     MediaPlayerEntityFeature,
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.config_entries import SOURCE_IMPORT
-from homeassistant.const import CONF_HOST, CONF_NAME
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback
-from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers import config_validation as cv, entity_registry as er
-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 OnkyoConfigEntry
-from .const import (
-    CONF_RECEIVER_MAX_VOLUME,
-    CONF_SOURCES,
-    DOMAIN,
-    OPTION_MAX_VOLUME,
-    OPTION_VOLUME_RESOLUTION,
-    PYEISCP_COMMANDS,
-    ZONES,
-    InputSource,
-    VolumeResolution,
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    CONF_HOST,
+    CONF_NAME,
+    EVENT_HOMEASSISTANT_STOP,
 )
-from .receiver import Receiver, async_discover
-from .services import DATA_MP_ENTITIES
+from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util.hass_dict import HassKey
+
+from .receiver import Receiver, ReceiverInfo
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_MAX_VOLUME_DEFAULT = 100
-CONF_RECEIVER_MAX_VOLUME_DEFAULT = 80
-CONF_SOURCES_DEFAULT = {
-    "tv": "TV",
-    "bd": "Bluray",
-    "game": "Game",
-    "aux1": "Aux1",
-    "video1": "Video 1",
-    "video2": "Video 2",
-    "video3": "Video 3",
-    "video4": "Video 4",
-    "video5": "Video 5",
-    "video6": "Video 6",
-    "video7": "Video 7",
-    "fm": "Radio",
-}
+DOMAIN = "onkyo"
 
-PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_HOST): cv.string,
-        vol.Optional(CONF_NAME): cv.string,
-        vol.Optional(OPTION_MAX_VOLUME, default=CONF_MAX_VOLUME_DEFAULT): vol.All(
-            vol.Coerce(int), vol.Range(min=1, max=100)
-        ),
-        vol.Optional(
-            CONF_RECEIVER_MAX_VOLUME, default=CONF_RECEIVER_MAX_VOLUME_DEFAULT
-        ): cv.positive_int,
-        vol.Optional(CONF_SOURCES, default=CONF_SOURCES_DEFAULT): {
-            cv.string: cv.string
-        },
-    }
-)
+DATA_MP_ENTITIES: HassKey[list[dict[str, OnkyoMediaPlayer]]] = HassKey(DOMAIN)
+
+CONF_SOURCES = "sources"
+CONF_MAX_VOLUME = "max_volume"
+CONF_RECEIVER_MAX_VOLUME = "receiver_max_volume"
+
+DEFAULT_NAME = "Onkyo Receiver"
+SUPPORTED_MAX_VOLUME = 100
+DEFAULT_RECEIVER_MAX_VOLUME = 80
+ZONES = {"zone2": "Zone 2", "zone3": "Zone 3", "zone4": "Zone 4"}
 
 SUPPORT_ONKYO_WO_VOLUME = (
     MediaPlayerEntityFeature.TURN_ON
@@ -87,12 +59,39 @@ SUPPORT_ONKYO = (
     | MediaPlayerEntityFeature.VOLUME_STEP
 )
 
-DEFAULT_PLAYABLE_SOURCES = (
-    InputSource.from_meaning("FM"),
-    InputSource.from_meaning("AM"),
-    InputSource.from_meaning("TUNER"),
+KNOWN_HOSTS: list[str] = []
+
+DEFAULT_SOURCES = {
+    "tv": "TV",
+    "bd": "Bluray",
+    "game": "Game",
+    "aux1": "Aux1",
+    "video1": "Video 1",
+    "video2": "Video 2",
+    "video3": "Video 3",
+    "video4": "Video 4",
+    "video5": "Video 5",
+    "video6": "Video 6",
+    "video7": "Video 7",
+    "fm": "Radio",
+}
+DEFAULT_PLAYABLE_SOURCES = ("fm", "am", "tuner")
+
+PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
+    {
+        vol.Optional(CONF_HOST): cv.string,
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_MAX_VOLUME, default=SUPPORTED_MAX_VOLUME): vol.All(
+            vol.Coerce(int), vol.Range(min=1, max=100)
+        ),
+        vol.Optional(
+            CONF_RECEIVER_MAX_VOLUME, default=DEFAULT_RECEIVER_MAX_VOLUME
+        ): cv.positive_int,
+        vol.Optional(CONF_SOURCES, default=DEFAULT_SOURCES): {cv.string: cv.string},
+    }
 )
 
+ATTR_HDMI_OUTPUT = "hdmi_output"
 ATTR_PRESET = "preset"
 ATTR_AUDIO_INFORMATION = "audio_information"
 ATTR_VIDEO_INFORMATION = "video_information"
@@ -124,31 +123,52 @@ VIDEO_INFORMATION_MAPPING = [
     "output_color_depth",
     "picture_mode",
 ]
-ISSUE_URL_PLACEHOLDER = "/config/integrations/dashboard/add?domain=onkyo"
 
-type InputLibValue = str | tuple[str, ...]
+ACCEPTED_VALUES = [
+    "no",
+    "analog",
+    "yes",
+    "out",
+    "out-sub",
+    "sub",
+    "hdbaset",
+    "both",
+    "up",
+]
+ONKYO_SELECT_OUTPUT_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+        vol.Required(ATTR_HDMI_OUTPUT): vol.In(ACCEPTED_VALUES),
+    }
+)
+SERVICE_SELECT_HDMI_OUTPUT = "onkyo_select_hdmi_output"
 
 
-def _input_lib_cmds(zone: str) -> dict[InputSource, InputLibValue]:
-    match zone:
-        case "main":
-            cmds = PYEISCP_COMMANDS["main"]["SLI"]
-        case "zone2":
-            cmds = PYEISCP_COMMANDS["zone2"]["SLZ"]
-        case "zone3":
-            cmds = PYEISCP_COMMANDS["zone3"]["SL3"]
-        case "zone4":
-            cmds = PYEISCP_COMMANDS["zone4"]["SL4"]
+async def async_register_services(hass: HomeAssistant) -> None:
+    """Register Onkyo services."""
 
-    result: dict[InputSource, InputLibValue] = {}
-    for k, v in cmds["values"].items():
-        try:
-            source = InputSource(k)
-        except ValueError:
-            continue
-        result[source] = v["name"]
+    async def async_service_handle(service: ServiceCall) -> None:
+        """Handle for services."""
+        entity_ids = service.data[ATTR_ENTITY_ID]
 
-    return result
+        targets: list[OnkyoMediaPlayer] = []
+        for receiver_entities in hass.data[DATA_MP_ENTITIES]:
+            targets.extend(
+                entity
+                for entity in receiver_entities.values()
+                if entity.entity_id in entity_ids
+            )
+
+        for target in targets:
+            if service.service == SERVICE_SELECT_HDMI_OUTPUT:
+                await target.async_select_output(service.data[ATTR_HDMI_OUTPUT])
+
+    hass.services.async_register(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_SELECT_HDMI_OUTPUT,
+        async_service_handle,
+        schema=ONKYO_SELECT_OUTPUT_SCHEMA,
+    )
 
 
 async def async_setup_platform(
@@ -157,167 +177,130 @@ async def async_setup_platform(
     async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Import config from yaml."""
+    """Set up the Onkyo platform."""
+    await async_register_services(hass)
+
+    receivers: dict[str, Receiver] = {}  # indexed by host
+    all_entities = hass.data.setdefault(DATA_MP_ENTITIES, [])
+
     host = config.get(CONF_HOST)
+    name = config.get(CONF_NAME)
+    max_volume = config[CONF_MAX_VOLUME]
+    receiver_max_volume = config[CONF_RECEIVER_MAX_VOLUME]
+    sources = config[CONF_SOURCES]
 
-    source_mapping: dict[str, InputSource] = {}
-    for zone in ZONES:
-        for source, source_lib in _input_lib_cmds(zone).items():
-            if isinstance(source_lib, str):
-                source_mapping.setdefault(source_lib, source)
-            else:
-                for source_lib_single in source_lib:
-                    source_mapping.setdefault(source_lib_single, source)
+    async def async_setup_receiver(
+        info: ReceiverInfo, discovered: bool, name: str | None
+    ) -> None:
+        entities: dict[str, OnkyoMediaPlayer] = {}
+        all_entities.append(entities)
 
-    sources: dict[InputSource, str] = {}
-    for source_lib_single, source_name in config[CONF_SOURCES].items():
-        user_source = source_mapping.get(source_lib_single.lower())
-        if user_source is not None:
-            sources[user_source] = source_name
-
-    config[CONF_SOURCES] = sources
-
-    results = []
-    if host is not None:
-        _LOGGER.debug("Importing yaml single: %s", host)
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
-        )
-        results.append((host, result))
-    else:
-        for info in await async_discover():
-            host = info.host
-
-            # Migrate legacy entities.
-            registry = er.async_get(hass)
-            old_unique_id = f"{info.model_name}_{info.identifier}"
-            new_unique_id = f"{info.identifier}_main"
-            entity_id = registry.async_get_entity_id(
-                "media_player", DOMAIN, old_unique_id
-            )
-            if entity_id is not None:
-                _LOGGER.debug(
-                    "Migrating unique_id from [%s] to [%s] for entity %s",
-                    old_unique_id,
-                    new_unique_id,
-                    entity_id,
-                )
-                registry.async_update_entity(entity_id, new_unique_id=new_unique_id)
-
-            _LOGGER.debug("Importing yaml discover: %s", info.host)
-            result = await hass.config_entries.flow.async_init(
-                DOMAIN,
-                context={"source": SOURCE_IMPORT},
-                data=config | {CONF_HOST: info.host} | {"info": info},
-            )
-            results.append((host, result))
-
-    _LOGGER.debug("Importing yaml results: %s", results)
-    if not results:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "deprecated_yaml_import_issue_no_discover",
-            breaks_in_ha_version="2025.5.0",
-            is_fixable=False,
-            issue_domain=DOMAIN,
-            severity=IssueSeverity.WARNING,
-            translation_key="deprecated_yaml_import_issue_no_discover",
-            translation_placeholders={"url": ISSUE_URL_PLACEHOLDER},
-        )
-
-    all_successful = True
-    for host, result in results:
-        if (
-            result.get("type") == FlowResultType.CREATE_ENTRY
-            or result.get("reason") == "already_configured"
-        ):
-            continue
-        if error := result.get("reason"):
-            all_successful = False
-            async_create_issue(
-                hass,
-                DOMAIN,
-                f"deprecated_yaml_import_issue_{host}_{error}",
-                breaks_in_ha_version="2025.5.0",
-                is_fixable=False,
-                issue_domain=DOMAIN,
-                severity=IssueSeverity.WARNING,
-                translation_key=f"deprecated_yaml_import_issue_{error}",
-                translation_placeholders={
-                    "host": host,
-                    "url": ISSUE_URL_PLACEHOLDER,
-                },
-            )
-
-    if all_successful:
-        async_create_issue(
-            hass,
-            HOMEASSISTANT_DOMAIN,
-            f"deprecated_yaml_{DOMAIN}",
-            is_fixable=False,
-            issue_domain=DOMAIN,
-            breaks_in_ha_version="2025.5.0",
-            severity=IssueSeverity.WARNING,
-            translation_key="deprecated_yaml",
-            translation_placeholders={
-                "domain": DOMAIN,
-                "integration_title": "onkyo",
-            },
-        )
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: OnkyoConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up MediaPlayer for config entry."""
-    data = entry.runtime_data
-
-    receiver = data.receiver
-    all_entities = hass.data[DATA_MP_ENTITIES]
-
-    entities: dict[str, OnkyoMediaPlayer] = {}
-    all_entities[entry.entry_id] = entities
-
-    volume_resolution: VolumeResolution = entry.options[OPTION_VOLUME_RESOLUTION]
-    max_volume: float = entry.options[OPTION_MAX_VOLUME]
-    sources = data.sources
-
-    def connect_callback(receiver: Receiver) -> None:
-        if not receiver.first_connect:
-            for entity in entities.values():
-                if entity.enabled:
-                    entity.backfill_state()
-
-    def update_callback(receiver: Receiver, message: tuple[str, str, Any]) -> None:
-        zone, _, value = message
-        entity = entities.get(zone)
-        if entity is not None:
-            if entity.enabled:
-                entity.process_update(message)
-        elif zone in ZONES and value != "N/A":
-            # When we receive the status for a zone, and the value is not "N/A",
-            # then zone is available on the receiver, so we create the entity for it.
+        @callback
+        def async_onkyo_update_callback(
+            message: tuple[str, str, Any], origin: str
+        ) -> None:
+            """Process new message from receiver."""
+            receiver = receivers[origin]
             _LOGGER.debug(
-                "Discovered %s on %s (%s)",
-                ZONES[zone],
-                receiver.model_name,
-                receiver.host,
+                "Received update callback from %s: %s", receiver.name, message
             )
-            zone_entity = OnkyoMediaPlayer(
-                receiver,
-                zone,
-                volume_resolution=volume_resolution,
-                max_volume=max_volume,
-                sources=sources,
-            )
-            entities[zone] = zone_entity
-            async_add_entities([zone_entity])
 
-    receiver.callbacks.connect.append(connect_callback)
-    receiver.callbacks.update.append(update_callback)
+            zone, _, value = message
+            entity = entities.get(zone)
+            if entity is not None:
+                if entity.enabled:
+                    entity.process_update(message)
+            elif zone in ZONES and value != "N/A":
+                # When we receive the status for a zone, and the value is not "N/A",
+                # then zone is available on the receiver, so we create the entity for it.
+                _LOGGER.debug("Discovered %s on %s", ZONES[zone], receiver.name)
+                zone_entity = OnkyoMediaPlayer(
+                    receiver, sources, zone, max_volume, receiver_max_volume
+                )
+                entities[zone] = zone_entity
+                async_add_entities([zone_entity])
+
+        @callback
+        def async_onkyo_connect_callback(origin: str) -> None:
+            """Receiver (re)connected."""
+            receiver = receivers[origin]
+            _LOGGER.debug(
+                "Receiver (re)connected: %s (%s)", receiver.name, receiver.conn.host
+            )
+
+            for entity in entities.values():
+                entity.backfill_state()
+
+        _LOGGER.debug("Creating receiver: %s (%s)", info.model_name, info.host)
+        connection = await pyeiscp.Connection.create(
+            host=info.host,
+            port=info.port,
+            update_callback=async_onkyo_update_callback,
+            connect_callback=async_onkyo_connect_callback,
+        )
+
+        receiver = Receiver(
+            conn=connection,
+            model_name=info.model_name,
+            identifier=info.identifier,
+            name=name or info.model_name,
+            discovered=discovered,
+        )
+
+        receivers[connection.host] = receiver
+
+        # Discover what zones are available for the receiver by querying the power.
+        # If we get a response for the specific zone, it means it is available.
+        for zone in ZONES:
+            receiver.conn.query_property(zone, "power")
+
+        # Add the main zone to entities, since it is always active.
+        _LOGGER.debug("Adding Main Zone on %s", receiver.name)
+        main_entity = OnkyoMediaPlayer(
+            receiver, sources, "main", max_volume, receiver_max_volume
+        )
+        entities["main"] = main_entity
+        async_add_entities([main_entity])
+
+    if host is not None:
+        if host in KNOWN_HOSTS:
+            return
+
+        _LOGGER.debug("Manually creating receiver: %s (%s)", name, host)
+
+        async def async_onkyo_interview_callback(conn: pyeiscp.Connection) -> None:
+            """Receiver interviewed, connection not yet active."""
+            info = ReceiverInfo(conn.host, conn.port, conn.name, conn.identifier)
+            _LOGGER.debug("Receiver interviewed: %s (%s)", info.model_name, info.host)
+            if info.host not in KNOWN_HOSTS:
+                KNOWN_HOSTS.append(info.host)
+                await async_setup_receiver(info, False, name)
+
+        await pyeiscp.Connection.discover(
+            host=host,
+            discovery_callback=async_onkyo_interview_callback,
+        )
+    else:
+        _LOGGER.debug("Discovering receivers")
+
+        async def async_onkyo_discovery_callback(conn: pyeiscp.Connection) -> None:
+            """Receiver discovered, connection not yet active."""
+            info = ReceiverInfo(conn.host, conn.port, conn.name, conn.identifier)
+            _LOGGER.debug("Receiver discovered: %s (%s)", info.model_name, info.host)
+            if info.host not in KNOWN_HOSTS:
+                KNOWN_HOSTS.append(info.host)
+                await async_setup_receiver(info, True, None)
+
+        await pyeiscp.Connection.discover(
+            discovery_callback=async_onkyo_discovery_callback,
+        )
+
+    @callback
+    def close_receiver(_event: Event) -> None:
+        for receiver in receivers.values():
+            receiver.conn.close()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, close_receiver)
 
 
 class OnkyoMediaPlayer(MediaPlayerEntity):
@@ -333,30 +316,27 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
     def __init__(
         self,
         receiver: Receiver,
+        sources: dict[str, str],
         zone: str,
-        *,
-        volume_resolution: VolumeResolution,
-        max_volume: float,
-        sources: dict[InputSource, str],
+        max_volume: int,
+        volume_resolution: int,
     ) -> None:
         """Initialize the Onkyo Receiver."""
         self._receiver = receiver
-        name = receiver.model_name
+        name = receiver.name
         identifier = receiver.identifier
         self._attr_name = f"{name}{' ' + ZONES[zone] if zone != 'main' else ''}"
-        self._attr_unique_id = f"{identifier}_{zone}"
+        if receiver.discovered and zone == "main":
+            # keep legacy unique_id
+            self._attr_unique_id = f"{name}_{identifier}"
+        else:
+            self._attr_unique_id = f"{identifier}_{zone}"
 
         self._zone = zone
-
-        self._volume_resolution = volume_resolution
+        self._source_mapping = sources
+        self._reverse_mapping = {value: key for key, value in sources.items()}
         self._max_volume = max_volume
-
-        self._name_mapping = sources
-        self._reverse_name_mapping = {value: key for key, value in sources.items()}
-        self._lib_mapping = _input_lib_cmds(zone)
-        self._reverse_lib_mapping = {
-            value: key for key, value in self._lib_mapping.items()
-        }
+        self._volume_resolution = volume_resolution
 
         self._attr_source_list = list(sources.values())
         self._attr_extra_state_attributes = {}
@@ -428,13 +408,9 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
     async def async_select_source(self, source: str) -> None:
         """Select input source."""
         if self.source_list and source in self.source_list:
-            source_lib = self._lib_mapping[self._reverse_name_mapping[source]]
-            if isinstance(source_lib, str):
-                source_lib_single = source_lib
-            else:
-                source_lib_single = source_lib[0]
+            source = self._reverse_mapping[source]
         self._update_receiver(
-            "input-selector" if self._zone == "main" else "selector", source_lib_single
+            "input-selector" if self._zone == "main" else "selector", source
         )
 
     async def async_select_output(self, hdmi_output: str) -> None:
@@ -446,7 +422,7 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
     ) -> None:
         """Play radio station by preset number."""
         if self.source is not None:
-            source = self._reverse_name_mapping[self.source]
+            source = self._reverse_mapping[self.source]
             if media_type.lower() == "radio" and source in DEFAULT_PLAYABLE_SOURCES:
                 self._update_receiver("preset", media_id)
 
@@ -490,10 +466,9 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
         elif command in ["volume", "master-volume"] and value != "N/A":
             self._supports_volume = True
             # AMP_VOL / (VOL_RESOLUTION * (MAX_VOL / 100))
-            volume_level: float = value / (
+            self._attr_volume_level = value / (
                 self._volume_resolution * self._max_volume / 100
             )
-            self._attr_volume_level = min(1, volume_level)
         elif command in ["muting", "audio-muting"]:
             self._attr_is_volume_muted = bool(value == "on")
         elif command in ["selector", "input-selector"]:
@@ -518,17 +493,18 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
         self.async_write_ha_state()
 
     @callback
-    def _parse_source(self, source_lib: InputLibValue) -> None:
-        source = self._reverse_lib_mapping[source_lib]
-        if source in self._name_mapping:
-            self._attr_source = self._name_mapping[source]
-            return
-
-        source_meaning = source.value_meaning
-        _LOGGER.error(
-            'Input source "%s" not in source list: %s', source_meaning, self.entity_id
-        )
-        self._attr_source = source_meaning
+    def _parse_source(self, source_raw: str | int | tuple[str]) -> None:
+        # source is either a tuple of values or a single value,
+        # so we convert to a tuple, when it is a single value.
+        if isinstance(source_raw, str | int):
+            source = (str(source_raw),)
+        else:
+            source = source_raw
+        for value in source:
+            if value in self._source_mapping:
+                self._attr_source = self._source_mapping[value]
+                return
+        self._attr_source = "_".join(source)
 
     @callback
     def _parse_audio_information(
diff --git a/homeassistant/components/onkyo/receiver.py b/homeassistant/components/onkyo/receiver.py
index cc6cbbc95fb..eb20f327b69 100644
--- a/homeassistant/components/onkyo/receiver.py
+++ b/homeassistant/components/onkyo/receiver.py
@@ -2,29 +2,10 @@
 
 from __future__ import annotations
 
-import asyncio
-from collections.abc import Callable, Iterable
-import contextlib
-from dataclasses import dataclass, field
-import logging
-from typing import Any
+from dataclasses import dataclass
 
 import pyeiscp
 
-from .const import DEVICE_DISCOVERY_TIMEOUT, DEVICE_INTERVIEW_TIMEOUT, ZONES
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class Callbacks:
-    """Onkyo Receiver Callbacks."""
-
-    connect: list[Callable[[Receiver], None]] = field(default_factory=list)
-    update: list[Callable[[Receiver, tuple[str, str, Any]], None]] = field(
-        default_factory=list
-    )
-
 
 @dataclass
 class Receiver:
@@ -33,62 +14,8 @@ class Receiver:
     conn: pyeiscp.Connection
     model_name: str
     identifier: str
-    host: str
-    first_connect: bool = True
-    callbacks: Callbacks = field(default_factory=Callbacks)
-
-    @classmethod
-    async def async_create(cls, info: ReceiverInfo) -> Receiver:
-        """Set up Onkyo Receiver."""
-
-        receiver: Receiver | None = None
-
-        def on_connect(_origin: str) -> None:
-            assert receiver is not None
-            receiver.on_connect()
-
-        def on_update(message: tuple[str, str, Any], _origin: str) -> None:
-            assert receiver is not None
-            receiver.on_update(message)
-
-        _LOGGER.debug("Creating receiver: %s (%s)", info.model_name, info.host)
-
-        connection = await pyeiscp.Connection.create(
-            host=info.host,
-            port=info.port,
-            connect_callback=on_connect,
-            update_callback=on_update,
-            auto_connect=False,
-        )
-
-        return (
-            receiver := cls(
-                conn=connection,
-                model_name=info.model_name,
-                identifier=info.identifier,
-                host=info.host,
-            )
-        )
-
-    def on_connect(self) -> None:
-        """Receiver (re)connected."""
-        _LOGGER.debug("Receiver (re)connected: %s (%s)", self.model_name, self.host)
-
-        # Discover what zones are available for the receiver by querying the power.
-        # If we get a response for the specific zone, it means it is available.
-        for zone in ZONES:
-            self.conn.query_property(zone, "power")
-
-        for callback in self.callbacks.connect:
-            callback(self)
-
-        self.first_connect = False
-
-    def on_update(self, message: tuple[str, str, Any]) -> None:
-        """Process new message from the receiver."""
-        _LOGGER.debug("Received update callback from %s: %s", self.model_name, message)
-        for callback in self.callbacks.update:
-            callback(self, message)
+    name: str
+    discovered: bool
 
 
 @dataclass
@@ -99,53 +26,3 @@ class ReceiverInfo:
     port: int
     model_name: str
     identifier: str
-
-
-async def async_interview(host: str) -> ReceiverInfo | None:
-    """Interview Onkyo Receiver."""
-    _LOGGER.debug("Interviewing receiver: %s", host)
-
-    receiver_info: ReceiverInfo | None = None
-
-    event = asyncio.Event()
-
-    async def _callback(conn: pyeiscp.Connection) -> None:
-        """Receiver interviewed, connection not yet active."""
-        nonlocal receiver_info
-        if receiver_info is None:
-            info = ReceiverInfo(host, conn.port, conn.name, conn.identifier)
-            _LOGGER.debug("Receiver interviewed: %s (%s)", info.model_name, info.host)
-            receiver_info = info
-            event.set()
-
-    timeout = DEVICE_INTERVIEW_TIMEOUT
-
-    await pyeiscp.Connection.discover(
-        host=host, discovery_callback=_callback, timeout=timeout
-    )
-
-    with contextlib.suppress(asyncio.TimeoutError):
-        await asyncio.wait_for(event.wait(), timeout)
-
-    return receiver_info
-
-
-async def async_discover() -> Iterable[ReceiverInfo]:
-    """Discover Onkyo Receivers."""
-    _LOGGER.debug("Discovering receivers")
-
-    receiver_infos: list[ReceiverInfo] = []
-
-    async def _callback(conn: pyeiscp.Connection) -> None:
-        """Receiver discovered, connection not yet active."""
-        info = ReceiverInfo(conn.host, conn.port, conn.name, conn.identifier)
-        _LOGGER.debug("Receiver discovered: %s (%s)", info.model_name, info.host)
-        receiver_infos.append(info)
-
-    timeout = DEVICE_DISCOVERY_TIMEOUT
-
-    await pyeiscp.Connection.discover(discovery_callback=_callback, timeout=timeout)
-
-    await asyncio.sleep(timeout)
-
-    return receiver_infos
diff --git a/homeassistant/components/onkyo/services.py b/homeassistant/components/onkyo/services.py
deleted file mode 100644
index d875d8287fe..00000000000
--- a/homeassistant/components/onkyo/services.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""Onkyo services."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import voluptuous as vol
-
-from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.helpers import config_validation as cv
-from homeassistant.util.hass_dict import HassKey
-
-from .const import DOMAIN
-
-if TYPE_CHECKING:
-    from .media_player import OnkyoMediaPlayer
-
-DATA_MP_ENTITIES: HassKey[dict[str, dict[str, OnkyoMediaPlayer]]] = HassKey(DOMAIN)
-
-ATTR_HDMI_OUTPUT = "hdmi_output"
-ACCEPTED_VALUES = [
-    "no",
-    "analog",
-    "yes",
-    "out",
-    "out-sub",
-    "sub",
-    "hdbaset",
-    "both",
-    "up",
-]
-ONKYO_SELECT_OUTPUT_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
-        vol.Required(ATTR_HDMI_OUTPUT): vol.In(ACCEPTED_VALUES),
-    }
-)
-SERVICE_SELECT_HDMI_OUTPUT = "onkyo_select_hdmi_output"
-
-
-async def async_register_services(hass: HomeAssistant) -> None:
-    """Register Onkyo services."""
-
-    hass.data.setdefault(DATA_MP_ENTITIES, {})
-
-    async def async_service_handle(service: ServiceCall) -> None:
-        """Handle for services."""
-        entity_ids = service.data[ATTR_ENTITY_ID]
-
-        targets: list[OnkyoMediaPlayer] = []
-        for receiver_entities in hass.data[DATA_MP_ENTITIES].values():
-            targets.extend(
-                entity
-                for entity in receiver_entities.values()
-                if entity.entity_id in entity_ids
-            )
-
-        for target in targets:
-            if service.service == SERVICE_SELECT_HDMI_OUTPUT:
-                await target.async_select_output(service.data[ATTR_HDMI_OUTPUT])
-
-    hass.services.async_register(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_SELECT_HDMI_OUTPUT,
-        async_service_handle,
-        schema=ONKYO_SELECT_OUTPUT_SCHEMA,
-    )
diff --git a/homeassistant/components/onkyo/strings.json b/homeassistant/components/onkyo/strings.json
deleted file mode 100644
index 1b0eadcc45e..00000000000
--- a/homeassistant/components/onkyo/strings.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "config": {
-    "step": {
-      "user": {
-        "menu_options": {
-          "manual": "Manual entry",
-          "eiscp_discovery": "Onkyo discovery"
-        }
-      },
-      "manual": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        }
-      },
-      "eiscp_discovery": {
-        "data": {
-          "device": "[%key:common::config_flow::data::device%]"
-        }
-      },
-      "configure_receiver": {
-        "description": "Configure {name}",
-        "data": {
-          "volume_resolution": "Number of steps it takes for the receiver to go from the lowest to the highest possible volume",
-          "input_sources": "List of input sources supported by the receiver"
-        }
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "empty_input_source_list": "Input source list cannot be empty",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "The serial number of the device does not match the previous serial number",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "data": {
-          "max_volume": "Maximum volume limit (%)"
-        }
-      }
-    }
-  },
-  "issues": {
-    "deprecated_yaml_import_issue_no_discover": {
-      "title": "The Onkyo YAML configuration import failed",
-      "description": "Configuring Onkyo using YAML is being removed but no receivers were discovered when importing your YAML configuration.\n\nEnsure the connection to the receiver works and restart Home Assistant to try again or remove the Onkyo YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
-    },
-    "deprecated_yaml_import_issue_cannot_connect": {
-      "title": "The Onkyo YAML configuration import failed",
-      "description": "Configuring Onkyo using YAML is being removed but there was a connection error when importing your YAML configuration for host {host}.\n\nEnsure the connection to the receiver works and restart Home Assistant to try again or remove the Onkyo YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
-    }
-  }
-}
diff --git a/homeassistant/components/onvif/config_flow.py b/homeassistant/components/onvif/config_flow.py
index 66e566af0bf..34f322b9f75 100644
--- a/homeassistant/components/onvif/config_flow.py
+++ b/homeassistant/components/onvif/config_flow.py
@@ -391,6 +391,7 @@ class OnvifOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize ONVIF options flow."""
+        self.config_entry = config_entry
         self.options = dict(config_entry.options)
 
     async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
diff --git a/homeassistant/components/open_meteo/__init__.py b/homeassistant/components/open_meteo/__init__.py
index 6deb63904ff..e3bf763f429 100644
--- a/homeassistant/components/open_meteo/__init__.py
+++ b/homeassistant/components/open_meteo/__init__.py
@@ -62,7 +62,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator: DataUpdateCoordinator[Forecast] = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name=f"{DOMAIN}_{entry.data[CONF_ZONE]}",
         update_interval=SCAN_INTERVAL,
         update_method=async_update_forecast,
diff --git a/homeassistant/components/openai_conversation/config_flow.py b/homeassistant/components/openai_conversation/config_flow.py
index 2a1764e6b5e..c6b8487ad0d 100644
--- a/homeassistant/components/openai_conversation/config_flow.py
+++ b/homeassistant/components/openai_conversation/config_flow.py
@@ -115,6 +115,7 @@ class OpenAIOptionsFlow(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self.last_rendered_recommended = config_entry.options.get(
             CONF_RECOMMENDED, False
         )
diff --git a/homeassistant/components/openexchangerates/manifest.json b/homeassistant/components/openexchangerates/manifest.json
index 9e5cd95a93d..cce90d0fb12 100644
--- a/homeassistant/components/openexchangerates/manifest.json
+++ b/homeassistant/components/openexchangerates/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/openexchangerates",
   "iot_class": "cloud_polling",
-  "requirements": ["aioopenexchangerates==0.6.8"]
+  "requirements": ["aioopenexchangerates==0.6.2"]
 }
diff --git a/homeassistant/components/opensky/config_flow.py b/homeassistant/components/opensky/config_flow.py
index 867a4781265..3cfd1ad30a0 100644
--- a/homeassistant/components/opensky/config_flow.py
+++ b/homeassistant/components/opensky/config_flow.py
@@ -13,11 +13,12 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_LATITUDE,
     CONF_LONGITUDE,
+    CONF_NAME,
     CONF_PASSWORD,
     CONF_RADIUS,
     CONF_USERNAME,
@@ -44,7 +45,7 @@ class OpenSkyConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OpenSkyOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OpenSkyOptionsFlowHandler()
+        return OpenSkyOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -82,7 +83,7 @@ class OpenSkyConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         )
 
 
-class OpenSkyOptionsFlowHandler(OptionsFlow):
+class OpenSkyOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """OpenSky Options flow handler."""
 
     async def async_step_init(
@@ -111,7 +112,10 @@ class OpenSkyOptionsFlowHandler(OptionsFlow):
                 except OpenSkyUnauthenticatedError:
                     errors["base"] = "invalid_auth"
             if not errors:
-                return self.async_create_entry(data=user_input)
+                return self.async_create_entry(
+                    title=self.options.get(CONF_NAME, "OpenSky"),
+                    data=user_input,
+                )
 
         return self.async_show_form(
             step_id="init",
@@ -126,6 +130,6 @@ class OpenSkyOptionsFlowHandler(OptionsFlow):
                         vol.Optional(CONF_CONTRIBUTING_USER, default=False): bool,
                     }
                 ),
-                user_input or self.config_entry.options,
+                user_input or self.options,
             ),
         )
diff --git a/homeassistant/components/opentherm_gw/config_flow.py b/homeassistant/components/opentherm_gw/config_flow.py
index 80c16ee88e1..1f52b47cbad 100644
--- a/homeassistant/components/opentherm_gw/config_flow.py
+++ b/homeassistant/components/opentherm_gw/config_flow.py
@@ -49,7 +49,7 @@ class OpenThermGwConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OpenThermGwOptionsFlow:
         """Get the options flow for this handler."""
-        return OpenThermGwOptionsFlow()
+        return OpenThermGwOptionsFlow(config_entry)
 
     async def async_step_init(
         self, info: dict[str, Any] | None = None
@@ -132,6 +132,10 @@ class OpenThermGwConfigFlow(ConfigFlow, domain=DOMAIN):
 class OpenThermGwOptionsFlow(OptionsFlow):
     """Handle opentherm_gw options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize the options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/openweathermap/config_flow.py b/homeassistant/components/openweathermap/config_flow.py
index 8d33e117287..5fe06ea2dcd 100644
--- a/homeassistant/components/openweathermap/config_flow.py
+++ b/homeassistant/components/openweathermap/config_flow.py
@@ -44,7 +44,7 @@ class OpenWeatherMapConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OpenWeatherMapOptionsFlow:
         """Get the options flow for this handler."""
-        return OpenWeatherMapOptionsFlow()
+        return OpenWeatherMapOptionsFlow(config_entry)
 
     async def async_step_user(self, user_input=None) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
@@ -97,6 +97,10 @@ class OpenWeatherMapConfigFlow(ConfigFlow, domain=DOMAIN):
 class OpenWeatherMapOptionsFlow(OptionsFlow):
     """Handle options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(self, user_input: dict | None = None) -> ConfigFlowResult:
         """Manage the options."""
         if user_input is not None:
diff --git a/homeassistant/components/opower/manifest.json b/homeassistant/components/opower/manifest.json
index 593e4cf34b8..39ffc91d5b3 100644
--- a/homeassistant/components/opower/manifest.json
+++ b/homeassistant/components/opower/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opower",
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
-  "requirements": ["opower==0.8.6"]
+  "requirements": ["opower==0.8.4"]
 }
diff --git a/homeassistant/components/osoenergy/icons.json b/homeassistant/components/osoenergy/icons.json
index 42d1f2cc480..60b2d257b8a 100644
--- a/homeassistant/components/osoenergy/icons.json
+++ b/homeassistant/components/osoenergy/icons.json
@@ -11,22 +11,5 @@
         "default": "mdi:water-boiler"
       }
     }
-  },
-  "services": {
-    "get_profile": {
-      "service": "mdi:thermometer-lines"
-    },
-    "set_profile": {
-      "service": "mdi:thermometer-lines"
-    },
-    "set_v40_min": {
-      "service": "mdi:car-coolant-level"
-    },
-    "turn_off": {
-      "service": "mdi:water-boiler-off"
-    },
-    "turn_on": {
-      "service": "mdi:water-boiler"
-    }
   }
 }
diff --git a/homeassistant/components/osoenergy/services.yaml b/homeassistant/components/osoenergy/services.yaml
deleted file mode 100644
index 6c8f5512215..00000000000
--- a/homeassistant/components/osoenergy/services.yaml
+++ /dev/null
@@ -1,261 +0,0 @@
-get_profile:
-  target:
-    entity:
-      domain: water_heater
-set_profile:
-  target:
-    entity:
-      domain: water_heater
-  fields:
-    hour_00:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_01:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_02:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_03:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_04:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_05:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_06:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_07:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_08:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_09:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_10:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_11:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_12:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_13:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_14:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_15:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_16:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_17:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_18:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_19:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_20:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_21:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_22:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-    hour_23:
-      required: false
-      example: 75
-      selector:
-        number:
-          min: 10
-          max: 75
-          step: 1
-          unit_of_measurement: °C
-set_v40_min:
-  target:
-    entity:
-      domain: water_heater
-  fields:
-    v40_min:
-      required: true
-      example: 240
-      selector:
-        number:
-          min: 200
-          max: 550
-          step: 1
-          unit_of_measurement: L
-turn_off:
-  target:
-    entity:
-      domain: water_heater
-  fields:
-    until_temp_limit:
-      required: true
-      default: false
-      example: false
-      selector:
-        boolean:
-turn_on:
-  target:
-    entity:
-      domain: water_heater
-  fields:
-    until_temp_limit:
-      required: true
-      default: false
-      example: false
-      selector:
-        boolean:
diff --git a/homeassistant/components/osoenergy/strings.json b/homeassistant/components/osoenergy/strings.json
index b8f95c021fa..a7963bfa436 100644
--- a/homeassistant/components/osoenergy/strings.json
+++ b/homeassistant/components/osoenergy/strings.json
@@ -91,143 +91,5 @@
         "name": "Temperature one"
       }
     }
-  },
-  "services": {
-    "get_profile": {
-      "name": "Get heater profile",
-      "description": "Get the temperature profile of water heater"
-    },
-    "set_profile": {
-      "name": "Set heater profile",
-      "description": "Set the temperature profile of water heater",
-      "fields": {
-        "hour_00": {
-          "name": "00:00",
-          "description": "00:00 hour"
-        },
-        "hour_01": {
-          "name": "01:00",
-          "description": "01:00 hour"
-        },
-        "hour_02": {
-          "name": "02:00",
-          "description": "02:00 hour"
-        },
-        "hour_03": {
-          "name": "03:00",
-          "description": "03:00 hour"
-        },
-        "hour_04": {
-          "name": "04:00",
-          "description": "04:00 hour"
-        },
-        "hour_05": {
-          "name": "05:00",
-          "description": "05:00 hour"
-        },
-        "hour_06": {
-          "name": "06:00",
-          "description": "06:00 hour"
-        },
-        "hour_07": {
-          "name": "07:00",
-          "description": "07:00 hour"
-        },
-        "hour_08": {
-          "name": "08:00",
-          "description": "08:00 hour"
-        },
-        "hour_09": {
-          "name": "09:00",
-          "description": "09:00 hour"
-        },
-        "hour_10": {
-          "name": "10:00",
-          "description": "10:00 hour"
-        },
-        "hour_11": {
-          "name": "11:00",
-          "description": "11:00 hour"
-        },
-        "hour_12": {
-          "name": "12:00",
-          "description": "12:00 hour"
-        },
-        "hour_13": {
-          "name": "13:00",
-          "description": "13:00 hour"
-        },
-        "hour_14": {
-          "name": "14:00",
-          "description": "14:00 hour"
-        },
-        "hour_15": {
-          "name": "15:00",
-          "description": "15:00 hour"
-        },
-        "hour_16": {
-          "name": "16:00",
-          "description": "16:00 hour"
-        },
-        "hour_17": {
-          "name": "17:00",
-          "description": "17:00 hour"
-        },
-        "hour_18": {
-          "name": "18:00",
-          "description": "18:00 hour"
-        },
-        "hour_19": {
-          "name": "19:00",
-          "description": "19:00 hour"
-        },
-        "hour_20": {
-          "name": "20:00",
-          "description": "20:00 hour"
-        },
-        "hour_21": {
-          "name": "21:00",
-          "description": "21:00 hour"
-        },
-        "hour_22": {
-          "name": "22:00",
-          "description": "22:00 hour"
-        },
-        "hour_23": {
-          "name": "23:00",
-          "description": "23:00 hour"
-        }
-      }
-    },
-    "set_v40_min": {
-      "name": "Set v40 min",
-      "description": "Set the minimum quantity of water at 40°C for a heater",
-      "fields": {
-        "v40_min": {
-          "name": "V40 Min",
-          "description": "Minimum quantity of water at 40°C (200-350 for SAGA S200, 300-550 for SAGA S300)"
-        }
-      }
-    },
-    "turn_off": {
-      "name": "Turn off heating",
-      "description": "Turn off heating for one hour or until min temperature is reached",
-      "fields": {
-        "until_temp_limit": {
-          "name": "Until temperature limit",
-          "description": "Choose if heating should be off until min temperature (True) is reached or for one hour (False)"
-        }
-      }
-    },
-    "turn_on": {
-      "name": "Turn on heating",
-      "description": "Turn on heating for one hour or until max temperature is reached",
-      "fields": {
-        "until_temp_limit": {
-          "name": "Until temperature limit",
-          "description": "Choose if heating should be on until max temperature (True) is reached or for one hour (False)"
-        }
-      }
-    }
   }
 }
diff --git a/homeassistant/components/osoenergy/water_heater.py b/homeassistant/components/osoenergy/water_heater.py
index ff117d6577d..55229e42c2f 100644
--- a/homeassistant/components/osoenergy/water_heater.py
+++ b/homeassistant/components/osoenergy/water_heater.py
@@ -1,11 +1,9 @@
 """Support for OSO Energy water heaters."""
 
-import datetime as dt
 from typing import Any
 
 from apyosoenergyapi import OSOEnergy
 from apyosoenergyapi.helper.const import OSOEnergyWaterHeaterData
-import voluptuous as vol
 
 from homeassistant.components.water_heater import (
     STATE_ECO,
@@ -17,17 +15,12 @@ from homeassistant.components.water_heater import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
-from homeassistant.core import HomeAssistant, ServiceResponse, SupportsResponse
-from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.util.dt as dt_util
-from homeassistant.util.json import JsonValueType
 
 from .const import DOMAIN
 from .entity import OSOEnergyEntity
 
-ATTR_UNTIL_TEMP_LIMIT = "until_temp_limit"
-ATTR_V40MIN = "v40_min"
 CURRENT_OPERATION_MAP: dict[str, Any] = {
     "default": {
         "off": STATE_OFF,
@@ -41,11 +34,6 @@ CURRENT_OPERATION_MAP: dict[str, Any] = {
         "extraenergy": STATE_HIGH_DEMAND,
     },
 }
-SERVICE_GET_PROFILE = "get_profile"
-SERVICE_SET_PROFILE = "set_profile"
-SERVICE_SET_V40MIN = "set_v40_min"
-SERVICE_TURN_OFF = "turn_off"
-SERVICE_TURN_ON = "turn_on"
 
 
 async def async_setup_entry(
@@ -58,102 +46,6 @@ async def async_setup_entry(
         return
     async_add_entities((OSOEnergyWaterHeater(osoenergy, dev) for dev in devices), True)
 
-    platform = entity_platform.async_get_current_platform()
-
-    platform.async_register_entity_service(
-        SERVICE_GET_PROFILE,
-        {},
-        OSOEnergyWaterHeater.async_get_profile.__name__,
-        supports_response=SupportsResponse.ONLY,
-    )
-
-    service_set_profile_schema = cv.make_entity_service_schema(
-        {
-            vol.Optional(f"hour_{hour:02d}"): vol.All(
-                vol.Coerce(int), vol.Range(min=10, max=75)
-            )
-            for hour in range(24)
-        }
-    )
-
-    platform.async_register_entity_service(
-        SERVICE_SET_PROFILE,
-        service_set_profile_schema,
-        OSOEnergyWaterHeater.async_set_profile.__name__,
-    )
-
-    platform.async_register_entity_service(
-        SERVICE_SET_V40MIN,
-        {
-            vol.Required(ATTR_V40MIN): vol.All(
-                vol.Coerce(float), vol.Range(min=200, max=550)
-            ),
-        },
-        OSOEnergyWaterHeater.async_set_v40_min.__name__,
-    )
-
-    platform.async_register_entity_service(
-        SERVICE_TURN_OFF,
-        {vol.Required(ATTR_UNTIL_TEMP_LIMIT): vol.All(cv.boolean)},
-        OSOEnergyWaterHeater.async_oso_turn_off.__name__,
-    )
-
-    platform.async_register_entity_service(
-        SERVICE_TURN_ON,
-        {vol.Required(ATTR_UNTIL_TEMP_LIMIT): vol.All(cv.boolean)},
-        OSOEnergyWaterHeater.async_oso_turn_on.__name__,
-    )
-
-
-def _get_utc_hour(local_hour: int) -> dt.datetime:
-    """Convert the requested local hour to a utc hour for the day.
-
-    Args:
-        local_hour: the local hour (0-23) for the current day to be converted.
-
-    Returns:
-        Datetime representation for the requested hour in utc time for the day.
-
-    """
-    now = dt_util.now()
-    local_time = now.replace(hour=local_hour, minute=0, second=0, microsecond=0)
-    return dt_util.as_utc(local_time)
-
-
-def _get_local_hour(utc_hour: int) -> dt.datetime:
-    """Convert the requested utc hour to a local hour for the day.
-
-    Args:
-        utc_hour: the utc hour (0-23) for the current day to be converted.
-
-    Returns:
-        Datetime representation for the requested hour in local time for the day.
-
-    """
-    utc_now = dt_util.utcnow()
-    utc_time = utc_now.replace(hour=utc_hour, minute=0, second=0, microsecond=0)
-    return dt_util.as_local(utc_time)
-
-
-def _convert_profile_to_local(values: list[float]) -> list[JsonValueType]:
-    """Convert UTC profile to local.
-
-    Receives a device temperature schedule - 24 values for the day where the index represents the hour of the day in UTC.
-    Converts the schedule to local time.
-
-    Args:
-        values: list of floats representing the 24 hour temperature schedule for the device
-    Returns:
-        The device temperature schedule in local time.
-
-    """
-    profile: list[JsonValueType] = [0.0] * 24
-    for hour in range(24):
-        local_hour = _get_local_hour(hour)
-        profile[local_hour.hour] = float(values[hour])
-
-    return profile
-
 
 class OSOEnergyWaterHeater(
     OSOEnergyEntity[OSOEnergyWaterHeaterData], WaterHeaterEntity
@@ -161,9 +53,7 @@ class OSOEnergyWaterHeater(
     """OSO Energy Water Heater Device."""
 
     _attr_name = None
-    _attr_supported_features = (
-        WaterHeaterEntityFeature.TARGET_TEMPERATURE | WaterHeaterEntityFeature.ON_OFF
-    )
+    _attr_supported_features = WaterHeaterEntityFeature.TARGET_TEMPERATURE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     def __init__(
@@ -241,36 +131,6 @@ class OSOEnergyWaterHeater(
 
         await self.osoenergy.hotwater.set_profile(self.entity_data, profile)
 
-    async def async_get_profile(self) -> ServiceResponse:
-        """Return the current temperature profile of the device."""
-
-        profile = self.entity_data.profile
-        return {"profile": _convert_profile_to_local(profile)}
-
-    async def async_set_profile(self, **kwargs: Any) -> None:
-        """Handle the service call."""
-        profile = self.entity_data.profile
-
-        for hour in range(24):
-            hour_key = f"hour_{hour:02d}"
-
-            if hour_key in kwargs:
-                profile[_get_utc_hour(hour).hour] = kwargs[hour_key]
-
-        await self.osoenergy.hotwater.set_profile(self.entity_data, profile)
-
-    async def async_set_v40_min(self, v40_min) -> None:
-        """Handle the service call."""
-        await self.osoenergy.hotwater.set_v40_min(self.entity_data, v40_min)
-
-    async def async_oso_turn_off(self, until_temp_limit) -> None:
-        """Handle the service call."""
-        await self.osoenergy.hotwater.turn_off(self.entity_data, until_temp_limit)
-
-    async def async_oso_turn_on(self, until_temp_limit) -> None:
-        """Handle the service call."""
-        await self.osoenergy.hotwater.turn_on(self.entity_data, until_temp_limit)
-
     async def async_update(self) -> None:
         """Update all Node data from Hive."""
         await self.osoenergy.session.update_data()
diff --git a/homeassistant/components/otbr/config_flow.py b/homeassistant/components/otbr/config_flow.py
index aff79ca4651..f24d141247d 100644
--- a/homeassistant/components/otbr/config_flow.py
+++ b/homeassistant/components/otbr/config_flow.py
@@ -13,7 +13,7 @@ from python_otbr_api.tlv_parser import MeshcopTLVType
 import voluptuous as vol
 import yarl
 
-from homeassistant.components.hassio import AddonError, AddonManager
+from homeassistant.components.hassio import AddonError, AddonManager, HassioServiceInfo
 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, ConfigFlowResult
@@ -21,7 +21,6 @@ from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .const import DEFAULT_CHANNEL, DOMAIN
 from .util import (
diff --git a/homeassistant/components/overkiz/alarm_control_panel.py b/homeassistant/components/overkiz/alarm_control_panel.py
index bdbf4d0cc8d..151f91790cf 100644
--- a/homeassistant/components/overkiz/alarm_control_panel.py
+++ b/homeassistant/components/overkiz/alarm_control_panel.py
@@ -14,10 +14,18 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityDescription,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -33,7 +41,7 @@ class OverkizAlarmDescription(AlarmControlPanelEntityDescription):
     """Class to describe an Overkiz alarm control panel."""
 
     supported_features: AlarmControlPanelEntityFeature
-    fn_state: Callable[[Callable[[str], OverkizStateType]], AlarmControlPanelState]
+    fn_state: Callable[[Callable[[str], OverkizStateType]], str]
 
     alarm_disarm: str | None = None
     alarm_disarm_args: OverkizStateType | list[OverkizStateType] = None
@@ -47,44 +55,42 @@ class OverkizAlarmDescription(AlarmControlPanelEntityDescription):
     alarm_trigger_args: OverkizStateType | list[OverkizStateType] = None
 
 
-MAP_INTERNAL_STATUS_STATE: dict[str, AlarmControlPanelState] = {
-    OverkizCommandParam.OFF: AlarmControlPanelState.DISARMED,
-    OverkizCommandParam.ZONE_1: AlarmControlPanelState.ARMED_HOME,
-    OverkizCommandParam.ZONE_2: AlarmControlPanelState.ARMED_NIGHT,
-    OverkizCommandParam.TOTAL: AlarmControlPanelState.ARMED_AWAY,
+MAP_INTERNAL_STATUS_STATE: dict[str, str] = {
+    OverkizCommandParam.OFF: STATE_ALARM_DISARMED,
+    OverkizCommandParam.ZONE_1: STATE_ALARM_ARMED_HOME,
+    OverkizCommandParam.ZONE_2: STATE_ALARM_ARMED_NIGHT,
+    OverkizCommandParam.TOTAL: STATE_ALARM_ARMED_AWAY,
 }
 
 
-def _state_tsk_alarm_controller(
-    select_state: Callable[[str], OverkizStateType],
-) -> AlarmControlPanelState:
+def _state_tsk_alarm_controller(select_state: Callable[[str], OverkizStateType]) -> str:
     """Return the state of the device."""
     if (
         cast(str, select_state(OverkizState.INTERNAL_INTRUSION_DETECTED))
         == OverkizCommandParam.DETECTED
     ):
-        return AlarmControlPanelState.TRIGGERED
+        return STATE_ALARM_TRIGGERED
 
     if cast(str, select_state(OverkizState.INTERNAL_CURRENT_ALARM_MODE)) != cast(
         str, select_state(OverkizState.INTERNAL_TARGET_ALARM_MODE)
     ):
-        return AlarmControlPanelState.PENDING
+        return STATE_ALARM_PENDING
 
     return MAP_INTERNAL_STATUS_STATE[
         cast(str, select_state(OverkizState.INTERNAL_TARGET_ALARM_MODE))
     ]
 
 
-MAP_CORE_ACTIVE_ZONES: dict[str, AlarmControlPanelState] = {
-    OverkizCommandParam.A: AlarmControlPanelState.ARMED_HOME,
-    f"{OverkizCommandParam.A},{OverkizCommandParam.B}": AlarmControlPanelState.ARMED_NIGHT,
-    f"{OverkizCommandParam.A},{OverkizCommandParam.B},{OverkizCommandParam.C}": AlarmControlPanelState.ARMED_AWAY,
+MAP_CORE_ACTIVE_ZONES: dict[str, str] = {
+    OverkizCommandParam.A: STATE_ALARM_ARMED_HOME,
+    f"{OverkizCommandParam.A},{OverkizCommandParam.B}": STATE_ALARM_ARMED_NIGHT,
+    f"{OverkizCommandParam.A},{OverkizCommandParam.B},{OverkizCommandParam.C}": STATE_ALARM_ARMED_AWAY,
 }
 
 
 def _state_stateful_alarm_controller(
     select_state: Callable[[str], OverkizStateType],
-) -> AlarmControlPanelState:
+) -> str:
     """Return the state of the device."""
     if state := cast(str, select_state(OverkizState.CORE_ACTIVE_ZONES)):
         # The Stateful Alarm Controller has 3 zones with the following options:
@@ -93,44 +99,44 @@ def _state_stateful_alarm_controller(
         if state in MAP_CORE_ACTIVE_ZONES:
             return MAP_CORE_ACTIVE_ZONES[state]
 
-        return AlarmControlPanelState.ARMED_CUSTOM_BYPASS
+        return STATE_ALARM_ARMED_CUSTOM_BYPASS
 
-    return AlarmControlPanelState.DISARMED
+    return STATE_ALARM_DISARMED
 
 
-MAP_MYFOX_STATUS_STATE: dict[str, AlarmControlPanelState] = {
-    OverkizCommandParam.ARMED: AlarmControlPanelState.ARMED_AWAY,
-    OverkizCommandParam.DISARMED: AlarmControlPanelState.DISARMED,
-    OverkizCommandParam.PARTIAL: AlarmControlPanelState.ARMED_NIGHT,
+MAP_MYFOX_STATUS_STATE: dict[str, str] = {
+    OverkizCommandParam.ARMED: STATE_ALARM_ARMED_AWAY,
+    OverkizCommandParam.DISARMED: STATE_ALARM_DISARMED,
+    OverkizCommandParam.PARTIAL: STATE_ALARM_ARMED_NIGHT,
 }
 
 
 def _state_myfox_alarm_controller(
     select_state: Callable[[str], OverkizStateType],
-) -> AlarmControlPanelState:
+) -> str:
     """Return the state of the device."""
     if (
         cast(str, select_state(OverkizState.CORE_INTRUSION))
         == OverkizCommandParam.DETECTED
     ):
-        return AlarmControlPanelState.TRIGGERED
+        return STATE_ALARM_TRIGGERED
 
     return MAP_MYFOX_STATUS_STATE[
         cast(str, select_state(OverkizState.MYFOX_ALARM_STATUS))
     ]
 
 
-MAP_ARM_TYPE: dict[str, AlarmControlPanelState] = {
-    OverkizCommandParam.DISARMED: AlarmControlPanelState.DISARMED,
-    OverkizCommandParam.ARMED_DAY: AlarmControlPanelState.ARMED_HOME,
-    OverkizCommandParam.ARMED_NIGHT: AlarmControlPanelState.ARMED_NIGHT,
-    OverkizCommandParam.ARMED: AlarmControlPanelState.ARMED_AWAY,
+MAP_ARM_TYPE: dict[str, str] = {
+    OverkizCommandParam.DISARMED: STATE_ALARM_DISARMED,
+    OverkizCommandParam.ARMED_DAY: STATE_ALARM_ARMED_HOME,
+    OverkizCommandParam.ARMED_NIGHT: STATE_ALARM_ARMED_NIGHT,
+    OverkizCommandParam.ARMED: STATE_ALARM_ARMED_AWAY,
 }
 
 
 def _state_alarm_panel_controller(
     select_state: Callable[[str], OverkizStateType],
-) -> AlarmControlPanelState:
+) -> str:
     """Return the state of the device."""
     return MAP_ARM_TYPE[
         cast(str, select_state(OverkizState.VERISURE_ALARM_PANEL_MAIN_ARM_TYPE))
@@ -248,7 +254,7 @@ class OverkizAlarmControlPanel(OverkizDescriptiveEntity, AlarmControlPanelEntity
         self._attr_supported_features = self.entity_description.supported_features
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState:
+    def state(self) -> str:
         """Return the state of the device."""
         return self.entity_description.fn_state(self.executor.select_state)
 
diff --git a/homeassistant/components/ovo_energy/__init__.py b/homeassistant/components/ovo_energy/__init__.py
index 436180407f4..0576421fa71 100644
--- a/homeassistant/components/ovo_energy/__init__.py
+++ b/homeassistant/components/ovo_energy/__init__.py
@@ -67,7 +67,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator[OVODailyUsage](
         hass,
         _LOGGER,
-        config_entry=entry,
         # Name of the data. For logging purposes.
         name="sensor",
         update_method=async_update_data,
diff --git a/homeassistant/components/ovo_energy/config_flow.py b/homeassistant/components/ovo_energy/config_flow.py
index 53fc4f8eff6..60a2870ef59 100644
--- a/homeassistant/components/ovo_energy/config_flow.py
+++ b/homeassistant/components/ovo_energy/config_flow.py
@@ -79,26 +79,22 @@ class OVOEnergyFlowHandler(ConfigFlow, domain=DOMAIN):
 
     async def async_step_reauth(
         self,
-        entry_data: Mapping[str, Any],
+        user_input: Mapping[str, Any],
     ) -> ConfigFlowResult:
         """Handle configuration by re-auth."""
-        self.username = entry_data.get(CONF_USERNAME)
-        self.account = entry_data.get(CONF_ACCOUNT)
+        errors = {}
+
+        if user_input and user_input.get(CONF_USERNAME):
+            self.username = user_input[CONF_USERNAME]
+
+        if user_input and user_input.get(CONF_ACCOUNT):
+            self.account = user_input[CONF_ACCOUNT]
 
         if self.username:
             # If we have a username, use it as flow title
             self.context["title_placeholders"] = {CONF_USERNAME: self.username}
 
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self,
-        user_input: Mapping[str, Any] | None = None,
-    ) -> ConfigFlowResult:
-        """Handle configuration by re-auth."""
-        errors = {}
-
-        if user_input is not None:
+        if user_input is not None and user_input.get(CONF_PASSWORD) is not None:
             client = OVOEnergy(
                 client_session=async_get_clientsession(self.hass),
             )
@@ -115,13 +111,19 @@ class OVOEnergyFlowHandler(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "connection_error"
             else:
                 if authenticated:
-                    return self.async_update_reload_and_abort(
-                        self._get_reauth_entry(),
-                        data_updates={CONF_PASSWORD: user_input[CONF_PASSWORD]},
-                    )
+                    entry = await self.async_set_unique_id(self.username)
+                    if entry:
+                        self.hass.config_entries.async_update_entry(
+                            entry,
+                            data={
+                                CONF_USERNAME: self.username,
+                                CONF_PASSWORD: user_input[CONF_PASSWORD],
+                            },
+                        )
+                        return self.async_abort(reason="reauth_successful")
 
                 errors["base"] = "authorization_error"
 
         return self.async_show_form(
-            step_id="reauth_confirm", data_schema=REAUTH_SCHEMA, errors=errors
+            step_id="reauth", data_schema=REAUTH_SCHEMA, errors=errors
         )
diff --git a/homeassistant/components/ovo_energy/strings.json b/homeassistant/components/ovo_energy/strings.json
index 3dc11e3a601..fda0c2996dc 100644
--- a/homeassistant/components/ovo_energy/strings.json
+++ b/homeassistant/components/ovo_energy/strings.json
@@ -1,15 +1,10 @@
 {
   "config": {
     "flow_title": "{username}",
-    "abort": {
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    },
     "error": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "connection_error": "[%key:common::config_flow::error::cannot_connect%]",
-      "authorization_error": "[%key:common::config_flow::error::invalid_auth%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "step": {
       "user": {
@@ -21,7 +16,7 @@
         "description": "Set up an OVO Energy instance to access your energy usage.",
         "title": "Add OVO Energy Account"
       },
-      "reauth_confirm": {
+      "reauth": {
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
         },
diff --git a/homeassistant/components/p1_monitor/config_flow.py b/homeassistant/components/p1_monitor/config_flow.py
index a7ede186d72..966fdc350c5 100644
--- a/homeassistant/components/p1_monitor/config_flow.py
+++ b/homeassistant/components/p1_monitor/config_flow.py
@@ -10,12 +10,7 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import (
-    NumberSelector,
-    NumberSelectorConfig,
-    NumberSelectorMode,
-    TextSelector,
-)
+from homeassistant.helpers.selector import TextSelector
 
 from .const import DOMAIN
 
@@ -57,14 +52,7 @@ class P1MonitorFlowHandler(ConfigFlow, domain=DOMAIN):
             data_schema=vol.Schema(
                 {
                     vol.Required(CONF_HOST): TextSelector(),
-                    vol.Required(CONF_PORT, default=80): vol.All(
-                        NumberSelector(
-                            NumberSelectorConfig(
-                                min=1, max=65535, mode=NumberSelectorMode.BOX
-                            ),
-                        ),
-                        vol.Coerce(int),
-                    ),
+                    vol.Required(CONF_PORT, default=80): int,
                 }
             ),
             errors=errors,
diff --git a/homeassistant/components/palazzetti/__init__.py b/homeassistant/components/palazzetti/__init__.py
deleted file mode 100644
index ecaa8089097..00000000000
--- a/homeassistant/components/palazzetti/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""The Palazzetti integration."""
-
-from __future__ import annotations
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from .coordinator import PalazzettiConfigEntry, PalazzettiDataUpdateCoordinator
-
-PLATFORMS: list[Platform] = [Platform.CLIMATE]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: PalazzettiConfigEntry) -> bool:
-    """Set up Palazzetti from a config entry."""
-
-    coordinator = PalazzettiDataUpdateCoordinator(hass)
-
-    await coordinator.async_config_entry_first_refresh()
-    entry.runtime_data = coordinator
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: PalazzettiConfigEntry) -> bool:
-    """Unload a config entry."""
-
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/palazzetti/climate.py b/homeassistant/components/palazzetti/climate.py
deleted file mode 100644
index aff988051f3..00000000000
--- a/homeassistant/components/palazzetti/climate.py
+++ /dev/null
@@ -1,160 +0,0 @@
-"""Support for Palazzetti climates."""
-
-from typing import Any
-
-from pypalazzetti.exceptions import CommunicationError, ValidationError
-
-from homeassistant.components.climate import (
-    ClimateEntity,
-    ClimateEntityFeature,
-    HVACMode,
-)
-from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from . import PalazzettiConfigEntry
-from .const import DOMAIN, FAN_AUTO, FAN_HIGH, FAN_MODES, FAN_SILENT, PALAZZETTI
-from .coordinator import PalazzettiDataUpdateCoordinator
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: PalazzettiConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Palazzetti climates based on a config entry."""
-    async_add_entities([PalazzettiClimateEntity(entry.runtime_data)])
-
-
-class PalazzettiClimateEntity(
-    CoordinatorEntity[PalazzettiDataUpdateCoordinator], ClimateEntity
-):
-    """Defines a Palazzetti climate."""
-
-    _attr_has_entity_name = True
-    _attr_name = None
-    _attr_translation_key = DOMAIN
-    _attr_target_temperature_step = 1.0
-    _attr_temperature_unit = UnitOfTemperature.CELSIUS
-    _attr_supported_features = (
-        ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.FAN_MODE
-        | ClimateEntityFeature.TURN_ON
-        | ClimateEntityFeature.TURN_OFF
-    )
-
-    def __init__(self, coordinator: PalazzettiDataUpdateCoordinator) -> None:
-        """Initialize Palazzetti climate."""
-        super().__init__(coordinator)
-        client = coordinator.client
-        mac = coordinator.config_entry.unique_id
-        assert mac is not None
-        self._attr_unique_id = mac
-        self._attr_device_info = dr.DeviceInfo(
-            connections={(dr.CONNECTION_NETWORK_MAC, mac)},
-            name=client.name,
-            manufacturer=PALAZZETTI,
-            sw_version=client.sw_version,
-            hw_version=client.hw_version,
-        )
-        self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
-        self._attr_min_temp = client.target_temperature_min
-        self._attr_max_temp = client.target_temperature_max
-        self._attr_fan_modes = list(
-            map(str, range(client.fan_speed_min, client.fan_speed_max + 1))
-        )
-        if client.has_fan_silent:
-            self._attr_fan_modes.insert(0, FAN_SILENT)
-        if client.has_fan_high:
-            self._attr_fan_modes.append(FAN_HIGH)
-        if client.has_fan_auto:
-            self._attr_fan_modes.append(FAN_AUTO)
-
-    @property
-    def available(self) -> bool:
-        """Is the entity available."""
-        return super().available and self.coordinator.client.connected
-
-    @property
-    def hvac_mode(self) -> HVACMode:
-        """Return hvac operation ie. heat or off mode."""
-        is_heating = bool(self.coordinator.client.is_heating)
-        return HVACMode.HEAT if is_heating else HVACMode.OFF
-
-    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
-        """Set new target hvac mode."""
-        try:
-            await self.coordinator.client.set_on(hvac_mode != HVACMode.OFF)
-        except CommunicationError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="cannot_connect"
-            ) from err
-        except ValidationError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN, translation_key="on_off_not_available"
-            ) from err
-        await self.coordinator.async_refresh()
-
-    @property
-    def current_temperature(self) -> float | None:
-        """Return current temperature."""
-        return self.coordinator.client.room_temperature
-
-    @property
-    def target_temperature(self) -> int | None:
-        """Return the temperature."""
-        return self.coordinator.client.target_temperature
-
-    async def async_set_temperature(self, **kwargs: Any) -> None:
-        """Set new temperature."""
-        temperature = int(kwargs[ATTR_TEMPERATURE])
-        try:
-            await self.coordinator.client.set_target_temperature(temperature)
-        except CommunicationError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="cannot_connect"
-            ) from err
-        except ValidationError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_target_temperature",
-                translation_placeholders={
-                    "value": str(temperature),
-                },
-            ) from err
-        await self.coordinator.async_refresh()
-
-    @property
-    def fan_mode(self) -> str | None:
-        """Return the fan mode."""
-        api_state = self.coordinator.client.fan_speed
-        return FAN_MODES[api_state]
-
-    async def async_set_fan_mode(self, fan_mode: str) -> None:
-        """Set new fan mode."""
-        try:
-            if fan_mode == FAN_SILENT:
-                await self.coordinator.client.set_fan_silent()
-            elif fan_mode == FAN_HIGH:
-                await self.coordinator.client.set_fan_high()
-            elif fan_mode == FAN_AUTO:
-                await self.coordinator.client.set_fan_auto()
-            else:
-                await self.coordinator.client.set_fan_speed(FAN_MODES.index(fan_mode))
-        except CommunicationError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="cannot_connect"
-            ) from err
-        except ValidationError as err:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_fan_mode",
-                translation_placeholders={
-                    "value": fan_mode,
-                },
-            ) from err
-        await self.coordinator.async_refresh()
diff --git a/homeassistant/components/palazzetti/config_flow.py b/homeassistant/components/palazzetti/config_flow.py
deleted file mode 100644
index fe892b6624d..00000000000
--- a/homeassistant/components/palazzetti/config_flow.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""Config flow for Palazzetti."""
-
-from typing import Any
-
-from pypalazzetti.client import PalazzettiClient
-from pypalazzetti.exceptions import CommunicationError
-import voluptuous as vol
-
-from homeassistant.components import dhcp
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST
-from homeassistant.helpers import device_registry as dr
-
-from .const import DOMAIN, LOGGER
-
-
-class PalazzettiConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Palazzetti config flow."""
-
-    _discovered_device: PalazzettiClient
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """User configuration step."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            host = user_input[CONF_HOST]
-            client = PalazzettiClient(hostname=host)
-            try:
-                await client.connect()
-            except CommunicationError:
-                LOGGER.exception("Communication error")
-                errors["base"] = "cannot_connect"
-            else:
-                formatted_mac = dr.format_mac(client.mac)
-
-                # Assign a unique ID to the flow
-                await self.async_set_unique_id(formatted_mac)
-
-                # Abort the flow if a config entry with the same unique ID exists
-                self._abort_if_unique_id_configured()
-
-                return self.async_create_entry(
-                    title=client.name,
-                    data=user_input,
-                )
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
-            errors=errors,
-        )
-
-    async def async_step_dhcp(
-        self, discovery_info: dhcp.DhcpServiceInfo
-    ) -> ConfigFlowResult:
-        """Handle DHCP discovery."""
-
-        LOGGER.debug(
-            "DHCP discovery detected Palazzetti: %s", discovery_info.macaddress
-        )
-
-        await self.async_set_unique_id(dr.format_mac(discovery_info.macaddress))
-        self._abort_if_unique_id_configured()
-        self._discovered_device = PalazzettiClient(hostname=discovery_info.ip)
-        try:
-            await self._discovered_device.connect()
-        except CommunicationError:
-            return self.async_abort(reason="cannot_connect")
-
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_discovery_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm discovery."""
-        if user_input is not None:
-            return self.async_create_entry(
-                title=self._discovered_device.name,
-                data={CONF_HOST: self._discovered_device.host},
-            )
-
-        self._set_confirm_only()
-        return self.async_show_form(
-            step_id="discovery_confirm",
-            description_placeholders={
-                "name": self._discovered_device.name,
-                "host": self._discovered_device.host,
-            },
-        )
diff --git a/homeassistant/components/palazzetti/const.py b/homeassistant/components/palazzetti/const.py
deleted file mode 100644
index 4cb8b1f14a6..00000000000
--- a/homeassistant/components/palazzetti/const.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""Constants for the Palazzetti integration."""
-
-from datetime import timedelta
-import logging
-from typing import Final
-
-DOMAIN: Final = "palazzetti"
-PALAZZETTI: Final = "Palazzetti"
-LOGGER = logging.getLogger(__package__)
-SCAN_INTERVAL = timedelta(seconds=30)
-ON_OFF_NOT_AVAILABLE = "on_off_not_available"
-ERROR_INVALID_FAN_MODE = "invalid_fan_mode"
-ERROR_INVALID_TARGET_TEMPERATURE = "invalid_target_temperature"
-ERROR_CANNOT_CONNECT = "cannot_connect"
-
-FAN_SILENT: Final = "silent"
-FAN_HIGH: Final = "high"
-FAN_AUTO: Final = "auto"
-FAN_MODES: Final = [FAN_SILENT, "1", "2", "3", "4", "5", FAN_HIGH, FAN_AUTO]
diff --git a/homeassistant/components/palazzetti/coordinator.py b/homeassistant/components/palazzetti/coordinator.py
deleted file mode 100644
index d992bd3fb62..00000000000
--- a/homeassistant/components/palazzetti/coordinator.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""Helpers to help coordinate updates."""
-
-from pypalazzetti.client import PalazzettiClient
-from pypalazzetti.exceptions import CommunicationError, ValidationError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN, LOGGER, SCAN_INTERVAL
-
-type PalazzettiConfigEntry = ConfigEntry[PalazzettiDataUpdateCoordinator]
-
-
-class PalazzettiDataUpdateCoordinator(DataUpdateCoordinator[None]):
-    """Class to manage fetching Palazzetti data from a Palazzetti hub."""
-
-    config_entry: PalazzettiConfigEntry
-    client: PalazzettiClient
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-    ) -> None:
-        """Initialize global Palazzetti data updater."""
-        super().__init__(
-            hass,
-            LOGGER,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
-        )
-        self.client = PalazzettiClient(self.config_entry.data[CONF_HOST])
-
-    async def _async_setup(self) -> None:
-        try:
-            await self.client.connect()
-            await self.client.update_state()
-        except (CommunicationError, ValidationError) as err:
-            raise UpdateFailed(f"Error communicating with the API: {err}") from err
-
-    async def _async_update_data(self) -> None:
-        """Fetch data from Palazzetti."""
-        try:
-            await self.client.update_state()
-        except (CommunicationError, ValidationError) as err:
-            raise UpdateFailed(f"Error communicating with the API: {err}") from err
diff --git a/homeassistant/components/palazzetti/manifest.json b/homeassistant/components/palazzetti/manifest.json
deleted file mode 100644
index aff82275e2e..00000000000
--- a/homeassistant/components/palazzetti/manifest.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "domain": "palazzetti",
-  "name": "Palazzetti",
-  "codeowners": ["@dotvav"],
-  "config_flow": true,
-  "dhcp": [
-    {
-      "hostname": "connbox*",
-      "macaddress": "40F3857*"
-    },
-    {
-      "registered_devices": true
-    }
-  ],
-  "documentation": "https://www.home-assistant.io/integrations/palazzetti",
-  "integration_type": "device",
-  "iot_class": "local_polling",
-  "requirements": ["pypalazzetti==0.1.11"]
-}
diff --git a/homeassistant/components/palazzetti/strings.json b/homeassistant/components/palazzetti/strings.json
deleted file mode 100644
index cc10c8ed5c6..00000000000
--- a/homeassistant/components/palazzetti/strings.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "config": {
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "The host name or the IP address of the Palazzetti CBox"
-        }
-      },
-      "discovery_confirm": {
-        "description": "Do you want to add {name} ({host}) to Home Assistant?"
-      }
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    }
-  },
-  "exceptions": {
-    "on_off_not_available": {
-      "message": "The appliance cannot be turned on or off."
-    },
-    "invalid_fan_mode": {
-      "message": "Fan mode {value} is invalid."
-    },
-    "invalid_target_temperatures": {
-      "message": "Target temperature {value} is invalid."
-    },
-    "cannot_connect": {
-      "message": "Could not connect to the device."
-    }
-  },
-  "entity": {
-    "climate": {
-      "palazzetti": {
-        "state_attributes": {
-          "fan_mode": {
-            "state": {
-              "silent": "Silent",
-              "auto": "Auto",
-              "high": "High"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/peco/__init__.py b/homeassistant/components/peco/__init__.py
index 1de5d4bb6a2..12979f27793 100644
--- a/homeassistant/components/peco/__init__.py
+++ b/homeassistant/components/peco/__init__.py
@@ -68,7 +68,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     outage_coordinator = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name="PECO Outage Count",
         update_method=async_update_outage_data,
         update_interval=timedelta(minutes=OUTAGE_SCAN_INTERVAL),
@@ -98,7 +97,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         meter_coordinator = DataUpdateCoordinator(
             hass,
             LOGGER,
-            config_entry=entry,
             name="PECO Smart Meter",
             update_method=async_update_meter_data,
             update_interval=timedelta(minutes=SMART_METER_SCAN_INTERVAL),
diff --git a/homeassistant/components/pegel_online/diagnostics.py b/homeassistant/components/pegel_online/diagnostics.py
deleted file mode 100644
index b68437c5ee7..00000000000
--- a/homeassistant/components/pegel_online/diagnostics.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""Diagnostics support for pegel_online."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.core import HomeAssistant
-
-from . import PegelOnlineConfigEntry
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: PegelOnlineConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    coordinator = entry.runtime_data
-
-    return {
-        "entry": entry.as_dict(),
-        "data": coordinator.data,
-    }
diff --git a/homeassistant/components/pegel_online/entity.py b/homeassistant/components/pegel_online/entity.py
index 4e157a5f63b..4ad12f12913 100644
--- a/homeassistant/components/pegel_online/entity.py
+++ b/homeassistant/components/pegel_online/entity.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -29,5 +29,4 @@ class PegelOnlineEntity(CoordinatorEntity[PegelOnlineDataUpdateCoordinator]):
             name=f"{self.station.name} {self.station.water_name}",
             manufacturer=self.station.agency,
             configuration_url=self.station.base_data_url,
-            entry_type=DeviceEntryType.SERVICE,
         )
diff --git a/homeassistant/components/pi_hole/__init__.py b/homeassistant/components/pi_hole/__init__.py
index 5cc21cef3a9..64e73a20c59 100644
--- a/homeassistant/components/pi_hole/__init__.py
+++ b/homeassistant/components/pi_hole/__init__.py
@@ -118,7 +118,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: PiHoleConfigEntry) -> bo
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=name,
         update_method=async_update_data,
         update_interval=MIN_TIME_BETWEEN_UPDATES,
diff --git a/homeassistant/components/ping/config_flow.py b/homeassistant/components/ping/config_flow.py
index 4f2adb0d2c0..9470b2134d4 100644
--- a/homeassistant/components/ping/config_flow.py
+++ b/homeassistant/components/ping/config_flow.py
@@ -66,12 +66,16 @@ class PingConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Create the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle an options flow for Ping."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/plaato/config_flow.py b/homeassistant/components/plaato/config_flow.py
index f398a733cd6..74967c417a4 100644
--- a/homeassistant/components/plaato/config_flow.py
+++ b/homeassistant/components/plaato/config_flow.py
@@ -176,19 +176,23 @@ class PlaatoConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> PlaatoOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> PlaatoOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return PlaatoOptionsFlowHandler()
+        return PlaatoOptionsFlowHandler(config_entry)
 
 
 class PlaatoOptionsFlowHandler(OptionsFlow):
     """Handle Plaato options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize domain options flow."""
+        super().__init__()
+
+        self._config_entry = config_entry
+
     async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
         """Manage the options."""
-        use_webhook = self.config_entry.data.get(CONF_USE_WEBHOOK, False)
+        use_webhook = self._config_entry.data.get(CONF_USE_WEBHOOK, False)
         if use_webhook:
             return await self.async_step_webhook()
 
@@ -207,7 +211,7 @@ class PlaatoOptionsFlowHandler(OptionsFlow):
                 {
                     vol.Optional(
                         CONF_SCAN_INTERVAL,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
                         ),
                     ): cv.positive_int
@@ -222,7 +226,7 @@ class PlaatoOptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)
 
-        webhook_id = self.config_entry.data.get(CONF_WEBHOOK_ID, None)
+        webhook_id = self._config_entry.data.get(CONF_WEBHOOK_ID, None)
         webhook_url = (
             ""
             if webhook_id is None
diff --git a/homeassistant/components/plex/config_flow.py b/homeassistant/components/plex/config_flow.py
index ae7cbb12574..fcd5751effb 100644
--- a/homeassistant/components/plex/config_flow.py
+++ b/homeassistant/components/plex/config_flow.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from copy import deepcopy
+import copy
 import logging
 from typing import TYPE_CHECKING, Any
 
@@ -385,7 +385,7 @@ class PlexOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize Plex options flow."""
-        self.options = deepcopy(dict(config_entry.options))
+        self.options = copy.deepcopy(dict(config_entry.options))
         self.server_id = config_entry.data[CONF_SERVER_IDENTIFIER]
 
     async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
diff --git a/homeassistant/components/plugwise/__init__.py b/homeassistant/components/plugwise/__init__.py
index 7d1b9ceac8a..f7677e39f7a 100644
--- a/homeassistant/components/plugwise/__init__.py
+++ b/homeassistant/components/plugwise/__init__.py
@@ -33,7 +33,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: PlugwiseConfigEntry) ->
         model=coordinator.api.smile_model,
         model_id=coordinator.api.smile_model_id,
         name=coordinator.api.smile_name,
-        sw_version=str(coordinator.api.smile_version),
+        sw_version=coordinator.api.smile_version[0],
     )  # required for adding the entity-less P1 Gateway
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/plugwise/config_flow.py b/homeassistant/components/plugwise/config_flow.py
index 57abb1ccb86..b0d68aaa33b 100644
--- a/homeassistant/components/plugwise/config_flow.py
+++ b/homeassistant/components/plugwise/config_flow.py
@@ -71,6 +71,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> Smile:
         password=data[CONF_PASSWORD],
         port=data[CONF_PORT],
         username=data[CONF_USERNAME],
+        timeout=30,
         websession=websession,
     )
     await api.connect()
diff --git a/homeassistant/components/plugwise/coordinator.py b/homeassistant/components/plugwise/coordinator.py
index b897a8bf833..c3fe33c64d2 100644
--- a/homeassistant/components/plugwise/coordinator.py
+++ b/homeassistant/components/plugwise/coordinator.py
@@ -2,7 +2,6 @@
 
 from datetime import timedelta
 
-from packaging.version import Version
 from plugwise import PlugwiseData, Smile
 from plugwise.exceptions import (
     ConnectionFailedError,
@@ -54,6 +53,7 @@ class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
             username=self.config_entry.data.get(CONF_USERNAME, DEFAULT_USERNAME),
             password=self.config_entry.data[CONF_PASSWORD],
             port=self.config_entry.data.get(CONF_PORT, DEFAULT_PORT),
+            timeout=30,
             websession=async_get_clientsession(hass, verify_ssl=False),
         )
         self._current_devices: set[str] = set()
@@ -61,10 +61,8 @@ class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
 
     async def _connect(self) -> None:
         """Connect to the Plugwise Smile."""
-        version = await self.api.connect()
-        self._connected = isinstance(version, Version)
-        if self._connected:
-            self.api.get_all_devices()
+        self._connected = await self.api.connect()
+        self.api.get_all_devices()
 
     async def _async_update_data(self) -> PlugwiseData:
         """Fetch data from Plugwise."""
diff --git a/homeassistant/components/plugwise/manifest.json b/homeassistant/components/plugwise/manifest.json
index dbbad15c0dc..89378ae5b90 100644
--- a/homeassistant/components/plugwise/manifest.json
+++ b/homeassistant/components/plugwise/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==1.5.0"],
+  "requirements": ["plugwise==1.4.3"],
   "zeroconf": ["_plugwise._tcp.local."]
 }
diff --git a/homeassistant/components/point/alarm_control_panel.py b/homeassistant/components/point/alarm_control_panel.py
index 4e4e4238176..3657bad28ae 100644
--- a/homeassistant/components/point/alarm_control_panel.py
+++ b/homeassistant/components/point/alarm_control_panel.py
@@ -9,9 +9,13 @@ from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -24,9 +28,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 EVENT_MAP = {
-    "off": AlarmControlPanelState.DISARMED,
-    "alarm_silenced": AlarmControlPanelState.DISARMED,
-    "alarm_grace_period_expired": AlarmControlPanelState.TRIGGERED,
+    "off": STATE_ALARM_DISARMED,
+    "alarm_silenced": STATE_ALARM_DISARMED,
+    "alarm_grace_period_expired": STATE_ALARM_TRIGGERED,
 }
 
 
@@ -99,11 +103,9 @@ class MinutPointAlarmControl(AlarmControlPanelEntity):
         self.async_write_ha_state()
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState:
+    def state(self) -> str:
         """Return state of the device."""
-        return EVENT_MAP.get(
-            self._home["alarm_status"], AlarmControlPanelState.ARMED_AWAY
-        )
+        return EVENT_MAP.get(self._home["alarm_status"], STATE_ALARM_ARMED_AWAY)
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
diff --git a/homeassistant/components/powerwall/__init__.py b/homeassistant/components/powerwall/__init__.py
index 6a2522ac43b..0b6f889b90a 100644
--- a/homeassistant/components/powerwall/__init__.py
+++ b/homeassistant/components/powerwall/__init__.py
@@ -168,7 +168,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: PowerwallConfigEntry) ->
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="Powerwall site",
         update_method=manager.async_update_data,
         update_interval=timedelta(seconds=UPDATE_INTERVAL),
diff --git a/homeassistant/components/powerwall/config_flow.py b/homeassistant/components/powerwall/config_flow.py
index 0c39392ca19..bacbff63211 100644
--- a/homeassistant/components/powerwall/config_flow.py
+++ b/homeassistant/components/powerwall/config_flow.py
@@ -251,8 +251,8 @@ class PowerwallConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle reauth confirmation."""
         errors: dict[str, str] | None = {}
         description_placeholders: dict[str, str] = {}
-        reauth_entry = self._get_reauth_entry()
         if user_input is not None:
+            reauth_entry = self._get_reauth_entry()
             errors, _, description_placeholders = await self._async_try_connect(
                 {CONF_IP_ADDRESS: reauth_entry.data[CONF_IP_ADDRESS], **user_input}
             )
@@ -261,10 +261,6 @@ class PowerwallConfigFlow(ConfigFlow, domain=DOMAIN):
                     reauth_entry, data_updates=user_input
                 )
 
-        self.context["title_placeholders"] = {
-            "name": reauth_entry.title,
-            "ip_address": reauth_entry.data[CONF_IP_ADDRESS],
-        }
         return self.async_show_form(
             step_id="reauth_confirm",
             data_schema=vol.Schema({vol.Optional(CONF_PASSWORD): str}),
diff --git a/homeassistant/components/profiler/__init__.py b/homeassistant/components/profiler/__init__.py
index 389e3384ad9..9b2b9736574 100644
--- a/homeassistant/components/profiler/__init__.py
+++ b/homeassistant/components/profiler/__init__.py
@@ -436,10 +436,6 @@ async def _async_generate_memory_profile(hass: HomeAssistant, call: ServiceCall)
     # Imports deferred to avoid loading modules
     # in memory since usually only one part of this
     # integration is used at a time
-    if sys.version_info >= (3, 13):
-        raise HomeAssistantError(
-            "Memory profiling is not supported on Python 3.13. Please use Python 3.12."
-        )
     from guppy import hpy  # pylint: disable=import-outside-toplevel
 
     start_time = int(time.time() * 1000000)
diff --git a/homeassistant/components/profiler/manifest.json b/homeassistant/components/profiler/manifest.json
index 8d2814c8c7f..9f27ee7f7d0 100644
--- a/homeassistant/components/profiler/manifest.json
+++ b/homeassistant/components/profiler/manifest.json
@@ -7,7 +7,7 @@
   "quality_scale": "internal",
   "requirements": [
     "pyprof2calltree==1.4.5",
-    "guppy3==3.1.4.post1;python_version<'3.13'",
+    "guppy3==3.1.4.post1",
     "objgraph==3.5.0"
   ],
   "single_config_entry": true
diff --git a/homeassistant/components/prometheus/__init__.py b/homeassistant/components/prometheus/__init__.py
index c243bf90dc0..8cc0a8f4b6a 100644
--- a/homeassistant/components/prometheus/__init__.py
+++ b/homeassistant/components/prometheus/__init__.py
@@ -14,7 +14,6 @@ from prometheus_client.metrics import MetricWrapperBase
 import voluptuous as vol
 
 from homeassistant import core as hacore
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.components.climate import (
     ATTR_CURRENT_TEMPERATURE,
     ATTR_FAN_MODE,
@@ -52,6 +51,16 @@ from homeassistant.const import (
     CONTENT_TYPE_TEXT_PLAIN,
     EVENT_STATE_CHANGED,
     PERCENTAGE,
+    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,
     STATE_CLOSED,
     STATE_CLOSING,
     STATE_ON,
@@ -76,8 +85,6 @@ from homeassistant.util.unit_conversion import TemperatureConverter
 _LOGGER = logging.getLogger(__name__)
 
 API_ENDPOINT = "/api/prometheus"
-IGNORED_STATES = frozenset({STATE_UNAVAILABLE, STATE_UNKNOWN})
-
 
 DOMAIN = "prometheus"
 CONF_FILTER = "filter"
@@ -91,7 +98,6 @@ CONF_OVERRIDE_METRIC = "override_metric"
 COMPONENT_CONFIG_SCHEMA_ENTRY = vol.Schema(
     {vol.Optional(CONF_OVERRIDE_METRIC): cv.string}
 )
-ALLOWED_METRIC_CHARS = set(string.ascii_letters + string.digits + "_:")
 
 DEFAULT_NAMESPACE = "homeassistant"
 
@@ -213,6 +219,14 @@ class PrometheusMetrics:
         """Add/update a state in Prometheus."""
         entity_id = state.entity_id
         _LOGGER.debug("Handling state update for %s", entity_id)
+        domain, _ = hacore.split_entity_id(entity_id)
+
+        ignored_states = (STATE_UNAVAILABLE, STATE_UNKNOWN)
+
+        handler = f"_handle_{domain}"
+
+        if hasattr(self, handler) and state.state not in ignored_states:
+            getattr(self, handler)(state)
 
         labels = self._labels(state)
         state_change = self._metric(
@@ -225,7 +239,7 @@ class PrometheusMetrics:
             prometheus_client.Gauge,
             "Entity is available (not in the unavailable or unknown state)",
         )
-        entity_available.labels(**labels).set(float(state.state not in IGNORED_STATES))
+        entity_available.labels(**labels).set(float(state.state not in ignored_states))
 
         last_updated_time_seconds = self._metric(
             "last_updated_time_seconds",
@@ -234,18 +248,6 @@ class PrometheusMetrics:
         )
         last_updated_time_seconds.labels(**labels).set(state.last_updated.timestamp())
 
-        if state.state in IGNORED_STATES:
-            self._remove_labelsets(
-                entity_id,
-                None,
-                {state_change, entity_available, last_updated_time_seconds},
-            )
-        else:
-            domain, _ = hacore.split_entity_id(entity_id)
-            handler = f"_handle_{domain}"
-            if hasattr(self, handler) and state.state:
-                getattr(self, handler)(state)
-
     def handle_entity_registry_updated(
         self, event: Event[EventEntityRegistryUpdatedData]
     ) -> None:
@@ -272,17 +274,10 @@ class PrometheusMetrics:
             self._remove_labelsets(metrics_entity_id)
 
     def _remove_labelsets(
-        self,
-        entity_id: str,
-        friendly_name: str | None = None,
-        ignored_metrics: set[MetricWrapperBase] | None = None,
+        self, entity_id: str, friendly_name: str | None = None
     ) -> None:
-        """Remove labelsets matching the given entity id from all non-ignored metrics."""
-        if ignored_metrics is None:
-            ignored_metrics = set()
+        """Remove labelsets matching the given entity id from all metrics."""
         for metric in list(self._metrics.values()):
-            if metric in ignored_metrics:
-                continue
             for sample in cast(list[prometheus_client.Metric], metric.collect())[
                 0
             ].samples:
@@ -339,12 +334,17 @@ class PrometheusMetrics:
     @staticmethod
     def _sanitize_metric_name(metric: str) -> str:
         return "".join(
-            [c if c in ALLOWED_METRIC_CHARS else f"u{hex(ord(c))}" for c in metric]
+            [
+                c
+                if c in string.ascii_letters + string.digits + "_:"
+                else f"u{hex(ord(c))}"
+                for c in metric
+            ]
         )
 
     @staticmethod
-    def state_as_number(state: State) -> float | None:
-        """Return state as a float, or None if state cannot be converted."""
+    def state_as_number(state: State) -> float:
+        """Return a state casted to a float."""
         try:
             if state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TIMESTAMP:
                 value = as_timestamp(state.state)
@@ -352,7 +352,7 @@ class PrometheusMetrics:
                 value = state_helper.state_as_number(state)
         except ValueError:
             _LOGGER.debug("Could not convert %s to float", state)
-            value = None
+            value = 0
         return value
 
     @staticmethod
@@ -382,8 +382,8 @@ class PrometheusMetrics:
             prometheus_client.Gauge,
             "State of the binary sensor (0/1)",
         )
-        if (value := self.state_as_number(state)) is not None:
-            metric.labels(**self._labels(state)).set(value)
+        value = self.state_as_number(state)
+        metric.labels(**self._labels(state)).set(value)
 
     def _handle_input_boolean(self, state: State) -> None:
         metric = self._metric(
@@ -391,8 +391,8 @@ class PrometheusMetrics:
             prometheus_client.Gauge,
             "State of the input boolean (0/1)",
         )
-        if (value := self.state_as_number(state)) is not None:
-            metric.labels(**self._labels(state)).set(value)
+        value = self.state_as_number(state)
+        metric.labels(**self._labels(state)).set(value)
 
     def _numeric_handler(self, state: State, domain: str, title: str) -> None:
         if unit := self._unit_string(state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)):
@@ -408,7 +408,8 @@ class PrometheusMetrics:
                 f"State of the {title}",
             )
 
-        if (value := self.state_as_number(state)) is not None:
+        with suppress(ValueError):
+            value = self.state_as_number(state)
             if (
                 state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
                 == UnitOfTemperature.FAHRENHEIT
@@ -430,15 +431,15 @@ class PrometheusMetrics:
             prometheus_client.Gauge,
             "State of the device tracker (0/1)",
         )
-        if (value := self.state_as_number(state)) is not None:
-            metric.labels(**self._labels(state)).set(value)
+        value = self.state_as_number(state)
+        metric.labels(**self._labels(state)).set(value)
 
     def _handle_person(self, state: State) -> None:
         metric = self._metric(
             "person_state", prometheus_client.Gauge, "State of the person (0/1)"
         )
-        if (value := self.state_as_number(state)) is not None:
-            metric.labels(**self._labels(state)).set(value)
+        value = self.state_as_number(state)
+        metric.labels(**self._labels(state)).set(value)
 
     def _handle_cover(self, state: State) -> None:
         metric = self._metric(
@@ -479,19 +480,23 @@ class PrometheusMetrics:
             "Light brightness percentage (0..100)",
         )
 
-        if (value := self.state_as_number(state)) is not None:
+        try:
             brightness = state.attributes.get(ATTR_BRIGHTNESS)
             if state.state == STATE_ON and brightness is not None:
-                value = float(brightness) / 255.0
+                value = brightness / 255.0
+            else:
+                value = self.state_as_number(state)
             value = value * 100
             metric.labels(**self._labels(state)).set(value)
+        except ValueError:
+            pass
 
     def _handle_lock(self, state: State) -> None:
         metric = self._metric(
             "lock_state", prometheus_client.Gauge, "State of the lock (0/1)"
         )
-        if (value := self.state_as_number(state)) is not None:
-            metric.labels(**self._labels(state)).set(value)
+        value = self.state_as_number(state)
+        metric.labels(**self._labels(state)).set(value)
 
     def _handle_climate_temp(
         self, state: State, attr: str, metric_name: str, metric_description: str
@@ -603,8 +608,11 @@ class PrometheusMetrics:
             prometheus_client.Gauge,
             "State of the humidifier (0/1)",
         )
-        if (value := self.state_as_number(state)) is not None:
+        try:
+            value = self.state_as_number(state)
             metric.labels(**self._labels(state)).set(value)
+        except ValueError:
+            pass
 
         current_mode = state.attributes.get(ATTR_MODE)
         available_modes = state.attributes.get(ATTR_AVAILABLE_MODES)
@@ -635,7 +643,8 @@ class PrometheusMetrics:
 
             _metric = self._metric(metric, prometheus_client.Gauge, documentation)
 
-            if (value := self.state_as_number(state)) is not None:
+            try:
+                value = self.state_as_number(state)
                 if (
                     state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
                     == UnitOfTemperature.FAHRENHEIT
@@ -644,6 +653,8 @@ class PrometheusMetrics:
                         value, UnitOfTemperature.FAHRENHEIT, UnitOfTemperature.CELSIUS
                     )
                 _metric.labels(**self._labels(state)).set(value)
+            except ValueError:
+                pass
 
         self._battery(state)
 
@@ -676,15 +687,20 @@ class PrometheusMetrics:
     def _sensor_override_component_metric(
         self, state: State, unit: str | None
     ) -> str | None:
-        """Get metric from override in component configuration."""
+        """Get metric from override in component confioguration."""
         return self._component_config.get(state.entity_id).get(CONF_OVERRIDE_METRIC)
 
     @staticmethod
     def _sensor_fallback_metric(state: State, unit: str | None) -> str | None:
         """Get metric from fallback logic for compatibility."""
-        if unit not in (None, ""):
-            return f"sensor_unit_{unit}"
-        return "sensor_state"
+        if unit in (None, ""):
+            try:
+                state_helper.state_as_number(state)
+            except ValueError:
+                _LOGGER.debug("Unsupported sensor: %s", state.entity_id)
+                return None
+            return "sensor_state"
+        return f"sensor_unit_{unit}"
 
     @staticmethod
     def _unit_string(unit: str | None) -> str | None:
@@ -706,8 +722,11 @@ class PrometheusMetrics:
             "switch_state", prometheus_client.Gauge, "State of the switch (0/1)"
         )
 
-        if (value := self.state_as_number(state)) is not None:
+        try:
+            value = self.state_as_number(state)
             metric.labels(**self._labels(state)).set(value)
+        except ValueError:
+            pass
 
         self._handle_attributes(state)
 
@@ -716,8 +735,11 @@ class PrometheusMetrics:
             "fan_state", prometheus_client.Gauge, "State of the fan (0/1)"
         )
 
-        if (value := self.state_as_number(state)) is not None:
+        try:
+            value = self.state_as_number(state)
             metric.labels(**self._labels(state)).set(value)
+        except ValueError:
+            pass
 
         fan_speed_percent = state.attributes.get(ATTR_PERCENTAGE)
         if fan_speed_percent is not None:
@@ -783,8 +805,8 @@ class PrometheusMetrics:
             prometheus_client.Gauge,
             "Value of counter entities",
         )
-        if (value := self.state_as_number(state)) is not None:
-            metric.labels(**self._labels(state)).set(value)
+
+        metric.labels(**self._labels(state)).set(self.state_as_number(state))
 
     def _handle_update(self, state: State) -> None:
         metric = self._metric(
@@ -792,8 +814,8 @@ class PrometheusMetrics:
             prometheus_client.Gauge,
             "Update state, indicating if an update is available (0/1)",
         )
-        if (value := self.state_as_number(state)) is not None:
-            metric.labels(**self._labels(state)).set(value)
+        value = self.state_as_number(state)
+        metric.labels(**self._labels(state)).set(value)
 
     def _handle_alarm_control_panel(self, state: State) -> None:
         current_state = state.state
@@ -806,9 +828,22 @@ class PrometheusMetrics:
                 ["state"],
             )
 
-            for alarm_state in AlarmControlPanelState:
-                metric.labels(**dict(self._labels(state), state=alarm_state.value)).set(
-                    float(alarm_state.value == current_state)
+            alarm_states = [
+                STATE_ALARM_ARMED_AWAY,
+                STATE_ALARM_ARMED_CUSTOM_BYPASS,
+                STATE_ALARM_ARMED_HOME,
+                STATE_ALARM_ARMED_NIGHT,
+                STATE_ALARM_ARMED_VACATION,
+                STATE_ALARM_DISARMED,
+                STATE_ALARM_TRIGGERED,
+                STATE_ALARM_PENDING,
+                STATE_ALARM_ARMING,
+                STATE_ALARM_DISARMING,
+            ]
+
+            for alarm_state in alarm_states:
+                metric.labels(**dict(self._labels(state), state=alarm_state)).set(
+                    float(alarm_state == current_state)
                 )
 
 
diff --git a/homeassistant/components/prosegur/alarm_control_panel.py b/homeassistant/components/prosegur/alarm_control_panel.py
index 1c58b64cf55..ffedcf30770 100644
--- a/homeassistant/components/prosegur/alarm_control_panel.py
+++ b/homeassistant/components/prosegur/alarm_control_panel.py
@@ -10,9 +10,13 @@ from pyprosegur.installation import Installation, Status
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -22,10 +26,10 @@ from . import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 STATE_MAPPING = {
-    Status.DISARMED: AlarmControlPanelState.DISARMED,
-    Status.ARMED: AlarmControlPanelState.ARMED_AWAY,
-    Status.PARTIALLY: AlarmControlPanelState.ARMED_HOME,
-    Status.ERROR_PARTIALLY: AlarmControlPanelState.ARMED_HOME,
+    Status.DISARMED: STATE_ALARM_DISARMED,
+    Status.ARMED: STATE_ALARM_ARMED_AWAY,
+    Status.PARTIALLY: STATE_ALARM_ARMED_HOME,
+    Status.ERROR_PARTIALLY: STATE_ALARM_ARMED_HOME,
 }
 
 
@@ -78,7 +82,7 @@ class ProsegurAlarm(AlarmControlPanelEntity):
             self._attr_available = False
             return
 
-        self._attr_alarm_state = STATE_MAPPING.get(self._installation.status)
+        self._attr_state = STATE_MAPPING.get(self._installation.status)
         self._attr_available = True
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
diff --git a/homeassistant/components/proximity/config_flow.py b/homeassistant/components/proximity/config_flow.py
index 5818ec2979b..1758b182ad7 100644
--- a/homeassistant/components/proximity/config_flow.py
+++ b/homeassistant/components/proximity/config_flow.py
@@ -89,7 +89,7 @@ class ProximityConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return ProximityOptionsFlow()
+        return ProximityOptionsFlow(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -121,6 +121,10 @@ class ProximityConfigFlow(ConfigFlow, domain=DOMAIN):
 class ProximityOptionsFlow(OptionsFlow):
     """Handle a option flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
     def _user_form_schema(self, user_input: dict[str, Any]) -> vol.Schema:
         return vol.Schema(_base_schema(user_input))
 
diff --git a/homeassistant/components/proxy/manifest.json b/homeassistant/components/proxy/manifest.json
index f13799422df..1e70c4d3e10 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==11.0.0"]
+  "requirements": ["Pillow==10.4.0"]
 }
diff --git a/homeassistant/components/purpleair/config_flow.py b/homeassistant/components/purpleair/config_flow.py
index 3ca7870b3cb..6337431ecea 100644
--- a/homeassistant/components/purpleair/config_flow.py
+++ b/homeassistant/components/purpleair/config_flow.py
@@ -209,7 +209,7 @@ class PurpleAirConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> PurpleAirOptionsFlowHandler:
         """Define the config flow to handle options."""
-        return PurpleAirOptionsFlowHandler()
+        return PurpleAirOptionsFlowHandler(config_entry)
 
     async def async_step_by_coordinates(
         self, user_input: dict[str, Any] | None = None
@@ -315,9 +315,10 @@ class PurpleAirConfigFlow(ConfigFlow, domain=DOMAIN):
 class PurpleAirOptionsFlowHandler(OptionsFlow):
     """Handle a PurpleAir options flow."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize."""
         self._flow_data: dict[str, Any] = {}
+        self.config_entry = config_entry
 
     @property
     def settings_schema(self) -> vol.Schema:
diff --git a/homeassistant/components/pvpc_hourly_pricing/config_flow.py b/homeassistant/components/pvpc_hourly_pricing/config_flow.py
index 3c6b510004a..67f9de458d0 100644
--- a/homeassistant/components/pvpc_hourly_pricing/config_flow.py
+++ b/homeassistant/components/pvpc_hourly_pricing/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_API_TOKEN, CONF_NAME
 from homeassistant.core import callback
@@ -56,7 +56,7 @@ class TariffSelectorConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> PVPCOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return PVPCOptionsFlowHandler()
+        return PVPCOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -178,7 +178,7 @@ class TariffSelectorConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_show_form(step_id="reauth_confirm", data_schema=data_schema)
 
 
-class PVPCOptionsFlowHandler(OptionsFlow):
+class PVPCOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle PVPC options."""
 
     _power: float | None = None
@@ -199,7 +199,7 @@ class PVPCOptionsFlowHandler(OptionsFlow):
             )
 
         # Fill options with entry data
-        api_token = self.config_entry.options.get(
+        api_token = self.options.get(
             CONF_API_TOKEN, self.config_entry.data.get(CONF_API_TOKEN)
         )
         return self.async_show_form(
@@ -229,11 +229,13 @@ class PVPCOptionsFlowHandler(OptionsFlow):
             )
 
         # Fill options with entry data
-        options = self.config_entry.options
-        data = self.config_entry.data
-        power = options.get(ATTR_POWER, data[ATTR_POWER])
-        power_valley = options.get(ATTR_POWER_P3, data[ATTR_POWER_P3])
-        api_token = options.get(CONF_API_TOKEN, data.get(CONF_API_TOKEN))
+        power = self.options.get(ATTR_POWER, self.config_entry.data[ATTR_POWER])
+        power_valley = self.options.get(
+            ATTR_POWER_P3, self.config_entry.data[ATTR_POWER_P3]
+        )
+        api_token = self.options.get(
+            CONF_API_TOKEN, self.config_entry.data.get(CONF_API_TOKEN)
+        )
         use_api_token = api_token is not None
         schema = vol.Schema(
             {
diff --git a/homeassistant/components/qnap/sensor.py b/homeassistant/components/qnap/sensor.py
index 383a4e5f572..526516bfcdd 100644
--- a/homeassistant/components/qnap/sensor.py
+++ b/homeassistant/components/qnap/sensor.py
@@ -13,6 +13,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
+    ATTR_NAME,
     PERCENTAGE,
     EntityCategory,
     UnitOfDataRate,
@@ -374,6 +375,17 @@ class QNAPMemorySensor(QNAPSensor):
 
         return None
 
+    # Deprecated since Home Assistant 2024.6.0
+    # Can be removed completely in 2024.12.0
+    @property
+    def extra_state_attributes(self) -> dict[str, Any] | None:
+        """Return the state attributes."""
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]["memory"]
+            size = round(float(data["total"]) / 1024, 2)
+            return {ATTR_MEMORY_SIZE: f"{size} {UnitOfInformation.GIBIBYTES}"}
+        return None
+
 
 class QNAPNetworkSensor(QNAPSensor):
     """A QNAP sensor that monitors network stats."""
@@ -402,6 +414,22 @@ class QNAPNetworkSensor(QNAPSensor):
 
         return None
 
+    # Deprecated since Home Assistant 2024.6.0
+    # Can be removed completely in 2024.12.0
+    @property
+    def extra_state_attributes(self) -> dict[str, Any] | None:
+        """Return the state attributes."""
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]["nics"][self.monitor_device]
+            return {
+                ATTR_IP: data["ip"],
+                ATTR_MASK: data["mask"],
+                ATTR_MAC: data["mac"],
+                ATTR_MAX_SPEED: data["max_speed"],
+                ATTR_PACKETS_ERR: data["err_packets"],
+            }
+        return None
+
 
 class QNAPSystemSensor(QNAPSensor):
     """A QNAP sensor that monitors overall system health."""
@@ -427,6 +455,25 @@ class QNAPSystemSensor(QNAPSensor):
 
         return None
 
+    # Deprecated since Home Assistant 2024.6.0
+    # Can be removed completely in 2024.12.0
+    @property
+    def extra_state_attributes(self) -> dict[str, Any] | None:
+        """Return the state attributes."""
+        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"])
+
+            return {
+                ATTR_NAME: data["system"]["name"],
+                ATTR_MODEL: data["system"]["model"],
+                ATTR_SERIAL: data["system"]["serial_number"],
+                ATTR_UPTIME: f"{days:0>2d}d {hours:0>2d}h {minutes:0>2d}m",
+            }
+        return None
+
 
 class QNAPDriveSensor(QNAPSensor):
     """A QNAP sensor that monitors HDD/SSD drive stats."""
@@ -486,3 +533,17 @@ class QNAPVolumeSensor(QNAPSensor):
             return used_gb / total_gb * 100
 
         return None
+
+    # Deprecated since Home Assistant 2024.6.0
+    # Can be removed completely in 2024.12.0
+    @property
+    def extra_state_attributes(self) -> dict[str, Any] | None:
+        """Return the state attributes."""
+        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(total_gb, 1)} {UnitOfInformation.GIBIBYTES}"
+            }
+        return None
diff --git a/homeassistant/components/qrcode/manifest.json b/homeassistant/components/qrcode/manifest.json
index 3fcc895c2b9..14f2d093f37 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==11.0.0", "pyzbar==0.1.7"]
+  "requirements": ["Pillow==10.4.0", "pyzbar==0.1.7"]
 }
diff --git a/homeassistant/components/rachio/config_flow.py b/homeassistant/components/rachio/config_flow.py
index fac93952b35..66811091820 100644
--- a/homeassistant/components/rachio/config_flow.py
+++ b/homeassistant/components/rachio/config_flow.py
@@ -108,12 +108,16 @@ class RachioConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for Rachio."""
 
+    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, int] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/radio_browser/manifest.json b/homeassistant/components/radio_browser/manifest.json
index 943187596d7..f29aa1fac1d 100644
--- a/homeassistant/components/radio_browser/manifest.json
+++ b/homeassistant/components/radio_browser/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/radio_browser",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["radios==0.3.2", "pycountry==24.6.1"],
+  "requirements": ["radios==0.3.1", "pycountry==23.12.11"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/rainbird/config_flow.py b/homeassistant/components/rainbird/config_flow.py
index abeb1b5da15..c1c814b05c4 100644
--- a/homeassistant/components/rainbird/config_flow.py
+++ b/homeassistant/components/rainbird/config_flow.py
@@ -65,7 +65,7 @@ class RainbirdConfigFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> RainBirdOptionsFlowHandler:
         """Define the config flow to handle options."""
-        return RainBirdOptionsFlowHandler()
+        return RainBirdOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -165,6 +165,10 @@ class RainbirdConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 class RainBirdOptionsFlowHandler(OptionsFlow):
     """Handle a RainBird options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize RainBirdOptionsFlowHandler."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/rainmachine/config_flow.py b/homeassistant/components/rainmachine/config_flow.py
index 0b40d506566..5c07f04c163 100644
--- a/homeassistant/components/rainmachine/config_flow.py
+++ b/homeassistant/components/rainmachine/config_flow.py
@@ -63,7 +63,7 @@ class RainMachineFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> RainMachineOptionsFlowHandler:
         """Define the config flow to handle options."""
-        return RainMachineOptionsFlowHandler()
+        return RainMachineOptionsFlowHandler(config_entry)
 
     async def async_step_homekit(
         self, discovery_info: zeroconf.ZeroconfServiceInfo
@@ -168,6 +168,10 @@ class RainMachineFlowHandler(ConfigFlow, domain=DOMAIN):
 class RainMachineOptionsFlowHandler(OptionsFlow):
     """Handle a RainMachine options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/rainmachine/update.py b/homeassistant/components/rainmachine/update.py
index 39156b05cd4..dbb91b70c85 100644
--- a/homeassistant/components/rainmachine/update.py
+++ b/homeassistant/components/rainmachine/update.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 from enum import Enum
 from typing import Any
 
@@ -11,7 +10,6 @@ from regenmaschine.errors import RequestError
 from homeassistant.components.update import (
     UpdateDeviceClass,
     UpdateEntity,
-    UpdateEntityDescription,
     UpdateEntityFeature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -44,14 +42,7 @@ UPDATE_STATE_MAP = {
 }
 
 
-@dataclass(frozen=True, kw_only=True)
-class RainMachineUpdateEntityDescription(
-    UpdateEntityDescription, RainMachineEntityDescription
-):
-    """Describe a RainMachine update."""
-
-
-UPDATE_DESCRIPTION = RainMachineUpdateEntityDescription(
+UPDATE_DESCRIPTION = RainMachineEntityDescription(
     key="update",
     api_category=DATA_MACHINE_FIRMWARE_UPDATE_STATUS,
 )
diff --git a/homeassistant/components/random/binary_sensor.py b/homeassistant/components/random/binary_sensor.py
index ae9a5886d59..9d33ad52692 100644
--- a/homeassistant/components/random/binary_sensor.py
+++ b/homeassistant/components/random/binary_sensor.py
@@ -59,9 +59,10 @@ class RandomBinarySensor(BinarySensorEntity):
 
     def __init__(self, config: Mapping[str, Any], entry_id: str | None = None) -> None:
         """Initialize the Random binary sensor."""
-        self._attr_name = config[CONF_NAME]
+        self._attr_name = config.get(CONF_NAME)
         self._attr_device_class = config.get(CONF_DEVICE_CLASS)
-        self._attr_unique_id = entry_id
+        if entry_id:
+            self._attr_unique_id = entry_id
 
     async def async_update(self) -> None:
         """Get new state and update the sensor's state."""
diff --git a/homeassistant/components/random/config_flow.py b/homeassistant/components/random/config_flow.py
index 00314169260..fcbd77916a9 100644
--- a/homeassistant/components/random/config_flow.py
+++ b/homeassistant/components/random/config_flow.py
@@ -95,7 +95,7 @@ def _generate_schema(domain: str, flow_type: _FlowType) -> vol.Schema:
 
 
 async def choose_options_step(options: dict[str, Any]) -> str:
-    """Return next step_id for options flow according to entity_type."""
+    """Return next step_id for options flow according to template_type."""
     return cast(str, options["entity_type"])
 
 
@@ -122,7 +122,7 @@ def _validate_unit(options: dict[str, Any]) -> None:
 
 
 def validate_user_input(
-    entity_type: str,
+    template_type: str,
 ) -> Callable[
     [SchemaCommonFlowHandler, dict[str, Any]],
     Coroutine[Any, Any, dict[str, Any]],
@@ -136,10 +136,10 @@ def validate_user_input(
         _: SchemaCommonFlowHandler,
         user_input: dict[str, Any],
     ) -> dict[str, Any]:
-        """Add entity type to user input."""
-        if entity_type == Platform.SENSOR:
+        """Add template type to user input."""
+        if template_type == Platform.SENSOR:
             _validate_unit(user_input)
-        return {"entity_type": entity_type} | user_input
+        return {"entity_type": template_type} | user_input
 
     return _validate_user_input
 
diff --git a/homeassistant/components/random/sensor.py b/homeassistant/components/random/sensor.py
index aad4fcb851c..3c6e67c9918 100644
--- a/homeassistant/components/random/sensor.py
+++ b/homeassistant/components/random/sensor.py
@@ -70,22 +70,22 @@ class RandomSensor(SensorEntity):
     """Representation of a Random number sensor."""
 
     _attr_translation_key = "random"
-    _unrecorded_attributes = frozenset({ATTR_MAXIMUM, ATTR_MINIMUM})
 
     def __init__(self, config: Mapping[str, Any], entry_id: str | None = None) -> None:
         """Initialize the Random sensor."""
-        self._attr_name = config[CONF_NAME]
-        self._minimum = config[CONF_MINIMUM]
-        self._maximum = config[CONF_MAXIMUM]
+        self._attr_name = config.get(CONF_NAME)
+        self._minimum = config.get(CONF_MINIMUM, DEFAULT_MIN)
+        self._maximum = config.get(CONF_MAXIMUM, DEFAULT_MAX)
         self._attr_native_unit_of_measurement = config.get(CONF_UNIT_OF_MEASUREMENT)
         self._attr_device_class = config.get(CONF_DEVICE_CLASS)
         self._attr_extra_state_attributes = {
             ATTR_MAXIMUM: self._maximum,
             ATTR_MINIMUM: self._minimum,
         }
-        self._attr_unique_id = entry_id
+        if entry_id:
+            self._attr_unique_id = entry_id
 
     async def async_update(self) -> None:
-        """Get a new number and update the state."""
+        """Get a new number and updates the states."""
 
         self._attr_native_value = randrange(self._minimum, self._maximum + 1)
diff --git a/homeassistant/components/random/strings.json b/homeassistant/components/random/strings.json
index ef19dd6dd67..98072a21fe1 100644
--- a/homeassistant/components/random/strings.json
+++ b/homeassistant/components/random/strings.json
@@ -1,5 +1,4 @@
 {
-  "title": "Random",
   "config": {
     "step": {
       "binary_sensor": {
diff --git a/homeassistant/components/raspberry_pi/__init__.py b/homeassistant/components/raspberry_pi/__init__.py
index 8095eb9dfe0..d1dcd04922f 100644
--- a/homeassistant/components/raspberry_pi/__init__.py
+++ b/homeassistant/components/raspberry_pi/__init__.py
@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-from homeassistant.components.hassio import get_os_info
+from homeassistant.components.hassio import get_os_info, is_hassio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.hassio import is_hassio
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/homeassistant/components/rdw/__init__.py b/homeassistant/components/rdw/__init__.py
index 6051576026b..f123db7c697 100644
--- a/homeassistant/components/rdw/__init__.py
+++ b/homeassistant/components/rdw/__init__.py
@@ -23,7 +23,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator: DataUpdateCoordinator[Vehicle] = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name=f"{DOMAIN}_APK",
         update_interval=SCAN_INTERVAL,
         update_method=rdw.vehicle,
diff --git a/homeassistant/components/recollect_waste/__init__.py b/homeassistant/components/recollect_waste/__init__.py
index 1710fb8c816..6606f31a42d 100644
--- a/homeassistant/components/recollect_waste/__init__.py
+++ b/homeassistant/components/recollect_waste/__init__.py
@@ -52,7 +52,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name=(
             f"Place {entry.data[CONF_PLACE_ID]}, Service {entry.data[CONF_SERVICE_ID]}"
         ),
diff --git a/homeassistant/components/recollect_waste/config_flow.py b/homeassistant/components/recollect_waste/config_flow.py
index 299af2609e3..882eb6a00d2 100644
--- a/homeassistant/components/recollect_waste/config_flow.py
+++ b/homeassistant/components/recollect_waste/config_flow.py
@@ -34,9 +34,9 @@ class RecollectWasteConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> RecollectWasteOptionsFlowHandler:
+    ) -> OptionsFlow:
         """Define the config flow to handle options."""
-        return RecollectWasteOptionsFlowHandler()
+        return RecollectWasteOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -79,6 +79,10 @@ class RecollectWasteConfigFlow(ConfigFlow, domain=DOMAIN):
 class RecollectWasteOptionsFlowHandler(OptionsFlow):
     """Handle a Recollect Waste options flow."""
 
+    def __init__(self, entry: ConfigEntry) -> None:
+        """Initialize."""
+        self._entry = entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -92,7 +96,7 @@ class RecollectWasteOptionsFlowHandler(OptionsFlow):
                 {
                     vol.Optional(
                         CONF_FRIENDLY_NAME,
-                        default=self.config_entry.options.get(CONF_FRIENDLY_NAME),
+                        default=self._entry.options.get(CONF_FRIENDLY_NAME),
                     ): bool
                 }
             ),
diff --git a/homeassistant/components/recorder/core.py b/homeassistant/components/recorder/core.py
index 6ba64d4a571..77d01088d67 100644
--- a/homeassistant/components/recorder/core.py
+++ b/homeassistant/components/recorder/core.py
@@ -78,8 +78,16 @@ from .db_schema import (
     StatisticsShortTerm,
 )
 from .executor import DBInterruptibleThreadPoolExecutor
+from .migration import (
+    EntityIDMigration,
+    EventIDPostMigration,
+    EventsContextIDMigration,
+    EventTypeIDMigration,
+    StatesContextIDMigration,
+)
 from .models import DatabaseEngine, StatisticData, StatisticMetaData, UnsupportedDialect
 from .pool import POOL_SIZE, MutexPool, RecorderPool
+from .queries import get_migration_changes
 from .table_managers.event_data import EventDataManager
 from .table_managers.event_types import EventTypeManager
 from .table_managers.recorder_runs import RecorderRunsManager
@@ -112,6 +120,7 @@ from .util import (
     build_mysqldb_conv,
     dburl_to_path,
     end_incomplete_runs,
+    execute_stmt_lambda_element,
     is_second_sunday,
     move_away_broken_database,
     session_scope,
@@ -731,17 +740,12 @@ class Recorder(threading.Thread):
 
         # First do non-live migration steps, if needed
         if schema_status.migration_needed:
-            # Do non-live schema migration
             result, schema_status = self._migrate_schema_offline(schema_status)
             if not result:
                 self._notify_migration_failed()
                 self.migration_in_progress = False
                 return
             self.schema_version = schema_status.current_version
-
-            # Do non-live data migration
-            migration.migrate_data_non_live(self, self.get_session, schema_status)
-
             # Non-live migration is now completed, remaining steps are live
             self.migration_is_live = True
 
@@ -797,7 +801,20 @@ class Recorder(threading.Thread):
             # there are a lot of statistics graphs on the frontend.
             self.statistics_meta_manager.load(session)
 
-        migration.migrate_data_live(self, self.get_session, schema_status)
+            migration_changes: dict[str, int] = {
+                row[0]: row[1]
+                for row in execute_stmt_lambda_element(session, get_migration_changes())
+            }
+
+            for migrator_cls in (
+                StatesContextIDMigration,
+                EventsContextIDMigration,
+                EventTypeIDMigration,
+                EntityIDMigration,
+                EventIDPostMigration,
+            ):
+                migrator = migrator_cls(schema_status.start_version, migration_changes)
+                migrator.do_migrate(self, session)
 
         # We must only set the db ready after we have set the table managers
         # to active if there is no data to migrate.
@@ -964,7 +981,6 @@ class Recorder(threading.Thread):
                 new_schema_status = migration.SchemaValidationStatus(
                     current_version=SCHEMA_VERSION,
                     migration_needed=False,
-                    non_live_data_migration_needed=False,
                     schema_errors=set(),
                     start_version=SCHEMA_VERSION,
                 )
diff --git a/homeassistant/components/recorder/migration.py b/homeassistant/components/recorder/migration.py
index 02ab05288c5..5180a0c440c 100644
--- a/homeassistant/components/recorder/migration.py
+++ b/homeassistant/components/recorder/migration.py
@@ -91,7 +91,6 @@ from .queries import (
     find_states_context_ids_to_migrate,
     find_unmigrated_short_term_statistics_rows,
     find_unmigrated_statistics_rows,
-    get_migration_changes,
     has_entity_ids_to_migrate,
     has_event_type_to_migrate,
     has_events_context_ids_to_migrate,
@@ -105,7 +104,6 @@ from .statistics import cleanup_statistics_timestamp_migration, get_start_time
 from .tasks import RecorderTask
 from .util import (
     database_job_retry_wrapper,
-    database_job_retry_wrapper_method,
     execute_stmt_lambda_element,
     get_index_by_name,
     retryable_database_job_method,
@@ -200,13 +198,12 @@ def get_schema_version(session_maker: Callable[[], Session]) -> int | None:
         return None
 
 
-@dataclass(frozen=True, kw_only=True)
+@dataclass(frozen=True)
 class SchemaValidationStatus:
     """Store schema validation status."""
 
     current_version: int
     migration_needed: bool
-    non_live_data_migration_needed: bool
     schema_errors: set[str]
     start_version: int
 
@@ -236,17 +233,8 @@ def validate_db_schema(
         # columns may otherwise not exist etc.
         schema_errors = _find_schema_errors(hass, instance, session_maker)
 
-    schema_migration_needed = not is_current
-    _non_live_data_migration_needed = non_live_data_migration_needed(
-        instance, session_maker, current_version
-    )
-
     return SchemaValidationStatus(
-        current_version=current_version,
-        non_live_data_migration_needed=_non_live_data_migration_needed,
-        migration_needed=schema_migration_needed or _non_live_data_migration_needed,
-        schema_errors=schema_errors,
-        start_version=current_version,
+        current_version, not is_current, schema_errors, current_version
     )
 
 
@@ -263,10 +251,7 @@ def _find_schema_errors(
 
 def live_migration(schema_status: SchemaValidationStatus) -> bool:
     """Check if live migration is possible."""
-    return (
-        schema_status.current_version >= LIVE_MIGRATION_MIN_SCHEMA_VERSION
-        and not schema_status.non_live_data_migration_needed
-    )
+    return schema_status.current_version >= LIVE_MIGRATION_MIN_SCHEMA_VERSION
 
 
 def pre_migrate_schema(engine: Engine) -> None:
@@ -365,68 +350,6 @@ def migrate_schema_live(
     return schema_status
 
 
-def _get_migration_changes(session: Session) -> dict[str, int]:
-    """Return migration changes as a dict."""
-    migration_changes: dict[str, int] = {
-        row[0]: row[1]
-        for row in execute_stmt_lambda_element(session, get_migration_changes())
-    }
-    return migration_changes
-
-
-def non_live_data_migration_needed(
-    instance: Recorder,
-    session_maker: Callable[[], Session],
-    schema_version: int,
-) -> bool:
-    """Return True if non-live data migration is needed.
-
-    This must only be called if database schema is current.
-    """
-    migration_needed = False
-    with session_scope(session=session_maker()) as session:
-        migration_changes = _get_migration_changes(session)
-        for migrator_cls in NON_LIVE_DATA_MIGRATORS:
-            migrator = migrator_cls(schema_version, migration_changes)
-            migration_needed |= migrator.needs_migrate(instance, session)
-
-    return migration_needed
-
-
-def migrate_data_non_live(
-    instance: Recorder,
-    session_maker: Callable[[], Session],
-    schema_status: SchemaValidationStatus,
-) -> None:
-    """Do non-live data migration.
-
-    This must be called after non-live schema migration is completed.
-    """
-    with session_scope(session=session_maker()) as session:
-        migration_changes = _get_migration_changes(session)
-
-    for migrator_cls in NON_LIVE_DATA_MIGRATORS:
-        migrator = migrator_cls(schema_status.start_version, migration_changes)
-        migrator.migrate_all(instance, session_maker)
-
-
-def migrate_data_live(
-    instance: Recorder,
-    session_maker: Callable[[], Session],
-    schema_status: SchemaValidationStatus,
-) -> None:
-    """Queue live schema migration tasks.
-
-    This must be called after live schema migration is completed.
-    """
-    with session_scope(session=session_maker()) as session:
-        migration_changes = _get_migration_changes(session)
-
-        for migrator_cls in LIVE_DATA_MIGRATORS:
-            migrator = migrator_cls(schema_status.start_version, migration_changes)
-            migrator.queue_migration(instance, session)
-
-
 def _create_index(
     session_maker: Callable[[], Session], table_name: str, index_name: str
 ) -> None:
@@ -2273,24 +2196,29 @@ class DataMigrationStatus:
     migration_done: bool
 
 
-class BaseMigration(ABC):
-    """Base class for migrations."""
+class BaseRunTimeMigration(ABC):
+    """Base class for run time migrations."""
 
     index_to_drop: tuple[str, str] | None = None
     required_schema_version = 0
     migration_version = 1
     migration_id: str
+    task = MigrationTask
 
     def __init__(self, schema_version: int, migration_changes: dict[str, int]) -> None:
         """Initialize a new BaseRunTimeMigration."""
         self.schema_version = schema_version
         self.migration_changes = migration_changes
 
-    @abstractmethod
-    def migrate_data(self, instance: Recorder) -> bool:
-        """Migrate some data, return True if migration is completed."""
+    def do_migrate(self, instance: Recorder, session: Session) -> None:
+        """Start migration if needed."""
+        if self.needs_migrate(instance, session):
+            instance.queue_task(self.task(self))
+        else:
+            self.migration_done(instance, session)
 
-    def _migrate_data(self, instance: Recorder) -> bool:
+    @retryable_database_job_method("migrate data")
+    def migrate_data(self, instance: Recorder) -> bool:
         """Migrate some data, returns True if migration is completed."""
         status = self.migrate_data_impl(instance)
         if status.migration_done:
@@ -2345,45 +2273,7 @@ class BaseMigration(ABC):
         return needs_migrate.needs_migrate
 
 
-class BaseOffLineMigration(BaseMigration):
-    """Base class for off line migrations."""
-
-    def migrate_all(
-        self, instance: Recorder, session_maker: Callable[[], Session]
-    ) -> None:
-        """Migrate all data."""
-        with session_scope(session=session_maker()) as session:
-            if not self.needs_migrate(instance, session):
-                self.migration_done(instance, session)
-                return
-        while not self.migrate_data(instance):
-            pass
-
-    @database_job_retry_wrapper_method("migrate data", 10)
-    def migrate_data(self, instance: Recorder) -> bool:
-        """Migrate some data, returns True if migration is completed."""
-        return self._migrate_data(instance)
-
-
-class BaseRunTimeMigration(BaseMigration):
-    """Base class for run time migrations."""
-
-    task = MigrationTask
-
-    def queue_migration(self, instance: Recorder, session: Session) -> None:
-        """Start migration if needed."""
-        if self.needs_migrate(instance, session):
-            instance.queue_task(self.task(self))
-        else:
-            self.migration_done(instance, session)
-
-    @retryable_database_job_method("migrate data")
-    def migrate_data(self, instance: Recorder) -> bool:
-        """Migrate some data, returns True if migration is completed."""
-        return self._migrate_data(instance)
-
-
-class BaseMigrationWithQuery(BaseMigration):
+class BaseRunTimeMigrationWithQuery(BaseRunTimeMigration):
     """Base class for run time migrations."""
 
     @abstractmethod
@@ -2400,7 +2290,7 @@ class BaseMigrationWithQuery(BaseMigration):
         )
 
 
-class StatesContextIDMigration(BaseMigrationWithQuery, BaseOffLineMigration):
+class StatesContextIDMigration(BaseRunTimeMigrationWithQuery):
     """Migration to migrate states context_ids to binary format."""
 
     required_schema_version = CONTEXT_ID_AS_BINARY_SCHEMA_VERSION
@@ -2443,7 +2333,7 @@ class StatesContextIDMigration(BaseMigrationWithQuery, BaseOffLineMigration):
         return has_states_context_ids_to_migrate()
 
 
-class EventsContextIDMigration(BaseMigrationWithQuery, BaseOffLineMigration):
+class EventsContextIDMigration(BaseRunTimeMigrationWithQuery):
     """Migration to migrate events context_ids to binary format."""
 
     required_schema_version = CONTEXT_ID_AS_BINARY_SCHEMA_VERSION
@@ -2486,7 +2376,7 @@ class EventsContextIDMigration(BaseMigrationWithQuery, BaseOffLineMigration):
         return has_events_context_ids_to_migrate()
 
 
-class EventTypeIDMigration(BaseMigrationWithQuery, BaseRunTimeMigration):
+class EventTypeIDMigration(BaseRunTimeMigrationWithQuery):
     """Migration to migrate event_type to event_type_ids."""
 
     required_schema_version = EVENT_TYPE_IDS_SCHEMA_VERSION
@@ -2564,7 +2454,7 @@ class EventTypeIDMigration(BaseMigrationWithQuery, BaseRunTimeMigration):
         return has_event_type_to_migrate()
 
 
-class EntityIDMigration(BaseMigrationWithQuery, BaseRunTimeMigration):
+class EntityIDMigration(BaseRunTimeMigrationWithQuery):
     """Migration to migrate entity_ids to states_meta."""
 
     required_schema_version = STATES_META_SCHEMA_VERSION
@@ -2652,7 +2542,7 @@ class EntityIDMigration(BaseMigrationWithQuery, BaseRunTimeMigration):
         instance.states_meta_manager.active = True
         with contextlib.suppress(SQLAlchemyError):
             migrate = EntityIDPostMigration(self.schema_version, self.migration_changes)
-            migrate.queue_migration(instance, session)
+            migrate.do_migrate(instance, session)
 
     def needs_migrate_query(self) -> StatementLambdaElement:
         """Check if the data is migrated."""
@@ -2741,7 +2631,7 @@ class EventIDPostMigration(BaseRunTimeMigration):
         return DataMigrationStatus(needs_migrate=False, migration_done=True)
 
 
-class EntityIDPostMigration(BaseMigrationWithQuery, BaseRunTimeMigration):
+class EntityIDPostMigration(BaseRunTimeMigrationWithQuery):
     """Migration to remove old entity_id strings from states."""
 
     migration_id = "entity_id_post_migration"
@@ -2758,19 +2648,9 @@ class EntityIDPostMigration(BaseMigrationWithQuery, BaseRunTimeMigration):
         return has_used_states_entity_ids()
 
 
-NON_LIVE_DATA_MIGRATORS = (
-    StatesContextIDMigration,  # Introduced in HA Core 2023.4
-    EventsContextIDMigration,  # Introduced in HA Core 2023.4
-)
-
-LIVE_DATA_MIGRATORS = (
-    EventTypeIDMigration,
-    EntityIDMigration,
-    EventIDPostMigration,
-)
-
-
-def _mark_migration_done(session: Session, migration: type[BaseMigration]) -> None:
+def _mark_migration_done(
+    session: Session, migration: type[BaseRunTimeMigration]
+) -> None:
     """Mark a migration as done in the database."""
     session.merge(
         MigrationChanges(
diff --git a/homeassistant/components/recorder/pool.py b/homeassistant/components/recorder/pool.py
index fc2a8ccb1cc..30f8fa8d07a 100644
--- a/homeassistant/components/recorder/pool.py
+++ b/homeassistant/components/recorder/pool.py
@@ -16,7 +16,7 @@ from sqlalchemy.pool import (
     StaticPool,
 )
 
-from homeassistant.helpers.frame import ReportBehavior, report_usage
+from homeassistant.helpers.frame import report
 from homeassistant.util.loop import raise_for_blocking_call
 
 _LOGGER = logging.getLogger(__name__)
@@ -108,14 +108,14 @@ class RecorderPool(SingletonThreadPool, NullPool):
         # raise_for_blocking_call will raise an exception
 
     def _do_get_db_connection_protected(self) -> ConnectionPoolEntry:
-        report_usage(
+        report(
             (
                 "accesses the database without the database executor; "
                 f"{ADVISE_MSG} "
                 "for faster database operations"
             ),
             exclude_integrations={"recorder"},
-            core_behavior=ReportBehavior.LOG,
+            error_if_core=False,
         )
         return NullPool._create_connection(self)  # noqa: SLF001
 
diff --git a/homeassistant/components/recorder/statistics.py b/homeassistant/components/recorder/statistics.py
index 7243af9d4d5..4ffe7c72971 100644
--- a/homeassistant/components/recorder/statistics.py
+++ b/homeassistant/components/recorder/statistics.py
@@ -28,7 +28,6 @@ from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_conversion import (
     BaseUnitConverter,
-    BloodGlucoseConcentrationConverter,
     ConductivityConverter,
     DataRateConverter,
     DistanceConverter,
@@ -129,10 +128,6 @@ QUERY_STATISTICS_SUMMARY_SUM = (
 
 
 STATISTIC_UNIT_TO_UNIT_CONVERTER: dict[str | None, type[BaseUnitConverter]] = {
-    **{
-        unit: BloodGlucoseConcentrationConverter
-        for unit in BloodGlucoseConcentrationConverter.VALID_UNITS
-    },
     **{unit: ConductivityConverter for unit in ConductivityConverter.VALID_UNITS},
     **{unit: DataRateConverter for unit in DataRateConverter.VALID_UNITS},
     **{unit: DistanceConverter for unit in DistanceConverter.VALID_UNITS},
diff --git a/homeassistant/components/recorder/util.py b/homeassistant/components/recorder/util.py
index a59519ef38d..d078c32cb88 100644
--- a/homeassistant/components/recorder/util.py
+++ b/homeassistant/components/recorder/util.py
@@ -652,13 +652,13 @@ type _FuncOrMethType[**_P, _R] = Callable[_P, _R]
 def retryable_database_job[**_P](
     description: str,
 ) -> Callable[[_FuncType[_P, bool]], _FuncType[_P, bool]]:
-    """Execute a database job repeatedly until it succeeds.
+    """Try to execute a database job.
 
     The job should return True if it finished, and False if it needs to be rescheduled.
     """
 
     def decorator(job: _FuncType[_P, bool]) -> _FuncType[_P, bool]:
-        return _wrap_retryable_database_job_func_or_meth(job, description, False)
+        return _wrap_func_or_meth(job, description, False)
 
     return decorator
 
@@ -666,18 +666,18 @@ def retryable_database_job[**_P](
 def retryable_database_job_method[_Self, **_P](
     description: str,
 ) -> Callable[[_MethType[_Self, _P, bool]], _MethType[_Self, _P, bool]]:
-    """Execute a database job repeatedly until it succeeds.
+    """Try to execute a database job.
 
     The job should return True if it finished, and False if it needs to be rescheduled.
     """
 
     def decorator(job: _MethType[_Self, _P, bool]) -> _MethType[_Self, _P, bool]:
-        return _wrap_retryable_database_job_func_or_meth(job, description, True)
+        return _wrap_func_or_meth(job, description, True)
 
     return decorator
 
 
-def _wrap_retryable_database_job_func_or_meth[**_P](
+def _wrap_func_or_meth[**_P](
     job: _FuncOrMethType[_P, bool], description: str, method: bool
 ) -> _FuncOrMethType[_P, bool]:
     recorder_pos = 1 if method else 0
@@ -705,10 +705,10 @@ def _wrap_retryable_database_job_func_or_meth[**_P](
     return wrapper
 
 
-def database_job_retry_wrapper[**_P, _R](
-    description: str, attempts: int
-) -> Callable[[_FuncType[_P, _R]], _FuncType[_P, _R]]:
-    """Execute a database job repeatedly until it succeeds, at most attempts times.
+def database_job_retry_wrapper[**_P](
+    description: str, attempts: int = 5
+) -> Callable[[_FuncType[_P, None]], _FuncType[_P, None]]:
+    """Try to execute a database job multiple times.
 
     This wrapper handles InnoDB deadlocks and lock timeouts.
 
@@ -717,63 +717,32 @@ def database_job_retry_wrapper[**_P, _R](
     """
 
     def decorator(
-        job: _FuncType[_P, _R],
-    ) -> _FuncType[_P, _R]:
-        return _database_job_retry_wrapper_func_or_meth(
-            job, description, attempts, False
-        )
+        job: _FuncType[_P, None],
+    ) -> _FuncType[_P, None]:
+        @functools.wraps(job)
+        def wrapper(instance: Recorder, *args: _P.args, **kwargs: _P.kwargs) -> None:
+            for attempt in range(attempts):
+                try:
+                    job(instance, *args, **kwargs)
+                except OperationalError as err:
+                    if attempt == attempts - 1 or not _is_retryable_error(
+                        instance, err
+                    ):
+                        raise
+                    assert isinstance(err.orig, BaseException)  # noqa: PT017
+                    _LOGGER.info(
+                        "%s; %s failed, retrying", err.orig.args[1], description
+                    )
+                    time.sleep(instance.db_retry_wait)
+                    # Failed with retryable error
+                else:
+                    return
+
+        return wrapper
 
     return decorator
 
 
-def database_job_retry_wrapper_method[_Self, **_P, _R](
-    description: str, attempts: int
-) -> Callable[[_MethType[_Self, _P, _R]], _MethType[_Self, _P, _R]]:
-    """Execute a database job repeatedly until it succeeds, at most attempts times.
-
-    This wrapper handles InnoDB deadlocks and lock timeouts.
-
-    This is different from retryable_database_job in that it will retry the job
-    attempts number of times instead of returning False if the job fails.
-    """
-
-    def decorator(
-        job: _MethType[_Self, _P, _R],
-    ) -> _MethType[_Self, _P, _R]:
-        return _database_job_retry_wrapper_func_or_meth(
-            job, description, attempts, True
-        )
-
-    return decorator
-
-
-def _database_job_retry_wrapper_func_or_meth[**_P, _R](
-    job: _FuncOrMethType[_P, _R],
-    description: str,
-    attempts: int,
-    method: bool,
-) -> _FuncOrMethType[_P, _R]:
-    recorder_pos = 1 if method else 0
-
-    @functools.wraps(job)
-    def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> _R:
-        instance: Recorder = args[recorder_pos]  # type: ignore[assignment]
-        for attempt in range(attempts):
-            try:
-                return job(*args, **kwargs)
-            except OperationalError as err:
-                # Failed with retryable error
-                if attempt == attempts - 1 or not _is_retryable_error(instance, err):
-                    raise
-                assert isinstance(err.orig, BaseException)  # noqa: PT017
-                _LOGGER.info("%s; %s failed, retrying", err.orig.args[1], description)
-                time.sleep(instance.db_retry_wait)
-
-        raise ValueError("attempts must be a positive integer")
-
-    return wrapper
-
-
 def periodic_db_cleanups(instance: Recorder) -> None:
     """Run any database cleanups that need to happen periodically.
 
diff --git a/homeassistant/components/recorder/websocket_api.py b/homeassistant/components/recorder/websocket_api.py
index f4dce73fa47..ac917e903df 100644
--- a/homeassistant/components/recorder/websocket_api.py
+++ b/homeassistant/components/recorder/websocket_api.py
@@ -16,7 +16,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.json import json_bytes
 from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_conversion import (
-    BloodGlucoseConcentrationConverter,
     ConductivityConverter,
     DataRateConverter,
     DistanceConverter,
@@ -55,9 +54,6 @@ UPDATE_STATISTICS_METADATA_TIME_OUT = 10
 
 UNIT_SCHEMA = vol.Schema(
     {
-        vol.Optional("blood_glucose_concentration"): vol.In(
-            BloodGlucoseConcentrationConverter.VALID_UNITS
-        ),
         vol.Optional("conductivity"): vol.In(ConductivityConverter.VALID_UNITS),
         vol.Optional("data_rate"): vol.In(DataRateConverter.VALID_UNITS),
         vol.Optional("distance"): vol.In(DistanceConverter.VALID_UNITS),
diff --git a/homeassistant/components/refoss/const.py b/homeassistant/components/refoss/const.py
index 851f8ba8f77..0542afe8afb 100644
--- a/homeassistant/components/refoss/const.py
+++ b/homeassistant/components/refoss/const.py
@@ -20,9 +20,6 @@ COORDINATOR = "coordinator"
 
 MAX_ERRORS = 2
 
-# Energy monitoring
-SENSOR_EM = "em"
-
 CHANNEL_DISPLAY_NAME: dict[str, dict[int, str]] = {
     "em06": {
         1: "A1",
@@ -31,25 +28,5 @@ CHANNEL_DISPLAY_NAME: dict[str, dict[int, str]] = {
         4: "A2",
         5: "B2",
         6: "C2",
-    },
-    "em16": {
-        1: "A1",
-        2: "A2",
-        3: "A3",
-        4: "A4",
-        5: "A5",
-        6: "A6",
-        7: "B1",
-        8: "B2",
-        9: "B3",
-        10: "B4",
-        11: "B5",
-        12: "B6",
-        13: "C1",
-        14: "C2",
-        15: "C3",
-        16: "C4",
-        17: "C5",
-        18: "C6",
-    },
+    }
 }
diff --git a/homeassistant/components/refoss/sensor.py b/homeassistant/components/refoss/sensor.py
index 26454cae48d..f65724ddd77 100644
--- a/homeassistant/components/refoss/sensor.py
+++ b/homeassistant/components/refoss/sensor.py
@@ -31,7 +31,6 @@ from .const import (
     COORDINATORS,
     DISPATCH_DEVICE_DISCOVERED,
     DOMAIN,
-    SENSOR_EM,
 )
 from .entity import RefossEntity
 
@@ -44,13 +43,8 @@ class RefossSensorEntityDescription(SensorEntityDescription):
     fn: Callable[[float], float] = lambda x: x
 
 
-DEVICETYPE_SENSOR: dict[str, str] = {
-    "em06": SENSOR_EM,
-    "em16": SENSOR_EM,
-}
-
 SENSORS: dict[str, tuple[RefossSensorEntityDescription, ...]] = {
-    SENSOR_EM: (
+    "em06": (
         RefossSensorEntityDescription(
             key="power",
             translation_key="power",
@@ -127,11 +121,8 @@ async def async_setup_entry(
 
         if not isinstance(device, ElectricityXMix):
             return
-
-        sensor_type = DEVICETYPE_SENSOR.get(device.device_type, "")
-
         descriptions: tuple[RefossSensorEntityDescription, ...] = SENSORS.get(
-            sensor_type, ()
+            device.device_type, ()
         )
 
         async_add_entities(
diff --git a/homeassistant/components/reolink/__init__.py b/homeassistant/components/reolink/__init__.py
index 7a36991201a..867cbe6c953 100644
--- a/homeassistant/components/reolink/__init__.py
+++ b/homeassistant/components/reolink/__init__.py
@@ -152,7 +152,6 @@ async def async_setup_entry(
     device_coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=config_entry,
         name=f"reolink.{host.api.nvr_name}",
         update_method=async_device_config_update,
         update_interval=DEVICE_UPDATE_INTERVAL,
@@ -160,7 +159,6 @@ async def async_setup_entry(
     firmware_coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=config_entry,
         name=f"reolink.{host.api.nvr_name}.firmware",
         update_method=async_check_firmware_update,
         update_interval=FIRMWARE_UPDATE_INTERVAL,
diff --git a/homeassistant/components/reolink/binary_sensor.py b/homeassistant/components/reolink/binary_sensor.py
index f6c64d0b060..c11161b11c7 100644
--- a/homeassistant/components/reolink/binary_sensor.py
+++ b/homeassistant/components/reolink/binary_sensor.py
@@ -42,34 +42,29 @@ class ReolinkBinarySensorEntityDescription(
 BINARY_PUSH_SENSORS = (
     ReolinkBinarySensorEntityDescription(
         key="motion",
-        cmd_id=33,
         device_class=BinarySensorDeviceClass.MOTION,
         value=lambda api, ch: api.motion_detected(ch),
     ),
     ReolinkBinarySensorEntityDescription(
         key=FACE_DETECTION_TYPE,
-        cmd_id=33,
         translation_key="face",
         value=lambda api, ch: api.ai_detected(ch, FACE_DETECTION_TYPE),
         supported=lambda api, ch: api.ai_supported(ch, FACE_DETECTION_TYPE),
     ),
     ReolinkBinarySensorEntityDescription(
         key=PERSON_DETECTION_TYPE,
-        cmd_id=33,
         translation_key="person",
         value=lambda api, ch: api.ai_detected(ch, PERSON_DETECTION_TYPE),
         supported=lambda api, ch: api.ai_supported(ch, PERSON_DETECTION_TYPE),
     ),
     ReolinkBinarySensorEntityDescription(
         key=VEHICLE_DETECTION_TYPE,
-        cmd_id=33,
         translation_key="vehicle",
         value=lambda api, ch: api.ai_detected(ch, VEHICLE_DETECTION_TYPE),
         supported=lambda api, ch: api.ai_supported(ch, VEHICLE_DETECTION_TYPE),
     ),
     ReolinkBinarySensorEntityDescription(
         key=PET_DETECTION_TYPE,
-        cmd_id=33,
         translation_key="pet",
         value=lambda api, ch: api.ai_detected(ch, PET_DETECTION_TYPE),
         supported=lambda api, ch: (
@@ -79,21 +74,18 @@ BINARY_PUSH_SENSORS = (
     ),
     ReolinkBinarySensorEntityDescription(
         key=PET_DETECTION_TYPE,
-        cmd_id=33,
         translation_key="animal",
         value=lambda api, ch: api.ai_detected(ch, PET_DETECTION_TYPE),
         supported=lambda api, ch: api.supported(ch, "ai_animal"),
     ),
     ReolinkBinarySensorEntityDescription(
         key=PACKAGE_DETECTION_TYPE,
-        cmd_id=33,
         translation_key="package",
         value=lambda api, ch: api.ai_detected(ch, PACKAGE_DETECTION_TYPE),
         supported=lambda api, ch: api.ai_supported(ch, PACKAGE_DETECTION_TYPE),
     ),
     ReolinkBinarySensorEntityDescription(
         key="visitor",
-        cmd_id=33,
         translation_key="visitor",
         value=lambda api, ch: api.visitor_detected(ch),
         supported=lambda api, ch: api.is_doorbell(ch),
diff --git a/homeassistant/components/reolink/config_flow.py b/homeassistant/components/reolink/config_flow.py
index 0b1ed7b4b15..102aeae575e 100644
--- a/homeassistant/components/reolink/config_flow.py
+++ b/homeassistant/components/reolink/config_flow.py
@@ -54,6 +54,10 @@ DEFAULT_OPTIONS = {CONF_PROTOCOL: DEFAULT_PROTOCOL}
 class ReolinkOptionsFlowHandler(OptionsFlow):
     """Handle Reolink options."""
 
+    def __init__(self, config_entry: ReolinkConfigEntry) -> None:
+        """Initialize ReolinkOptionsFlowHandler."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -108,7 +112,7 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ReolinkConfigEntry,
     ) -> ReolinkOptionsFlowHandler:
         """Options callback for Reolink."""
-        return ReolinkOptionsFlowHandler()
+        return ReolinkOptionsFlowHandler(config_entry)
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
diff --git a/homeassistant/components/reolink/entity.py b/homeassistant/components/reolink/entity.py
index 6101eee8a4c..d0a8f6dfc8d 100644
--- a/homeassistant/components/reolink/entity.py
+++ b/homeassistant/components/reolink/entity.py
@@ -7,7 +7,6 @@ from dataclasses import dataclass
 
 from reolink_aio.api import DUAL_LENS_MODELS, Chime, Host
 
-from homeassistant.core import callback
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import (
@@ -24,7 +23,6 @@ class ReolinkEntityDescription(EntityDescription):
     """A class that describes entities for Reolink."""
 
     cmd_key: str | None = None
-    cmd_id: int | None = None
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -92,35 +90,18 @@ class ReolinkHostCoordinatorEntity(CoordinatorEntity[DataUpdateCoordinator[None]
         """Return True if entity is available."""
         return self._host.api.session_active and super().available
 
-    @callback
-    def _push_callback(self) -> None:
-        """Handle incoming TCP push event."""
-        self.async_write_ha_state()
-
-    def register_callback(self, unique_id: str, cmd_id: int) -> None:
-        """Register callback for TCP push events."""
-        self._host.api.baichuan.register_callback(  # pragma: no cover
-            unique_id, self._push_callback, cmd_id
-        )
-
     async def async_added_to_hass(self) -> None:
         """Entity created."""
         await super().async_added_to_hass()
         cmd_key = self.entity_description.cmd_key
-        cmd_id = self.entity_description.cmd_id
         if cmd_key is not None:
             self._host.async_register_update_cmd(cmd_key)
-        if cmd_id is not None and self._attr_unique_id is not None:
-            self.register_callback(self._attr_unique_id, cmd_id)
 
     async def async_will_remove_from_hass(self) -> None:
         """Entity removed."""
         cmd_key = self.entity_description.cmd_key
-        cmd_id = self.entity_description.cmd_id
         if cmd_key is not None:
             self._host.async_unregister_update_cmd(cmd_key)
-        if cmd_id is not None and self._attr_unique_id is not None:
-            self._host.api.baichuan.unregister_callback(self._attr_unique_id)
 
         await super().async_will_remove_from_hass()
 
@@ -179,12 +160,6 @@ class ReolinkChannelCoordinatorEntity(ReolinkHostCoordinatorEntity):
         """Return True if entity is available."""
         return super().available and self._host.api.camera_online(self._channel)
 
-    def register_callback(self, unique_id: str, cmd_id) -> None:
-        """Register callback for TCP push events."""
-        self._host.api.baichuan.register_callback(
-            unique_id, self._push_callback, cmd_id, self._channel
-        )
-
     async def async_added_to_hass(self) -> None:
         """Entity created."""
         await super().async_added_to_hass()
diff --git a/homeassistant/components/reolink/host.py b/homeassistant/components/reolink/host.py
index 336876d4c4f..a90b9314440 100644
--- a/homeassistant/components/reolink/host.py
+++ b/homeassistant/components/reolink/host.py
@@ -41,7 +41,6 @@ from .exceptions import (
 )
 
 DEFAULT_TIMEOUT = 30
-FIRST_TCP_PUSH_TIMEOUT = 10
 FIRST_ONVIF_TIMEOUT = 10
 FIRST_ONVIF_LONG_POLL_TIMEOUT = 90
 SUBSCRIPTION_RENEW_THRESHOLD = 300
@@ -106,7 +105,6 @@ class ReolinkHost:
         self._long_poll_received: bool = False
         self._long_poll_error: bool = False
         self._cancel_poll: CALLBACK_TYPE | None = None
-        self._cancel_tcp_push_check: 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)
@@ -222,14 +220,49 @@ class ReolinkHost:
         else:
             self._unique_id = format_mac(self._api.mac_address)
 
-        try:
-            await self._api.baichuan.subscribe_events()
-        except ReolinkError:
-            await self._async_check_tcp_push()
-        else:
-            self._cancel_tcp_push_check = async_call_later(
-                self._hass, FIRST_TCP_PUSH_TIMEOUT, self._async_check_tcp_push
+        if self._onvif_push_supported:
+            try:
+                await self.subscribe()
+            except ReolinkError:
+                self._onvif_push_supported = False
+                self.unregister_webhook()
+                await self._api.unsubscribe()
+            else:
+                if self._api.supported(None, "initial_ONVIF_state"):
+                    _LOGGER.debug(
+                        "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 not self._onvif_push_supported:
+            _LOGGER.debug(
+                "Camera model %s does not support ONVIF push, using ONVIF long polling instead",
+                self._api.model,
             )
+            try:
+                await self._async_start_long_polling(initial=True)
+            except NotSupportedError:
+                _LOGGER.debug(
+                    "Camera model %s does not support ONVIF long polling, using fast polling instead",
+                    self._api.model,
+                )
+                self._onvif_long_poll_supported = False
+                await self._api.unsubscribe()
+                await self._async_poll_all_motion()
+            else:
+                self._cancel_long_poll_check = async_call_later(
+                    self._hass,
+                    FIRST_ONVIF_LONG_POLL_TIMEOUT,
+                    self._async_check_onvif_long_poll,
+                )
 
         ch_list: list[int | None] = [None]
         if self._api.is_nvr:
@@ -261,67 +294,6 @@ class ReolinkHost:
             else:
                 ir.async_delete_issue(self._hass, DOMAIN, f"firmware_update_{key}")
 
-    async def _async_check_tcp_push(self, *_) -> None:
-        """Check the TCP push subscription."""
-        if self._api.baichuan.events_active:
-            ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
-            self._cancel_tcp_push_check = None
-            return
-
-        _LOGGER.debug(
-            "Reolink %s, did not receive initial TCP push event after %i seconds",
-            self._api.nvr_name,
-            FIRST_TCP_PUSH_TIMEOUT,
-        )
-
-        if self._onvif_push_supported:
-            try:
-                await self.subscribe()
-            except ReolinkError:
-                self._onvif_push_supported = False
-                self.unregister_webhook()
-                await self._api.unsubscribe()
-            else:
-                if self._api.supported(None, "initial_ONVIF_state"):
-                    _LOGGER.debug(
-                        "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
-                )
-
-        # start long polling if ONVIF push failed immediately
-        if not self._onvif_push_supported:
-            _LOGGER.debug(
-                "Camera model %s does not support ONVIF push, using ONVIF long polling instead",
-                self._api.model,
-            )
-            try:
-                await self._async_start_long_polling(initial=True)
-            except NotSupportedError:
-                _LOGGER.debug(
-                    "Camera model %s does not support ONVIF long polling, using fast polling instead",
-                    self._api.model,
-                )
-                self._onvif_long_poll_supported = False
-                await self._api.unsubscribe()
-                await self._async_poll_all_motion()
-            else:
-                self._cancel_long_poll_check = async_call_later(
-                    self._hass,
-                    FIRST_ONVIF_LONG_POLL_TIMEOUT,
-                    self._async_check_onvif_long_poll,
-                )
-
-        self._cancel_tcp_push_check = None
-
     async def _async_check_onvif(self, *_) -> None:
         """Check the ONVIF subscription."""
         if self._webhook_reachable:
@@ -419,16 +391,6 @@ class ReolinkHost:
 
     async def disconnect(self) -> None:
         """Disconnect from the API, so the connection will be released."""
-        try:
-            await self._api.baichuan.unsubscribe_events()
-        except ReolinkError as err:
-            _LOGGER.error(
-                "Reolink error while unsubscribing Baichuan from host %s:%s: %s",
-                self._api.host,
-                self._api.port,
-                err,
-            )
-
         try:
             await self._api.unsubscribe()
         except ReolinkError as err:
@@ -499,9 +461,6 @@ class ReolinkHost:
         if self._cancel_poll is not None:
             self._cancel_poll()
             self._cancel_poll = None
-        if self._cancel_tcp_push_check is not None:
-            self._cancel_tcp_push_check()
-            self._cancel_tcp_push_check = None
         if self._cancel_onvif_check is not None:
             self._cancel_onvif_check()
             self._cancel_onvif_check = None
@@ -535,13 +494,8 @@ class ReolinkHost:
 
     async def renew(self) -> None:
         """Renew the subscription of motion events (lease time is 15 minutes)."""
-        if self._api.baichuan.events_active and self._api.subscribed(SubType.push):
-            # TCP push active, unsubscribe from ONVIF push because not needed
-            self.unregister_webhook()
-            await self._api.unsubscribe()
-
         try:
-            if self._onvif_push_supported and not self._api.baichuan.events_active:
+            if self._onvif_push_supported:
                 await self._renew(SubType.push)
 
             if self._onvif_long_poll_supported and self._long_poll_task is not None:
@@ -654,8 +608,7 @@ class ReolinkHost:
         """Use ONVIF long polling to immediately receive events."""
         # This task will be cancelled once _async_stop_long_polling is called
         while True:
-            if self._api.baichuan.events_active or self._webhook_reachable:
-                # TCP push or ONVIF push working, stop long polling
+            if self._webhook_reachable:
                 self._long_poll_task = None
                 await self._async_stop_long_polling()
                 return
@@ -689,12 +642,8 @@ class ReolinkHost:
 
     async def _async_poll_all_motion(self, *_) -> None:
         """Poll motion and AI states until the first ONVIF push is received."""
-        if (
-            self._api.baichuan.events_active
-            or self._webhook_reachable
-            or self._long_poll_received
-        ):
-            # TCP push, ONVIF push or long polling is working, stop fast 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
 
@@ -798,8 +747,6 @@ class ReolinkHost:
     @property
     def event_connection(self) -> str:
         """Type of connection to receive events."""
-        if self._api.baichuan.events_active:
-            return "TCP push"
         if self._webhook_reachable:
             return "ONVIF push"
         if self._long_poll_received:
diff --git a/homeassistant/components/reolink/icons.json b/homeassistant/components/reolink/icons.json
index d333a8a0201..5815e165607 100644
--- a/homeassistant/components/reolink/icons.json
+++ b/homeassistant/components/reolink/icons.json
@@ -246,12 +246,6 @@
           "off": "mdi:music-note-off"
         }
       },
-      "vehicle_tone": {
-        "default": "mdi:music-note",
-        "state": {
-          "off": "mdi:music-note-off"
-        }
-      },
       "visitor_tone": {
         "default": "mdi:music-note",
         "state": {
@@ -267,10 +261,7 @@
     },
     "sensor": {
       "ptz_pan_position": {
-        "default": "mdi:pan-horizontal"
-      },
-      "ptz_tilt_position": {
-        "default": "mdi:pan-vertical"
+        "default": "mdi:pan"
       },
       "battery_temperature": {
         "default": "mdi:thermometer"
diff --git a/homeassistant/components/reolink/light.py b/homeassistant/components/reolink/light.py
index 0f239a30813..d545a878068 100644
--- a/homeassistant/components/reolink/light.py
+++ b/homeassistant/components/reolink/light.py
@@ -57,7 +57,6 @@ LIGHT_ENTITIES = (
     ReolinkLightEntityDescription(
         key="floodlight",
         cmd_key="GetWhiteLed",
-        cmd_id=291,
         translation_key="floodlight",
         supported=lambda api, ch: api.supported(ch, "floodLight"),
         is_on_fn=lambda api, ch: api.whiteled_state(ch),
diff --git a/homeassistant/components/reolink/manifest.json b/homeassistant/components/reolink/manifest.json
index 7921bdb6ed5..4368d6a83a5 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.11.1"]
+  "requirements": ["reolink-aio==0.10.0"]
 }
diff --git a/homeassistant/components/reolink/select.py b/homeassistant/components/reolink/select.py
index a444997a907..b4175d41069 100644
--- a/homeassistant/components/reolink/select.py
+++ b/homeassistant/components/reolink/select.py
@@ -197,16 +197,6 @@ CHIME_SELECT_ENTITIES = (
         value=lambda chime: ChimeToneEnum(chime.tone("people")).name,
         method=lambda chime, name: chime.set_tone("people", ChimeToneEnum[name].value),
     ),
-    ReolinkChimeSelectEntityDescription(
-        key="vehicle_tone",
-        cmd_key="GetDingDongCfg",
-        translation_key="vehicle_tone",
-        entity_category=EntityCategory.CONFIG,
-        get_options=[method.name for method in ChimeToneEnum],
-        supported=lambda chime: "vehicle" in chime.chime_event_types,
-        value=lambda chime: ChimeToneEnum(chime.tone("vehicle")).name,
-        method=lambda chime, name: chime.set_tone("vehicle", ChimeToneEnum[name].value),
-    ),
     ReolinkChimeSelectEntityDescription(
         key="visitor_tone",
         cmd_key="GetDingDongCfg",
@@ -282,7 +272,7 @@ class ReolinkSelectEntity(ReolinkChannelCoordinatorEntity, SelectEntity):
 
         try:
             option = self.entity_description.value(self._host.api, self._channel)
-        except (ValueError, KeyError):
+        except ValueError:
             if self._log_error:
                 _LOGGER.exception("Reolink '%s' has an unknown value", self.name)
                 self._log_error = False
@@ -324,7 +314,7 @@ class ReolinkChimeSelectEntity(ReolinkChimeCoordinatorEntity, SelectEntity):
         """Return the current option."""
         try:
             option = self.entity_description.value(self._chime)
-        except (ValueError, KeyError):
+        except ValueError:
             if self._log_error:
                 _LOGGER.exception("Reolink '%s' has an unknown value", self.name)
                 self._log_error = False
diff --git a/homeassistant/components/reolink/sensor.py b/homeassistant/components/reolink/sensor.py
index 80e58c3d5c2..c2fc815235e 100644
--- a/homeassistant/components/reolink/sensor.py
+++ b/homeassistant/components/reolink/sensor.py
@@ -58,16 +58,7 @@ SENSORS = (
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         value=lambda api, ch: api.ptz_pan_position(ch),
-        supported=lambda api, ch: api.supported(ch, "ptz_pan_position"),
-    ),
-    ReolinkSensorEntityDescription(
-        key="ptz_tilt_position",
-        cmd_key="GetPtzCurPos",
-        translation_key="ptz_tilt_position",
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value=lambda api, ch: api.ptz_tilt_position(ch),
-        supported=lambda api, ch: api.supported(ch, "ptz_tilt_position"),
+        supported=lambda api, ch: api.supported(ch, "ptz_position"),
     ),
     ReolinkSensorEntityDescription(
         key="battery_percent",
diff --git a/homeassistant/components/reolink/strings.json b/homeassistant/components/reolink/strings.json
index 1d699b7b658..67fd5329e14 100644
--- a/homeassistant/components/reolink/strings.json
+++ b/homeassistant/components/reolink/strings.json
@@ -606,22 +606,6 @@
           "waybackhome": "[%key:component::reolink::entity::select::motion_tone::state::waybackhome%]"
         }
       },
-      "vehicle_tone": {
-        "name": "Vehicle ringtone",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "citybird": "[%key:component::reolink::entity::select::motion_tone::state::citybird%]",
-          "originaltune": "[%key:component::reolink::entity::select::motion_tone::state::originaltune%]",
-          "pianokey": "[%key:component::reolink::entity::select::motion_tone::state::pianokey%]",
-          "loop": "[%key:component::reolink::entity::select::motion_tone::state::loop%]",
-          "attraction": "[%key:component::reolink::entity::select::motion_tone::state::attraction%]",
-          "hophop": "[%key:component::reolink::entity::select::motion_tone::state::hophop%]",
-          "goodday": "[%key:component::reolink::entity::select::motion_tone::state::goodday%]",
-          "operetta": "[%key:component::reolink::entity::select::motion_tone::state::operetta%]",
-          "moonlight": "[%key:component::reolink::entity::select::motion_tone::state::moonlight%]",
-          "waybackhome": "[%key:component::reolink::entity::select::motion_tone::state::waybackhome%]"
-        }
-      },
       "visitor_tone": {
         "name": "Visitor ringtone",
         "state": {
@@ -665,9 +649,6 @@
       "ptz_pan_position": {
         "name": "PTZ pan position"
       },
-      "ptz_tilt_position": {
-        "name": "PTZ tilt position"
-      },
       "battery_temperature": {
         "name": "Battery temperature"
       },
diff --git a/homeassistant/components/rest/__init__.py b/homeassistant/components/rest/__init__.py
index 5695e51933e..59239ad6744 100644
--- a/homeassistant/components/rest/__init__.py
+++ b/homeassistant/components/rest/__init__.py
@@ -180,7 +180,6 @@ def _rest_coordinator(
     return DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=None,
         name="rest data",
         update_method=update_method,
         update_interval=update_interval,
diff --git a/homeassistant/components/rflink/sensor.py b/homeassistant/components/rflink/sensor.py
index 89632ac50b3..68b7847423c 100644
--- a/homeassistant/components/rflink/sensor.py
+++ b/homeassistant/components/rflink/sensor.py
@@ -71,8 +71,6 @@ SENSOR_TYPES = (
         native_unit_of_measurement=UnitOfPressure.HPA,
     ),
     SensorEntityDescription(
-        # Rflink devices reports ok/low so device class can’t be used
-        # It should be migrated to a binary sensor
         key="battery",
         name="Battery",
         icon="mdi:battery",
diff --git a/homeassistant/components/rfxtrx/config_flow.py b/homeassistant/components/rfxtrx/config_flow.py
index 866d9ecb1bb..ceb9bea4661 100644
--- a/homeassistant/components/rfxtrx/config_flow.py
+++ b/homeassistant/components/rfxtrx/config_flow.py
@@ -87,8 +87,9 @@ class RfxtrxOptionsFlow(OptionsFlow):
     _device_registry: dr.DeviceRegistry
     _device_entries: list[dr.DeviceEntry]
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize rfxtrx options flow."""
+        self._config_entry = config_entry
         self._global_options: dict[str, Any] = {}
         self._selected_device: dict[str, Any] = {}
         self._selected_device_entry_id: str | None = None
@@ -119,7 +120,9 @@ class RfxtrxOptionsFlow(OptionsFlow):
                 event_code = device_data["event_code"]
                 assert event_code
                 self._selected_device_event_code = event_code
-                self._selected_device = self.config_entry.data[CONF_DEVICES][event_code]
+                self._selected_device = self._config_entry.data[CONF_DEVICES][
+                    event_code
+                ]
                 self._selected_device_object = get_rfx_object(event_code)
                 return await self.async_step_set_device_options()
             if CONF_EVENT_CODE in user_input:
@@ -145,7 +148,7 @@ class RfxtrxOptionsFlow(OptionsFlow):
 
         device_registry = dr.async_get(self.hass)
         device_entries = dr.async_entries_for_config_entry(
-            device_registry, self.config_entry.entry_id
+            device_registry, self._config_entry.entry_id
         )
         self._device_registry = device_registry
         self._device_entries = device_entries
@@ -159,11 +162,11 @@ class RfxtrxOptionsFlow(OptionsFlow):
         options = {
             vol.Optional(
                 CONF_AUTOMATIC_ADD,
-                default=self.config_entry.data[CONF_AUTOMATIC_ADD],
+                default=self._config_entry.data[CONF_AUTOMATIC_ADD],
             ): bool,
             vol.Optional(
                 CONF_PROTOCOLS,
-                default=self.config_entry.data.get(CONF_PROTOCOLS) or [],
+                default=self._config_entry.data.get(CONF_PROTOCOLS) or [],
             ): cv.multi_select(RECV_MODES),
             vol.Optional(CONF_EVENT_CODE): str,
             vol.Optional(CONF_DEVICE): vol.In(configure_devices),
@@ -422,7 +425,7 @@ class RfxtrxOptionsFlow(OptionsFlow):
     def _can_add_device(self, new_rfx_obj: rfxtrxmod.RFXtrxEvent) -> bool:
         """Check if device does not already exist."""
         new_device_id = get_device_id(new_rfx_obj.device)
-        for packet_id, entity_info in self.config_entry.data[CONF_DEVICES].items():
+        for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items():
             rfx_obj = get_rfx_object(packet_id)
             assert rfx_obj
 
@@ -465,7 +468,7 @@ class RfxtrxOptionsFlow(OptionsFlow):
         assert entry
         device_id = get_device_tuple_from_identifiers(entry.identifiers)
         assert device_id
-        for packet_id, entity_info in self.config_entry.data[CONF_DEVICES].items():
+        for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items():
             if tuple(entity_info.get(CONF_DEVICE_ID)) == device_id:
                 event_code = cast(str, packet_id)
                 break
@@ -478,8 +481,8 @@ class RfxtrxOptionsFlow(OptionsFlow):
         devices: dict[str, Any] | None = None,
     ) -> None:
         """Update data in ConfigEntry."""
-        entry_data = self.config_entry.data.copy()
-        entry_data[CONF_DEVICES] = copy.deepcopy(self.config_entry.data[CONF_DEVICES])
+        entry_data = self._config_entry.data.copy()
+        entry_data[CONF_DEVICES] = copy.deepcopy(self._config_entry.data[CONF_DEVICES])
         if global_options:
             entry_data.update(global_options)
         if devices:
@@ -491,9 +494,9 @@ class RfxtrxOptionsFlow(OptionsFlow):
                     entry_data[CONF_DEVICES].pop(event_code, None)
                 else:
                     entry_data[CONF_DEVICES][event_code] = options
-        self.hass.config_entries.async_update_entry(self.config_entry, data=entry_data)
+        self.hass.config_entries.async_update_entry(self._config_entry, data=entry_data)
         self.hass.async_create_task(
-            self.hass.config_entries.async_reload(self.config_entry.entry_id)
+            self.hass.config_entries.async_reload(self._config_entry.entry_id)
         )
 
 
@@ -634,11 +637,9 @@ class RfxtrxConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> RfxtrxOptionsFlow:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return RfxtrxOptionsFlow()
+        return RfxtrxOptionsFlow(config_entry)
 
 
 def _test_transport(host: str | None, port: int | None, device: str | None) -> bool:
diff --git a/homeassistant/components/ring/event.py b/homeassistant/components/ring/event.py
index 71a4bc8aea5..e6d9d25542f 100644
--- a/homeassistant/components/ring/event.py
+++ b/homeassistant/components/ring/event.py
@@ -96,7 +96,7 @@ class RingEvent(RingBaseEntity[RingListenCoordinator, RingDeviceT], EventEntity)
 
     @callback
     def _handle_coordinator_update(self) -> None:
-        if (alert := self._get_coordinator_alert()) and not alert.is_update:
+        if alert := self._get_coordinator_alert():
             self._async_handle_event(alert.kind)
         super()._handle_coordinator_update()
 
diff --git a/homeassistant/components/ring/manifest.json b/homeassistant/components/ring/manifest.json
index e431c680081..4e0514ba7f9 100644
--- a/homeassistant/components/ring/manifest.json
+++ b/homeassistant/components/ring/manifest.json
@@ -30,5 +30,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["ring_doorbell"],
   "quality_scale": "silver",
-  "requirements": ["ring-doorbell==0.9.12"]
+  "requirements": ["ring-doorbell==0.9.8"]
 }
diff --git a/homeassistant/components/risco/alarm_control_panel.py b/homeassistant/components/risco/alarm_control_panel.py
index b1eae8fd917..08dee936d37 100644
--- a/homeassistant/components/risco/alarm_control_panel.py
+++ b/homeassistant/components/risco/alarm_control_panel.py
@@ -12,11 +12,19 @@ from pyrisco.local.partition import Partition as LocalPartition
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PIN
+from homeassistant.const import (
+    CONF_PIN,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -40,10 +48,10 @@ from .entity import RiscoCloudEntity
 _LOGGER = logging.getLogger(__name__)
 
 STATES_TO_SUPPORTED_FEATURES = {
-    AlarmControlPanelState.ARMED_AWAY: AlarmControlPanelEntityFeature.ARM_AWAY,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS: AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS,
-    AlarmControlPanelState.ARMED_HOME: AlarmControlPanelEntityFeature.ARM_HOME,
-    AlarmControlPanelState.ARMED_NIGHT: AlarmControlPanelEntityFeature.ARM_NIGHT,
+    STATE_ALARM_ARMED_AWAY: AlarmControlPanelEntityFeature.ARM_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS: AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME: AlarmControlPanelEntityFeature.ARM_HOME,
+    STATE_ALARM_ARMED_NIGHT: AlarmControlPanelEntityFeature.ARM_NIGHT,
 }
 
 
@@ -108,14 +116,14 @@ class RiscoAlarm(AlarmControlPanelEntity):
             self._attr_supported_features |= STATES_TO_SUPPORTED_FEATURES[state]
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         if self._partition.triggered:
-            return AlarmControlPanelState.TRIGGERED
+            return STATE_ALARM_TRIGGERED
         if self._partition.arming:
-            return AlarmControlPanelState.ARMING
+            return STATE_ALARM_ARMING
         if self._partition.disarmed:
-            return AlarmControlPanelState.DISARMED
+            return STATE_ALARM_DISARMED
         if self._partition.armed:
             return self._risco_to_ha[RISCO_ARM]
         if self._partition.partially_armed:
@@ -140,21 +148,21 @@ class RiscoAlarm(AlarmControlPanelEntity):
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
-        await self._arm(AlarmControlPanelState.ARMED_HOME, code)
+        await self._arm(STATE_ALARM_ARMED_HOME, code)
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
-        await self._arm(AlarmControlPanelState.ARMED_AWAY, code)
+        await self._arm(STATE_ALARM_ARMED_AWAY, code)
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
-        await self._arm(AlarmControlPanelState.ARMED_NIGHT, code)
+        await self._arm(STATE_ALARM_ARMED_NIGHT, code)
 
     async def async_alarm_arm_custom_bypass(self, code: str | None = None) -> None:
         """Send arm custom bypass command."""
-        await self._arm(AlarmControlPanelState.ARMED_CUSTOM_BYPASS, code)
+        await self._arm(STATE_ALARM_ARMED_CUSTOM_BYPASS, code)
 
-    async def _arm(self, mode: AlarmControlPanelState, code: str | None) -> None:
+    async def _arm(self, mode: str, code: str | None) -> None:
         if self.code_arm_required and not self._validate_code(code):
             _LOGGER.warning("Wrong code entered for %s", mode)
             return
diff --git a/homeassistant/components/risco/config_flow.py b/homeassistant/components/risco/config_flow.py
index f7365d35414..735880df09b 100644
--- a/homeassistant/components/risco/config_flow.py
+++ b/homeassistant/components/risco/config_flow.py
@@ -9,7 +9,6 @@ from typing import Any
 from pyrisco import CannotConnectError, RiscoCloud, RiscoLocal, UnauthorizedError
 import voluptuous as vol
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
@@ -24,6 +23,10 @@ from homeassistant.const import (
     CONF_SCAN_INTERVAL,
     CONF_TYPE,
     CONF_USERNAME,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -61,10 +64,10 @@ LOCAL_SCHEMA = vol.Schema(
     }
 )
 HA_STATES = [
-    AlarmControlPanelState.ARMED_AWAY.value,
-    AlarmControlPanelState.ARMED_HOME.value,
-    AlarmControlPanelState.ARMED_NIGHT.value,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS.value,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
 ]
 
 
@@ -220,6 +223,7 @@ class RiscoOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize."""
+        self.config_entry = config_entry
         self._data = {**DEFAULT_OPTIONS, **config_entry.options}
 
     def _options_schema(self) -> vol.Schema:
diff --git a/homeassistant/components/risco/const.py b/homeassistant/components/risco/const.py
index 078e26c43b5..f1240a704de 100644
--- a/homeassistant/components/risco/const.py
+++ b/homeassistant/components/risco/const.py
@@ -1,7 +1,10 @@
 """Constants for the Risco integration."""
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
-from homeassistant.const import CONF_SCAN_INTERVAL
+from homeassistant.const import (
+    CONF_SCAN_INTERVAL,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+)
 
 DOMAIN = "risco"
 
@@ -30,18 +33,16 @@ RISCO_ARM = "arm"
 RISCO_PARTIAL_ARM = "partial_arm"
 RISCO_STATES = [RISCO_ARM, RISCO_PARTIAL_ARM, *RISCO_GROUPS]
 
-DEFAULT_RISCO_GROUPS_TO_HA = {
-    group: AlarmControlPanelState.ARMED_HOME for group in RISCO_GROUPS
-}
+DEFAULT_RISCO_GROUPS_TO_HA = {group: STATE_ALARM_ARMED_HOME for group in RISCO_GROUPS}
 DEFAULT_RISCO_STATES_TO_HA = {
-    RISCO_ARM: AlarmControlPanelState.ARMED_AWAY,
-    RISCO_PARTIAL_ARM: AlarmControlPanelState.ARMED_HOME,
+    RISCO_ARM: STATE_ALARM_ARMED_AWAY,
+    RISCO_PARTIAL_ARM: STATE_ALARM_ARMED_HOME,
     **DEFAULT_RISCO_GROUPS_TO_HA,
 }
 
 DEFAULT_HA_STATES_TO_RISCO = {
-    AlarmControlPanelState.ARMED_AWAY: RISCO_ARM,
-    AlarmControlPanelState.ARMED_HOME: RISCO_PARTIAL_ARM,
+    STATE_ALARM_ARMED_AWAY: RISCO_ARM,
+    STATE_ALARM_ARMED_HOME: RISCO_PARTIAL_ARM,
 }
 
 DEFAULT_OPTIONS = {
diff --git a/homeassistant/components/roborock/config_flow.py b/homeassistant/components/roborock/config_flow.py
index 200614b024e..06fbf3e717e 100644
--- a/homeassistant/components/roborock/config_flow.py
+++ b/homeassistant/components/roborock/config_flow.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from copy import deepcopy
 import logging
 from typing import Any
 
@@ -25,6 +24,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_USERNAME
 from homeassistant.core import callback
@@ -171,18 +171,14 @@ class RoborockFlowHandler(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> RoborockOptionsFlowHandler:
+    ) -> OptionsFlow:
         """Create the options flow."""
         return RoborockOptionsFlowHandler(config_entry)
 
 
-class RoborockOptionsFlowHandler(OptionsFlow):
+class RoborockOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle an option flow for Roborock."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialize options flow."""
-        self.options = deepcopy(dict(config_entry.options))
-
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/roborock/coordinator.py b/homeassistant/components/roborock/coordinator.py
index fe592074f71..20bc50f9855 100644
--- a/homeassistant/components/roborock/coordinator.py
+++ b/homeassistant/components/roborock/coordinator.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import asyncio
 from datetime import timedelta
 import logging
 
@@ -106,12 +107,8 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
     async def _async_update_data(self) -> DeviceProp:
         """Update data via library."""
         try:
-            # Update device props and standard api information
-            await self._update_device_prop()
-            # Set the new map id from the updated device props
+            await asyncio.gather(*(self._update_device_prop(), self.get_rooms()))
             self._set_current_map()
-            # Get the rooms for that map id.
-            await self.get_rooms()
         except RoborockException as ex:
             raise UpdateFailed(ex) from ex
         return self.roborock_device_info.props
diff --git a/homeassistant/components/roborock/manifest.json b/homeassistant/components/roborock/manifest.json
index c305e4710fc..3bb3b9b2046 100644
--- a/homeassistant/components/roborock/manifest.json
+++ b/homeassistant/components/roborock/manifest.json
@@ -7,7 +7,7 @@
   "iot_class": "local_polling",
   "loggers": ["roborock"],
   "requirements": [
-    "python-roborock==2.7.2",
+    "python-roborock==2.6.0",
     "vacuum-map-parser-roborock==0.1.2"
   ]
 }
diff --git a/homeassistant/components/roborock/select.py b/homeassistant/components/roborock/select.py
index 73cb95d2d7c..3dfe0e72a7b 100644
--- a/homeassistant/components/roborock/select.py
+++ b/homeassistant/components/roborock/select.py
@@ -135,9 +135,6 @@ class RoborockCurrentMapSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
                     RoborockCommand.LOAD_MULTI_MAP,
                     [map_id],
                 )
-                # Update the current map id manually so that nothing gets broken
-                # if another service hits the api.
-                self.coordinator.current_map = map_id
                 # We need to wait after updating the map
                 # so that other commands will be executed correctly.
                 await asyncio.sleep(MAP_SLEEP)
@@ -151,9 +148,6 @@ class RoborockCurrentMapSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
     @property
     def current_option(self) -> str | None:
         """Get the current status of the select entity from device_status."""
-        if (
-            (current_map := self.coordinator.current_map) is not None
-            and current_map in self.coordinator.maps
-        ):  # 63 means it is searching for a map.
+        if (current_map := self.coordinator.current_map) is not None:
             return self.coordinator.maps[current_map].name
         return None
diff --git a/homeassistant/components/roku/config_flow.py b/homeassistant/components/roku/config_flow.py
index 18e3b3ed68a..3ece9aff3f2 100644
--- a/homeassistant/components/roku/config_flow.py
+++ b/homeassistant/components/roku/config_flow.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant, callback
@@ -165,12 +165,12 @@ class RokuConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: ConfigEntry,
-    ) -> RokuOptionsFlowHandler:
+    ) -> OptionsFlowWithConfigEntry:
         """Create the options flow."""
-        return RokuOptionsFlowHandler()
+        return RokuOptionsFlowHandler(config_entry)
 
 
-class RokuOptionsFlowHandler(OptionsFlow):
+class RokuOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle Roku options."""
 
     async def async_step_init(
@@ -186,7 +186,7 @@ class RokuOptionsFlowHandler(OptionsFlow):
                 {
                     vol.Optional(
                         CONF_PLAY_MEDIA_APP_ID,
-                        default=self.config_entry.options.get(
+                        default=self.options.get(
                             CONF_PLAY_MEDIA_APP_ID, DEFAULT_PLAY_MEDIA_APP_ID
                         ),
                     ): str,
diff --git a/homeassistant/components/roomba/config_flow.py b/homeassistant/components/roomba/config_flow.py
index e48d2d91139..d690bcce978 100644
--- a/homeassistant/components/roomba/config_flow.py
+++ b/homeassistant/components/roomba/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_DELAY, CONF_HOST, CONF_NAME, CONF_PASSWORD
 from homeassistant.core import HomeAssistant, callback
@@ -57,7 +57,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
             address=data[CONF_HOST],
             blid=data[CONF_BLID],
             password=data[CONF_PASSWORD],
-            continuous=True,
+            continuous=False,
             delay=data[CONF_DELAY],
         )
     )
@@ -92,7 +92,7 @@ class RoombaConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> RoombaOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return RoombaOptionsFlowHandler()
+        return RoombaOptionsFlowHandler(config_entry)
 
     async def async_step_zeroconf(
         self, discovery_info: zeroconf.ZeroconfServiceInfo
@@ -300,7 +300,7 @@ class RoombaConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class RoombaOptionsFlowHandler(OptionsFlow):
+class RoombaOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle options."""
 
     async def async_step_init(
@@ -310,18 +310,17 @@ class RoombaOptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)
 
-        options = self.config_entry.options
         return self.async_show_form(
             step_id="init",
             data_schema=vol.Schema(
                 {
                     vol.Optional(
                         CONF_CONTINUOUS,
-                        default=options.get(CONF_CONTINUOUS, DEFAULT_CONTINUOUS),
+                        default=self.options.get(CONF_CONTINUOUS, DEFAULT_CONTINUOUS),
                     ): bool,
                     vol.Optional(
                         CONF_DELAY,
-                        default=options.get(CONF_DELAY, DEFAULT_DELAY),
+                        default=self.options.get(CONF_DELAY, DEFAULT_DELAY),
                     ): int,
                 }
             ),
diff --git a/homeassistant/components/roomba/const.py b/homeassistant/components/roomba/const.py
index 7f1e3b8e1ee..331c0900682 100644
--- a/homeassistant/components/roomba/const.py
+++ b/homeassistant/components/roomba/const.py
@@ -9,5 +9,5 @@ CONF_CONTINUOUS = "continuous"
 CONF_BLID = "blid"
 DEFAULT_CERT = "/etc/ssl/certs/ca-certificates.crt"
 DEFAULT_CONTINUOUS = True
-DEFAULT_DELAY = 30
+DEFAULT_DELAY = 1
 ROOMBA_SESSION = "roomba_session"
diff --git a/homeassistant/components/rtsp_to_webrtc/__init__.py b/homeassistant/components/rtsp_to_webrtc/__init__.py
index 59b8077e398..948ba8929fc 100644
--- a/homeassistant/components/rtsp_to_webrtc/__init__.py
+++ b/homeassistant/components/rtsp_to_webrtc/__init__.py
@@ -24,11 +24,11 @@ import logging
 from rtsp_to_webrtc.client import get_adaptive_client
 from rtsp_to_webrtc.exceptions import ClientError, ResponseError
 from rtsp_to_webrtc.interface import WebRTCClientInterface
-from webrtc_models import RTCIceServer
 
 from homeassistant.components import camera
+from homeassistant.components.camera.webrtc import RTCIceServer, register_ice_server
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
@@ -59,11 +59,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data[DOMAIN][CONF_STUN_SERVER] = entry.options.get(CONF_STUN_SERVER)
     if server := entry.options.get(CONF_STUN_SERVER):
 
-        @callback
-        def get_servers() -> list[RTCIceServer]:
-            return [RTCIceServer(urls=[server])]
+        async def get_server() -> RTCIceServer:
+            return RTCIceServer(urls=[server])
 
-        entry.async_on_unload(camera.async_register_ice_servers(hass, get_servers))
+        entry.async_on_unload(register_ice_server(hass, get_server))
 
     async def async_offer_for_stream_source(
         stream_source: str,
diff --git a/homeassistant/components/rtsp_to_webrtc/config_flow.py b/homeassistant/components/rtsp_to_webrtc/config_flow.py
index 22502659757..adab1a456d0 100644
--- a/homeassistant/components/rtsp_to_webrtc/config_flow.py
+++ b/homeassistant/components/rtsp_to_webrtc/config_flow.py
@@ -9,6 +9,7 @@ from urllib.parse import urlparse
 import rtsp_to_webrtc
 import voluptuous as vol
 
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
@@ -18,7 +19,6 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from . import CONF_STUN_SERVER, DATA_SERVER_URL, DOMAIN
 
@@ -119,12 +119,16 @@ class RTSPToWebRTCConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Create an options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """RTSPtoWeb Options flow."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/ruckus_unleashed/manifest.json b/homeassistant/components/ruckus_unleashed/manifest.json
index 8d56f3a5563..2066b65221e 100644
--- a/homeassistant/components/ruckus_unleashed/manifest.json
+++ b/homeassistant/components/ruckus_unleashed/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioruckus"],
-  "requirements": ["aioruckus==0.42"]
+  "requirements": ["aioruckus==0.41"]
 }
diff --git a/homeassistant/components/russound_rio/__init__.py b/homeassistant/components/russound_rio/__init__.py
index 784629ea0bc..ba53f6794e3 100644
--- a/homeassistant/components/russound_rio/__init__.py
+++ b/homeassistant/components/russound_rio/__init__.py
@@ -11,7 +11,7 @@ from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import CONNECT_TIMEOUT, DOMAIN, RUSSOUND_RIO_EXCEPTIONS
+from .const import CONNECT_TIMEOUT, RUSSOUND_RIO_EXCEPTIONS
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
@@ -43,14 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: RussoundConfigEntry) ->
         async with asyncio.timeout(CONNECT_TIMEOUT):
             await client.connect()
     except RUSSOUND_RIO_EXCEPTIONS as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="entry_cannot_connect",
-            translation_placeholders={
-                "host": host,
-                "port": port,
-            },
-        ) from err
+        raise ConfigEntryNotReady(f"Error while connecting to {host}:{port}") from err
     entry.runtime_data = client
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/russound_rio/const.py b/homeassistant/components/russound_rio/const.py
index af52e89d399..1b38dc8ce5c 100644
--- a/homeassistant/components/russound_rio/const.py
+++ b/homeassistant/components/russound_rio/const.py
@@ -17,7 +17,7 @@ RUSSOUND_RIO_EXCEPTIONS = (
 )
 
 
-CONNECT_TIMEOUT = 15
+CONNECT_TIMEOUT = 5
 
 MP_FEATURES_BY_FLAG = {
     FeatureFlag.COMMANDS_ZONE_MUTE_OFF_ON: MediaPlayerEntityFeature.VOLUME_MUTE
diff --git a/homeassistant/components/russound_rio/entity.py b/homeassistant/components/russound_rio/entity.py
index 9790ff43e68..23b196ecb2f 100644
--- a/homeassistant/components/russound_rio/entity.py
+++ b/homeassistant/components/russound_rio/entity.py
@@ -26,12 +26,7 @@ def command[_EntityT: RussoundBaseEntity, **_P](
             await func(self, *args, **kwargs)
         except RUSSOUND_RIO_EXCEPTIONS as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="command_error",
-                translation_placeholders={
-                    "function_name": func.__name__,
-                    "entity_id": self.entity_id,
-                },
+                f"Error executing {func.__name__} on entity {self.entity_id},"
             ) from exc
 
     return decorator
@@ -96,4 +91,6 @@ class RussoundBaseEntity(Entity):
 
     async def async_will_remove_from_hass(self) -> None:
         """Remove callbacks."""
-        self._client.unregister_state_update_callbacks(self._state_update_callback)
+        await self._client.unregister_state_update_callbacks(
+            self._state_update_callback
+        )
diff --git a/homeassistant/components/russound_rio/manifest.json b/homeassistant/components/russound_rio/manifest.json
index ab77ca3ab6a..96fc0fb53db 100644
--- a/homeassistant/components/russound_rio/manifest.json
+++ b/homeassistant/components/russound_rio/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_push",
   "loggers": ["aiorussound"],
   "quality_scale": "silver",
-  "requirements": ["aiorussound==4.1.0"]
+  "requirements": ["aiorussound==4.0.5"]
 }
diff --git a/homeassistant/components/russound_rio/media_player.py b/homeassistant/components/russound_rio/media_player.py
index 45818d3e25b..316e4d2be7c 100644
--- a/homeassistant/components/russound_rio/media_player.py
+++ b/homeassistant/components/russound_rio/media_player.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 import logging
 
 from aiorussound import Controller
-from aiorussound.models import PlayStatus, Source
+from aiorussound.models import Source
 from aiorussound.rio import ZoneControlSurface
 
 from homeassistant.components.media_player import (
@@ -132,18 +132,11 @@ class RussoundZoneDevice(RussoundBaseEntity, MediaPlayerEntity):
     def state(self) -> MediaPlayerState | None:
         """Return the state of the device."""
         status = self._zone.status
-        play_status = self._source.play_status
-        if not status:
+        if status == "ON":
+            return MediaPlayerState.ON
+        if status == "OFF":
             return MediaPlayerState.OFF
-        if play_status == PlayStatus.PLAYING:
-            return MediaPlayerState.PLAYING
-        if play_status == PlayStatus.PAUSED:
-            return MediaPlayerState.PAUSED
-        if play_status == PlayStatus.TRANSITIONING:
-            return MediaPlayerState.BUFFERING
-        if play_status == PlayStatus.STOPPED:
-            return MediaPlayerState.IDLE
-        return MediaPlayerState.ON
+        return None
 
     @property
     def source(self):
@@ -182,7 +175,7 @@ class RussoundZoneDevice(RussoundBaseEntity, MediaPlayerEntity):
         Value is returned based on a range (0..50).
         Therefore float divide by 50 to get to the required range.
         """
-        return self._zone.volume / 50.0
+        return float(self._zone.volume or "0") / 50.0
 
     @command
     async def async_turn_off(self) -> None:
diff --git a/homeassistant/components/russound_rio/strings.json b/homeassistant/components/russound_rio/strings.json
index b8c29c08301..c105dcafae2 100644
--- a/homeassistant/components/russound_rio/strings.json
+++ b/homeassistant/components/russound_rio/strings.json
@@ -33,13 +33,5 @@
       "title": "[%key:component::russound_rio::issues::deprecated_yaml_import_issue_cannot_connect::title%]",
       "description": "[%key:component::russound_rio::issues::deprecated_yaml_import_issue_cannot_connect::description%]"
     }
-  },
-  "exceptions": {
-    "entry_cannot_connect": {
-      "message": "Error while connecting to {host}:{port}"
-    },
-    "command_error": {
-      "message": "Error executing {function_name} on entity {entity_id}"
-    }
   }
 }
diff --git a/homeassistant/components/satel_integra/alarm_control_panel.py b/homeassistant/components/satel_integra/alarm_control_panel.py
index 39c0d6b876d..f9e261b25b1 100644
--- a/homeassistant/components/satel_integra/alarm_control_panel.py
+++ b/homeassistant/components/satel_integra/alarm_control_panel.py
@@ -11,9 +11,15 @@ from satel_integra.satel_integra import AlarmState
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -61,6 +67,7 @@ class SatelIntegraAlarmPanel(AlarmControlPanelEntity):
 
     _attr_code_format = CodeFormat.NUMBER
     _attr_should_poll = False
+    _attr_state: str | None
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
@@ -88,8 +95,8 @@ class SatelIntegraAlarmPanel(AlarmControlPanelEntity):
         """Handle alarm status update."""
         state = self._read_alarm_state()
         _LOGGER.debug("Got status update, current status: %s", state)
-        if state != self._attr_alarm_state:
-            self._attr_alarm_state = state
+        if state != self._attr_state:
+            self._attr_state = state
             self.async_write_ha_state()
         else:
             _LOGGER.debug("Ignoring alarm status message, same state")
@@ -98,28 +105,22 @@ class SatelIntegraAlarmPanel(AlarmControlPanelEntity):
         """Read current status of the alarm and translate it into HA status."""
 
         # Default - disarmed:
-        hass_alarm_status = AlarmControlPanelState.DISARMED
+        hass_alarm_status = STATE_ALARM_DISARMED
 
         if not self._satel.connected:
             return None
 
         state_map = OrderedDict(
             [
-                (AlarmState.TRIGGERED, AlarmControlPanelState.TRIGGERED),
-                (AlarmState.TRIGGERED_FIRE, AlarmControlPanelState.TRIGGERED),
-                (AlarmState.ENTRY_TIME, AlarmControlPanelState.PENDING),
-                (AlarmState.ARMED_MODE3, AlarmControlPanelState.ARMED_HOME),
-                (AlarmState.ARMED_MODE2, AlarmControlPanelState.ARMED_HOME),
-                (AlarmState.ARMED_MODE1, AlarmControlPanelState.ARMED_HOME),
-                (AlarmState.ARMED_MODE0, AlarmControlPanelState.ARMED_AWAY),
-                (
-                    AlarmState.EXIT_COUNTDOWN_OVER_10,
-                    AlarmControlPanelState.PENDING,
-                ),
-                (
-                    AlarmState.EXIT_COUNTDOWN_UNDER_10,
-                    AlarmControlPanelState.PENDING,
-                ),
+                (AlarmState.TRIGGERED, STATE_ALARM_TRIGGERED),
+                (AlarmState.TRIGGERED_FIRE, STATE_ALARM_TRIGGERED),
+                (AlarmState.ENTRY_TIME, STATE_ALARM_PENDING),
+                (AlarmState.ARMED_MODE3, STATE_ALARM_ARMED_HOME),
+                (AlarmState.ARMED_MODE2, STATE_ALARM_ARMED_HOME),
+                (AlarmState.ARMED_MODE1, STATE_ALARM_ARMED_HOME),
+                (AlarmState.ARMED_MODE0, STATE_ALARM_ARMED_AWAY),
+                (AlarmState.EXIT_COUNTDOWN_OVER_10, STATE_ALARM_PENDING),
+                (AlarmState.EXIT_COUNTDOWN_UNDER_10, STATE_ALARM_PENDING),
             ]
         )
         _LOGGER.debug("State map of Satel: %s", self._satel.partition_states)
@@ -140,11 +141,9 @@ class SatelIntegraAlarmPanel(AlarmControlPanelEntity):
             _LOGGER.debug("Code was empty or None")
             return
 
-        clear_alarm_necessary = (
-            self._attr_alarm_state == AlarmControlPanelState.TRIGGERED
-        )
+        clear_alarm_necessary = self._attr_state == STATE_ALARM_TRIGGERED
 
-        _LOGGER.debug("Disarming, self._attr_alarm_state: %s", self._attr_alarm_state)
+        _LOGGER.debug("Disarming, self._attr_state: %s", self._attr_state)
 
         await self._satel.disarm(code, [self._partition_id])
 
diff --git a/homeassistant/components/schlage/__init__.py b/homeassistant/components/schlage/__init__.py
index e9fb24f1309..1c3ad547f3d 100644
--- a/homeassistant/components/schlage/__init__.py
+++ b/homeassistant/components/schlage/__init__.py
@@ -16,7 +16,6 @@ from .coordinator import SchlageDataUpdateCoordinator
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
     Platform.LOCK,
-    Platform.SELECT,
     Platform.SENSOR,
     Platform.SWITCH,
 ]
diff --git a/homeassistant/components/schlage/select.py b/homeassistant/components/schlage/select.py
deleted file mode 100644
index 6d93eccaa85..00000000000
--- a/homeassistant/components/schlage/select.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""Platform for Schlage select integration."""
-
-from __future__ import annotations
-
-from homeassistant.components.select import SelectEntity, SelectEntityDescription
-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 .coordinator import LockData, SchlageDataUpdateCoordinator
-from .entity import SchlageEntity
-
-_DESCRIPTIONS = (
-    SelectEntityDescription(
-        key="auto_lock_time",
-        translation_key="auto_lock_time",
-        entity_category=EntityCategory.CONFIG,
-        # valid values are from Schlage UI and validated by pyschlage
-        options=[
-            "0",
-            "15",
-            "30",
-            "60",
-            "120",
-            "240",
-            "300",
-        ],
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up selects based on a config entry."""
-    coordinator: SchlageDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
-
-    def _add_new_locks(locks: dict[str, LockData]) -> None:
-        async_add_entities(
-            SchlageSelect(
-                coordinator=coordinator,
-                description=description,
-                device_id=device_id,
-            )
-            for device_id in locks
-            for description in _DESCRIPTIONS
-        )
-
-    _add_new_locks(coordinator.data.locks)
-    coordinator.new_locks_callbacks.append(_add_new_locks)
-
-
-class SchlageSelect(SchlageEntity, SelectEntity):
-    """Schlage select entity."""
-
-    def __init__(
-        self,
-        coordinator: SchlageDataUpdateCoordinator,
-        description: SelectEntityDescription,
-        device_id: str,
-    ) -> None:
-        """Initialize a SchlageSelect."""
-        super().__init__(coordinator, device_id)
-        self.entity_description = description
-        self._attr_unique_id = f"{device_id}_{self.entity_description.key}"
-
-    @property
-    def current_option(self) -> str:
-        """Return the current option."""
-        return str(self._lock_data.lock.auto_lock_time)
-
-    def select_option(self, option: str) -> None:
-        """Set the current option."""
-        self._lock.set_auto_lock_time(int(option))
diff --git a/homeassistant/components/schlage/strings.json b/homeassistant/components/schlage/strings.json
index 5c8cd0826a9..721d9e80286 100644
--- a/homeassistant/components/schlage/strings.json
+++ b/homeassistant/components/schlage/strings.json
@@ -31,20 +31,6 @@
         "name": "Keypad disabled"
       }
     },
-    "select": {
-      "auto_lock_time": {
-        "name": "Auto-Lock time",
-        "state": {
-          "0": "Disabled",
-          "15": "15 seconds",
-          "30": "30 seconds",
-          "60": "1 minute",
-          "120": "2 minutes",
-          "240": "4 minutes",
-          "300": "5 minutes"
-        }
-      }
-    },
     "switch": {
       "beeper": {
         "name": "Keypress Beep"
diff --git a/homeassistant/components/scrape/__init__.py b/homeassistant/components/scrape/__init__.py
index ff991c5f348..16220d5c567 100644
--- a/homeassistant/components/scrape/__init__.py
+++ b/homeassistant/components/scrape/__init__.py
@@ -72,7 +72,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         scan_interval: timedelta = resource_config.get(
             CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
         )
-        coordinator = ScrapeCoordinator(hass, None, rest, scan_interval)
+        coordinator = ScrapeCoordinator(hass, rest, scan_interval)
 
         sensors: list[ConfigType] = resource_config.get(SENSOR_DOMAIN, [])
         if sensors:
@@ -100,7 +100,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ScrapeConfigEntry) -> bo
 
     coordinator = ScrapeCoordinator(
         hass,
-        entry,
         rest,
         DEFAULT_SCAN_INTERVAL,
     )
diff --git a/homeassistant/components/scrape/coordinator.py b/homeassistant/components/scrape/coordinator.py
index b5cabc6b94e..74fd510ac94 100644
--- a/homeassistant/components/scrape/coordinator.py
+++ b/homeassistant/components/scrape/coordinator.py
@@ -8,7 +8,6 @@ import logging
 from bs4 import BeautifulSoup
 
 from homeassistant.components.rest import RestData
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -19,17 +18,12 @@ class ScrapeCoordinator(DataUpdateCoordinator[BeautifulSoup]):
     """Scrape Coordinator."""
 
     def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: ConfigEntry | None,
-        rest: RestData,
-        update_interval: timedelta,
+        self, hass: HomeAssistant, rest: RestData, update_interval: timedelta
     ) -> None:
         """Initialize Scrape coordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=config_entry,
             name="Scrape Coordinator",
             update_interval=update_interval,
         )
diff --git a/homeassistant/components/screenlogic/config_flow.py b/homeassistant/components/screenlogic/config_flow.py
index 19db89dc03d..4a46756cf2f 100644
--- a/homeassistant/components/screenlogic/config_flow.py
+++ b/homeassistant/components/screenlogic/config_flow.py
@@ -81,7 +81,7 @@ class ScreenlogicConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> ScreenLogicOptionsFlowHandler:
         """Get the options flow for ScreenLogic."""
-        return ScreenLogicOptionsFlowHandler()
+        return ScreenLogicOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -192,6 +192,10 @@ class ScreenlogicConfigFlow(ConfigFlow, domain=DOMAIN):
 class ScreenLogicOptionsFlowHandler(OptionsFlow):
     """Handles the options for the ScreenLogic integration."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Init the screen logic options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(self, user_input=None) -> ConfigFlowResult:
         """Manage the options."""
         if user_input is not None:
diff --git a/homeassistant/components/sense/__init__.py b/homeassistant/components/sense/__init__.py
index e919d48e96d..58e993ad6e0 100644
--- a/homeassistant/components/sense/__init__.py
+++ b/homeassistant/components/sense/__init__.py
@@ -1,8 +1,10 @@
 """Support for monitoring a Sense energy sensor."""
 
 from dataclasses import dataclass
+from datetime import timedelta
 from functools import partial
 import logging
+from typing import Any
 
 from sense_energy import (
     ASyncSenseable,
@@ -11,18 +13,26 @@ from sense_energy import (
 )
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_TIMEOUT, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.const import (
+    CONF_EMAIL,
+    CONF_TIMEOUT,
+    EVENT_HOMEASSISTANT_STOP,
+    Platform,
+)
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import (
     ACTIVE_UPDATE_RATE,
     SENSE_CONNECT_EXCEPTIONS,
+    SENSE_DEVICE_UPDATE,
     SENSE_TIMEOUT_EXCEPTIONS,
     SENSE_WEBSOCKET_EXCEPTIONS,
 )
-from .coordinator import SenseRealtimeCoordinator, SenseTrendCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,19 +40,37 @@ PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 type SenseConfigEntry = ConfigEntry[SenseData]
 
 
+class SenseDevicesData:
+    """Data for each sense device."""
+
+    def __init__(self):
+        """Create."""
+        self._data_by_device = {}
+
+    def set_devices_data(self, devices):
+        """Store a device update."""
+        self._data_by_device = {device["id"]: device for device in devices}
+
+    def get_device_by_id(self, sense_device_id):
+        """Get the latest device data."""
+        return self._data_by_device.get(sense_device_id)
+
+
 @dataclass(kw_only=True, slots=True)
 class SenseData:
     """Sense data type."""
 
     data: ASyncSenseable
-    trends: SenseTrendCoordinator
-    rt: SenseRealtimeCoordinator
+    device_data: SenseDevicesData
+    trends: DataUpdateCoordinator[None]
+    discovered: list[dict[str, Any]]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: SenseConfigEntry) -> bool:
     """Set up Sense from a config entry."""
 
     entry_data = entry.data
+    email = entry_data[CONF_EMAIL]
     timeout = entry_data[CONF_TIMEOUT]
 
     access_token = entry_data.get("access_token", "")
@@ -80,7 +108,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: SenseConfigEntry) -> boo
         raise ConfigEntryNotReady(str(err)) from err
 
     try:
-        await gateway.fetch_devices()
+        sense_discovered_devices = await gateway.get_discovered_device_data()
         await gateway.update_realtime()
     except SENSE_TIMEOUT_EXCEPTIONS as err:
         raise ConfigEntryNotReady(
@@ -89,8 +117,26 @@ async def async_setup_entry(hass: HomeAssistant, entry: SenseConfigEntry) -> boo
     except SENSE_WEBSOCKET_EXCEPTIONS as err:
         raise ConfigEntryNotReady(str(err) or "Error during realtime update") from err
 
-    trends_coordinator = SenseTrendCoordinator(hass, gateway)
-    realtime_coordinator = SenseRealtimeCoordinator(hass, gateway)
+    async def _async_update_trend():
+        """Update the trend data."""
+        try:
+            await gateway.update_trend_data()
+        except (SenseAuthenticationException, SenseMFARequiredException) as err:
+            _LOGGER.warning("Sense authentication expired")
+            raise ConfigEntryAuthFailed(err) from err
+        except SENSE_CONNECT_EXCEPTIONS as err:
+            raise UpdateFailed(err) from err
+
+    trends_coordinator: DataUpdateCoordinator[None] = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        name=f"Sense Trends {email}",
+        update_method=_async_update_trend,
+        update_interval=timedelta(seconds=300),
+    )
+    # Start out as unavailable so we do not report 0 data
+    # until the update happens
+    trends_coordinator.last_update_success = False
 
     # This can take longer than 60s and we already know
     # sense is online since get_discovered_device_data was
@@ -100,19 +146,45 @@ async def async_setup_entry(hass: HomeAssistant, entry: SenseConfigEntry) -> boo
         trends_coordinator.async_request_refresh(),
         "sense.trends-coordinator-refresh",
     )
-    entry.async_create_background_task(
-        hass,
-        realtime_coordinator.async_request_refresh(),
-        "sense.realtime-coordinator-refresh",
-    )
 
     entry.runtime_data = SenseData(
         data=gateway,
+        device_data=SenseDevicesData(),
         trends=trends_coordinator,
-        rt=realtime_coordinator,
+        discovered=sense_discovered_devices,
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    async def async_sense_update(_):
+        """Retrieve latest state."""
+        try:
+            await gateway.update_realtime()
+        except SENSE_TIMEOUT_EXCEPTIONS as ex:
+            _LOGGER.error("Timeout retrieving data: %s", ex)
+        except SENSE_WEBSOCKET_EXCEPTIONS as ex:
+            _LOGGER.error("Failed to update data: %s", ex)
+
+        data = gateway.get_realtime()
+        if "devices" in data:
+            entry.runtime_data.device_data.set_devices_data(data["devices"])
+        async_dispatcher_send(hass, f"{SENSE_DEVICE_UPDATE}-{gateway.sense_monitor_id}")
+
+    remove_update_callback = async_track_time_interval(
+        hass, async_sense_update, timedelta(seconds=ACTIVE_UPDATE_RATE)
+    )
+
+    @callback
+    def _remove_update_callback_at_stop(event):
+        remove_update_callback()
+
+    entry.async_on_unload(remove_update_callback)
+    entry.async_on_unload(
+        hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STOP, _remove_update_callback_at_stop
+        )
+    )
+
     return True
 
 
diff --git a/homeassistant/components/sense/binary_sensor.py b/homeassistant/components/sense/binary_sensor.py
index d06b3a62937..8317f8458b3 100644
--- a/homeassistant/components/sense/binary_sensor.py
+++ b/homeassistant/components/sense/binary_sensor.py
@@ -2,20 +2,17 @@
 
 import logging
 
-from sense_energy.sense_api import SenseDevice
-
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import SenseConfigEntry
-from .const import DOMAIN
-from .coordinator import SenseRealtimeCoordinator
-from .entity import SenseDeviceEntity
+from .const import ATTRIBUTION, DOMAIN, MDI_ICONS, SENSE_DEVICE_UPDATE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,11 +24,13 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Sense binary sensor."""
     sense_monitor_id = config_entry.runtime_data.data.sense_monitor_id
-    realtime_coordinator = config_entry.runtime_data.rt
 
+    sense_devices = config_entry.runtime_data.discovered
+    device_data = config_entry.runtime_data.device_data
     devices = [
-        SenseBinarySensor(device, realtime_coordinator, sense_monitor_id)
-        for device in config_entry.runtime_data.data.devices
+        SenseDevice(device_data, device, sense_monitor_id)
+        for device in sense_devices
+        if device["tags"]["DeviceListAllowed"] == "true"
     ]
 
     await _migrate_old_unique_ids(hass, devices)
@@ -39,46 +38,65 @@ async def async_setup_entry(
     async_add_entities(devices)
 
 
-class SenseBinarySensor(SenseDeviceEntity, BinarySensorEntity):
-    """Implementation of a Sense energy device binary sensor."""
-
-    _attr_device_class = BinarySensorDeviceClass.POWER
-
-    def __init__(
-        self,
-        device: SenseDevice,
-        coordinator: SenseRealtimeCoordinator,
-        sense_monitor_id: str,
-    ) -> None:
-        """Initialize the Sense binary sensor."""
-        super().__init__(device, coordinator, sense_monitor_id, device.id)
-        self._id = device.id
-
-    @property
-    def old_unique_id(self) -> str:
-        """Return the old not so unique id of the binary sensor."""
-        return self._id
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the sensor."""
-        return self._device.is_on
-
-
-async def _migrate_old_unique_ids(
-    hass: HomeAssistant, devices: list[SenseBinarySensor]
-) -> None:
+async def _migrate_old_unique_ids(hass, devices):
     registry = er.async_get(hass)
     for device in devices:
         # Migration of old not so unique ids
         old_entity_id = registry.async_get_entity_id(
             "binary_sensor", DOMAIN, device.old_unique_id
         )
-        updated_id = device.unique_id
-        if old_entity_id is not None and updated_id is not None:
+        if old_entity_id is not None:
             _LOGGER.debug(
                 "Migrating unique_id from [%s] to [%s]",
                 device.old_unique_id,
                 device.unique_id,
             )
-            registry.async_update_entity(old_entity_id, new_unique_id=updated_id)
+            registry.async_update_entity(old_entity_id, new_unique_id=device.unique_id)
+
+
+def sense_to_mdi(sense_icon):
+    """Convert sense icon to mdi icon."""
+    return f"mdi:{MDI_ICONS.get(sense_icon, "power-plug")}"
+
+
+class SenseDevice(BinarySensorEntity):
+    """Implementation of a Sense energy device binary sensor."""
+
+    _attr_attribution = ATTRIBUTION
+    _attr_should_poll = False
+    _attr_available = False
+    _attr_device_class = BinarySensorDeviceClass.POWER
+
+    def __init__(self, sense_devices_data, device, sense_monitor_id):
+        """Initialize the Sense binary sensor."""
+        self._attr_name = device["name"]
+        self._id = device["id"]
+        self._sense_monitor_id = sense_monitor_id
+        self._attr_unique_id = f"{sense_monitor_id}-{self._id}"
+        self._attr_icon = sense_to_mdi(device["icon"])
+        self._sense_devices_data = sense_devices_data
+
+    @property
+    def old_unique_id(self):
+        """Return the old not so unique id of the binary sensor."""
+        return self._id
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{SENSE_DEVICE_UPDATE}-{self._sense_monitor_id}",
+                self._async_update_from_data,
+            )
+        )
+
+    @callback
+    def _async_update_from_data(self):
+        """Get the latest data, update state. Must not do I/O."""
+        new_state = bool(self._sense_devices_data.get_device_by_id(self._id))
+        if self._attr_available and self._attr_is_on == new_state:
+            return
+        self._attr_available = True
+        self._attr_is_on = new_state
+        self.async_write_ha_state()
diff --git a/homeassistant/components/sense/const.py b/homeassistant/components/sense/const.py
index b23117c977d..5e944c18d8d 100644
--- a/homeassistant/components/sense/const.py
+++ b/homeassistant/components/sense/const.py
@@ -11,7 +11,6 @@ from sense_energy import (
 DOMAIN = "sense"
 DEFAULT_TIMEOUT = 30
 ACTIVE_UPDATE_RATE = 60
-TREND_UPDATE_RATE = 300
 DEFAULT_NAME = "Sense"
 SENSE_DEVICE_UPDATE = "sense_devices_update"
 
@@ -20,7 +19,7 @@ ACTIVE_TYPE = "active"
 
 ATTRIBUTION = "Data provided by Sense.com"
 
-CONSUMPTION_NAME = "Energy"
+CONSUMPTION_NAME = "Usage"
 CONSUMPTION_ID = "usage"
 PRODUCTION_NAME = "Production"
 PRODUCTION_ID = "production"
diff --git a/homeassistant/components/sense/coordinator.py b/homeassistant/components/sense/coordinator.py
deleted file mode 100644
index c0029cd79ea..00000000000
--- a/homeassistant/components/sense/coordinator.py
+++ /dev/null
@@ -1,76 +0,0 @@
-"""Sense Coordinators."""
-
-from datetime import timedelta
-import logging
-
-from sense_energy import (
-    ASyncSenseable,
-    SenseAuthenticationException,
-    SenseMFARequiredException,
-)
-
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import (
-    ACTIVE_UPDATE_RATE,
-    SENSE_CONNECT_EXCEPTIONS,
-    SENSE_TIMEOUT_EXCEPTIONS,
-    SENSE_WEBSOCKET_EXCEPTIONS,
-    TREND_UPDATE_RATE,
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class SenseCoordinator(DataUpdateCoordinator[None]):
-    """Sense Trend Coordinator."""
-
-    def __init__(
-        self, hass: HomeAssistant, gateway: ASyncSenseable, name: str, update: int
-    ) -> None:
-        """Initialize."""
-        super().__init__(
-            hass,
-            logger=_LOGGER,
-            name=f"Sense {name} {gateway.sense_monitor_id}",
-            update_interval=timedelta(seconds=update),
-        )
-        self._gateway = gateway
-        self.last_update_success = False
-
-
-class SenseTrendCoordinator(SenseCoordinator):
-    """Sense Trend Coordinator."""
-
-    def __init__(self, hass: HomeAssistant, gateway: ASyncSenseable) -> None:
-        """Initialize."""
-        super().__init__(hass, gateway, "Trends", TREND_UPDATE_RATE)
-
-    async def _async_update_data(self) -> None:
-        """Update the trend data."""
-        try:
-            await self._gateway.update_trend_data()
-        except (SenseAuthenticationException, SenseMFARequiredException) as err:
-            _LOGGER.warning("Sense authentication expired")
-            raise ConfigEntryAuthFailed(err) from err
-        except SENSE_CONNECT_EXCEPTIONS as err:
-            raise UpdateFailed(err) from err
-
-
-class SenseRealtimeCoordinator(SenseCoordinator):
-    """Sense Realtime Coordinator."""
-
-    def __init__(self, hass: HomeAssistant, gateway: ASyncSenseable) -> None:
-        """Initialize."""
-        super().__init__(hass, gateway, "Realtime", ACTIVE_UPDATE_RATE)
-
-    async def _async_update_data(self) -> None:
-        """Retrieve latest state."""
-        try:
-            await self._gateway.update_realtime()
-        except SENSE_TIMEOUT_EXCEPTIONS as ex:
-            _LOGGER.error("Timeout retrieving data: %s", ex)
-        except SENSE_WEBSOCKET_EXCEPTIONS as ex:
-            _LOGGER.error("Failed to update data: %s", ex)
diff --git a/homeassistant/components/sense/entity.py b/homeassistant/components/sense/entity.py
deleted file mode 100644
index 248be53ceb7..00000000000
--- a/homeassistant/components/sense/entity.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""Base entities for Sense energy."""
-
-from sense_energy import ASyncSenseable
-from sense_energy.sense_api import SenseDevice
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import ATTRIBUTION, DOMAIN, MDI_ICONS
-from .coordinator import SenseCoordinator
-
-
-def sense_to_mdi(sense_icon: str) -> str:
-    """Convert sense icon to mdi icon."""
-    return f"mdi:{MDI_ICONS.get(sense_icon, "power-plug")}"
-
-
-class SenseEntity(CoordinatorEntity[SenseCoordinator]):
-    """Base implementation of a Sense sensor."""
-
-    _attr_attribution = ATTRIBUTION
-    _attr_should_poll = False
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        gateway: ASyncSenseable,
-        coordinator: SenseCoordinator,
-        sense_monitor_id: str,
-        unique_id: str,
-    ) -> None:
-        """Initialize the Sense sensor."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{sense_monitor_id}-{unique_id}"
-        self._gateway = gateway
-        self._attr_device_info = DeviceInfo(
-            name=f"Sense {sense_monitor_id}",
-            identifiers={(DOMAIN, sense_monitor_id)},
-            model="Sense",
-            manufacturer="Sense Labs, Inc.",
-            configuration_url="https://home.sense.com",
-        )
-
-
-class SenseDeviceEntity(CoordinatorEntity[SenseCoordinator]):
-    """Base implementation of a Sense sensor."""
-
-    _attr_attribution = ATTRIBUTION
-    _attr_should_poll = False
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        device: SenseDevice,
-        coordinator: SenseCoordinator,
-        sense_monitor_id: str,
-        unique_id: str,
-    ) -> None:
-        """Initialize the Sense sensor."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{sense_monitor_id}-{unique_id}"
-        self._device = device
-        self._attr_icon = sense_to_mdi(device.icon)
-        self._attr_device_info = DeviceInfo(
-            name=device.name,
-            identifiers={(DOMAIN, f"{sense_monitor_id}:{device.id}")},
-            model="Sense",
-            manufacturer="Sense Labs, Inc.",
-            configuration_url="https://home.sense.com",
-            via_device=(DOMAIN, sense_monitor_id),
-        )
diff --git a/homeassistant/components/sense/manifest.json b/homeassistant/components/sense/manifest.json
index df2317c3a6c..116b714ba82 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.13.3"]
+  "requirements": ["sense-energy==0.12.4"]
 }
diff --git a/homeassistant/components/sense/sensor.py b/homeassistant/components/sense/sensor.py
index 2f5c82675d5..bc9dd470f5e 100644
--- a/homeassistant/components/sense/sensor.py
+++ b/homeassistant/components/sense/sensor.py
@@ -1,10 +1,5 @@
 """Support for monitoring a Sense energy sensor."""
 
-from datetime import datetime
-
-from sense_energy import ASyncSenseable, Scale
-from sense_energy.sense_api import SenseDevice
-
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
@@ -16,37 +11,55 @@ from homeassistant.const import (
     UnitOfEnergy,
     UnitOfPower,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import SenseConfigEntry
 from .const import (
+    ACTIVE_NAME,
     ACTIVE_TYPE,
+    ATTRIBUTION,
     CONSUMPTION_ID,
     CONSUMPTION_NAME,
+    DOMAIN,
     FROM_GRID_ID,
     FROM_GRID_NAME,
+    MDI_ICONS,
     NET_PRODUCTION_ID,
     NET_PRODUCTION_NAME,
     PRODUCTION_ID,
     PRODUCTION_NAME,
     PRODUCTION_PCT_ID,
     PRODUCTION_PCT_NAME,
+    SENSE_DEVICE_UPDATE,
     SOLAR_POWERED_ID,
     SOLAR_POWERED_NAME,
     TO_GRID_ID,
     TO_GRID_NAME,
 )
-from .coordinator import SenseRealtimeCoordinator, SenseTrendCoordinator
-from .entity import SenseDeviceEntity, SenseEntity
+
+
+class SensorConfig:
+    """Data structure holding sensor configuration."""
+
+    def __init__(self, name, sensor_type):
+        """Sensor name and type to pass to API."""
+        self.name = name
+        self.sensor_type = sensor_type
+
+
+# Sensor types/ranges
+ACTIVE_SENSOR_TYPE = SensorConfig(ACTIVE_NAME, ACTIVE_TYPE)
 
 # Sensor types/ranges
 TRENDS_SENSOR_TYPES = {
-    Scale.DAY: "Daily",
-    Scale.WEEK: "Weekly",
-    Scale.MONTH: "Monthly",
-    Scale.YEAR: "Yearly",
-    Scale.CYCLE: "Bill",
+    "daily": SensorConfig("Daily", "DAY"),
+    "weekly": SensorConfig("Weekly", "WEEK"),
+    "monthly": SensorConfig("Monthly", "MONTH"),
+    "yearly": SensorConfig("Yearly", "YEAR"),
 }
 
 # Production/consumption variants
@@ -63,6 +76,11 @@ TREND_SENSOR_VARIANTS = [
 ]
 
 
+def sense_to_mdi(sense_icon):
+    """Convert sense icon to mdi icon."""
+    return f"mdi:{MDI_ICONS.get(sense_icon, 'power-plug')}"
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: SenseConfigEntry,
@@ -71,46 +89,58 @@ async def async_setup_entry(
     """Set up the Sense sensor."""
     data = config_entry.runtime_data.data
     trends_coordinator = config_entry.runtime_data.trends
-    realtime_coordinator = config_entry.runtime_data.rt
 
     # Request only in case it takes longer
     # than 60s
     await trends_coordinator.async_request_refresh()
 
     sense_monitor_id = data.sense_monitor_id
+    sense_devices = config_entry.runtime_data.discovered
+    device_data = config_entry.runtime_data.device_data
 
-    entities: list[SensorEntity] = []
-
-    for device in config_entry.runtime_data.data.devices:
-        entities.append(
-            SenseDevicePowerSensor(device, sense_monitor_id, realtime_coordinator)
-        )
-        entities.extend(
-            SenseDeviceEnergySensor(device, scale, trends_coordinator, sense_monitor_id)
-            for scale in Scale
-        )
+    entities: list[SensorEntity] = [
+        SenseEnergyDevice(device_data, device, sense_monitor_id)
+        for device in sense_devices
+        if device["tags"]["DeviceListAllowed"] == "true"
+    ]
 
     for variant_id, variant_name in SENSOR_VARIANTS:
+        name = ACTIVE_SENSOR_TYPE.name
+        sensor_type = ACTIVE_SENSOR_TYPE.sensor_type
+
+        unique_id = f"{sense_monitor_id}-active-{variant_id}"
         entities.append(
-            SensePowerSensor(
-                data, sense_monitor_id, variant_id, variant_name, realtime_coordinator
+            SenseActiveSensor(
+                data,
+                name,
+                sensor_type,
+                sense_monitor_id,
+                variant_id,
+                variant_name,
+                unique_id,
             )
         )
 
     entities.extend(
-        SenseVoltageSensor(data, i, sense_monitor_id, realtime_coordinator)
+        SenseVoltageSensor(data, i, sense_monitor_id)
         for i in range(len(data.active_voltage))
     )
 
-    for scale in Scale:
+    for type_id, typ in TRENDS_SENSOR_TYPES.items():
         for variant_id, variant_name in TREND_SENSOR_VARIANTS:
+            name = typ.name
+            sensor_type = typ.sensor_type
+
+            unique_id = f"{sense_monitor_id}-{type_id}-{variant_id}"
             entities.append(
                 SenseTrendsSensor(
                     data,
-                    scale,
+                    name,
+                    sensor_type,
                     variant_id,
                     variant_name,
                     trends_coordinator,
+                    unique_id,
                     sense_monitor_id,
                 )
             )
@@ -118,89 +148,131 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class SensePowerSensor(SenseEntity, SensorEntity):
+class SenseActiveSensor(SensorEntity):
     """Implementation of a Sense energy sensor."""
 
     _attr_device_class = SensorDeviceClass.POWER
     _attr_native_unit_of_measurement = UnitOfPower.WATT
+    _attr_attribution = ATTRIBUTION
+    _attr_should_poll = False
+    _attr_available = False
     _attr_state_class = SensorStateClass.MEASUREMENT
 
     def __init__(
         self,
-        gateway: ASyncSenseable,
-        sense_monitor_id: str,
-        variant_id: str,
-        variant_name: str,
-        realtime_coordinator: SenseRealtimeCoordinator,
-    ) -> None:
+        data,
+        name,
+        sensor_type,
+        sense_monitor_id,
+        variant_id,
+        variant_name,
+        unique_id,
+    ):
         """Initialize the Sense sensor."""
-        super().__init__(
-            gateway,
-            realtime_coordinator,
-            sense_monitor_id,
-            f"{ACTIVE_TYPE}-{variant_id}",
-        )
-        self._attr_name = variant_name
+        self._attr_name = f"{name} {variant_name}"
+        self._attr_unique_id = unique_id
+        self._data = data
+        self._sense_monitor_id = sense_monitor_id
+        self._sensor_type = sensor_type
         self._variant_id = variant_id
+        self._variant_name = variant_name
 
-    @property
-    def native_value(self) -> float:
-        """Return the state of the sensor."""
-        return round(
-            self._gateway.active_solar_power
-            if self._variant_id == PRODUCTION_ID
-            else self._gateway.active_power
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{SENSE_DEVICE_UPDATE}-{self._sense_monitor_id}",
+                self._async_update_from_data,
+            )
         )
 
+    @callback
+    def _async_update_from_data(self):
+        """Update the sensor from the data. Must not do I/O."""
+        new_state = round(
+            self._data.active_solar_power
+            if self._variant_id == PRODUCTION_ID
+            else self._data.active_power
+        )
+        if self._attr_available and self._attr_native_value == new_state:
+            return
+        self._attr_native_value = new_state
+        self._attr_available = True
+        self.async_write_ha_state()
 
-class SenseVoltageSensor(SenseEntity, SensorEntity):
+
+class SenseVoltageSensor(SensorEntity):
     """Implementation of a Sense energy voltage sensor."""
 
     _attr_device_class = SensorDeviceClass.VOLTAGE
     _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_native_unit_of_measurement = UnitOfElectricPotential.VOLT
+    _attr_attribution = ATTRIBUTION
+    _attr_should_poll = False
+    _attr_available = False
 
     def __init__(
         self,
-        gateway: ASyncSenseable,
-        index: int,
-        sense_monitor_id: str,
-        realtime_coordinator: SenseRealtimeCoordinator,
-    ) -> None:
+        data,
+        index,
+        sense_monitor_id,
+    ):
         """Initialize the Sense sensor."""
-        super().__init__(
-            gateway, realtime_coordinator, sense_monitor_id, f"L{index + 1}"
-        )
-        self._attr_name = f"L{index + 1} Voltage"
+        line_num = index + 1
+        self._attr_name = f"L{line_num} Voltage"
+        self._attr_unique_id = f"{sense_monitor_id}-L{line_num}"
+        self._data = data
+        self._sense_monitor_id = sense_monitor_id
         self._voltage_index = index
 
-    @property
-    def native_value(self) -> float:
-        """Return the state of the sensor."""
-        return round(self._gateway.active_voltage[self._voltage_index], 1)
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{SENSE_DEVICE_UPDATE}-{self._sense_monitor_id}",
+                self._async_update_from_data,
+            )
+        )
+
+    @callback
+    def _async_update_from_data(self):
+        """Update the sensor from the data. Must not do I/O."""
+        new_state = round(self._data.active_voltage[self._voltage_index], 1)
+        if self._attr_available and self._attr_native_value == new_state:
+            return
+        self._attr_available = True
+        self._attr_native_value = new_state
+        self.async_write_ha_state()
 
 
-class SenseTrendsSensor(SenseEntity, SensorEntity):
+class SenseTrendsSensor(CoordinatorEntity, SensorEntity):
     """Implementation of a Sense energy sensor."""
 
+    _attr_device_class = SensorDeviceClass.ENERGY
+    _attr_state_class = SensorStateClass.TOTAL
+    _attr_native_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR
+    _attr_attribution = ATTRIBUTION
+    _attr_should_poll = False
+
     def __init__(
         self,
-        gateway: ASyncSenseable,
-        scale: Scale,
-        variant_id: str,
-        variant_name: str,
-        trends_coordinator: SenseTrendCoordinator,
-        sense_monitor_id: str,
-    ) -> None:
+        data,
+        name,
+        sensor_type,
+        variant_id,
+        variant_name,
+        trends_coordinator,
+        unique_id,
+        sense_monitor_id,
+    ):
         """Initialize the Sense sensor."""
-        super().__init__(
-            gateway,
-            trends_coordinator,
-            sense_monitor_id,
-            f"{TRENDS_SENSOR_TYPES[scale].lower()}-{variant_id}",
-        )
-        self._attr_name = f"{TRENDS_SENSOR_TYPES[scale]} {variant_name}"
-        self._scale = scale
+        super().__init__(trends_coordinator)
+        self._attr_name = f"{name} {variant_name}"
+        self._attr_unique_id = unique_id
+        self._data = data
+        self._sensor_type = sensor_type
         self._variant_id = variant_id
         self._had_any_update = False
         if variant_id in [PRODUCTION_PCT_ID, SOLAR_POWERED_ID]:
@@ -208,75 +280,66 @@ class SenseTrendsSensor(SenseEntity, SensorEntity):
             self._attr_entity_registry_enabled_default = False
             self._attr_state_class = None
             self._attr_device_class = None
-        else:
-            self._attr_device_class = SensorDeviceClass.ENERGY
-            self._attr_state_class = SensorStateClass.TOTAL
-            self._attr_native_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR
+        self._attr_device_info = DeviceInfo(
+            name=f"Sense {sense_monitor_id}",
+            identifiers={(DOMAIN, sense_monitor_id)},
+            model="Sense",
+            manufacturer="Sense Labs, Inc.",
+            configuration_url="https://home.sense.com",
+        )
 
     @property
-    def native_value(self) -> float:
+    def native_value(self):
         """Return the state of the sensor."""
-        return round(self._gateway.get_stat(self._scale, self._variant_id), 1)
+        return round(self._data.get_trend(self._sensor_type, self._variant_id), 1)
 
     @property
-    def last_reset(self) -> datetime | None:
+    def last_reset(self):
         """Return the time when the sensor was last reset, if any."""
         if self._attr_state_class == SensorStateClass.TOTAL:
-            return self._gateway.trend_start(self._scale)
+            return self._data.trend_start(self._sensor_type)
         return None
 
 
-class SenseDevicePowerSensor(SenseDeviceEntity, SensorEntity):
+class SenseEnergyDevice(SensorEntity):
     """Implementation of a Sense energy device."""
 
+    _attr_available = False
     _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_native_unit_of_measurement = UnitOfPower.WATT
+    _attr_attribution = ATTRIBUTION
     _attr_device_class = SensorDeviceClass.POWER
+    _attr_should_poll = False
 
-    def __init__(
-        self,
-        device: SenseDevice,
-        sense_monitor_id: str,
-        coordinator: SenseRealtimeCoordinator,
-    ) -> None:
-        """Initialize the Sense device sensor."""
-        super().__init__(
-            device, coordinator, sense_monitor_id, f"{device.id}-{CONSUMPTION_ID}"
+    def __init__(self, sense_devices_data, device, sense_monitor_id):
+        """Initialize the Sense binary sensor."""
+        self._attr_name = f"{device['name']} {CONSUMPTION_NAME}"
+        self._id = device["id"]
+        self._sense_monitor_id = sense_monitor_id
+        self._attr_unique_id = f"{sense_monitor_id}-{self._id}-{CONSUMPTION_ID}"
+        self._attr_icon = sense_to_mdi(device["icon"])
+        self._sense_devices_data = sense_devices_data
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{SENSE_DEVICE_UPDATE}-{self._sense_monitor_id}",
+                self._async_update_from_data,
+            )
         )
 
-    @property
-    def native_value(self) -> float:
-        """Return the state of the sensor."""
-        return self._device.power_w
-
-
-class SenseDeviceEnergySensor(SenseDeviceEntity, SensorEntity):
-    """Implementation of a Sense device energy sensor."""
-
-    _attr_native_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR
-    _attr_state_class = SensorStateClass.TOTAL_INCREASING
-    _attr_device_class = SensorDeviceClass.ENERGY
-
-    def __init__(
-        self,
-        device: SenseDevice,
-        scale: Scale,
-        coordinator: SenseTrendCoordinator,
-        sense_monitor_id: str,
-    ) -> None:
-        """Initialize the Sense device sensor."""
-        super().__init__(
-            device,
-            coordinator,
-            sense_monitor_id,
-            f"{device.id}-{TRENDS_SENSOR_TYPES[scale].lower()}-energy",
-        )
-        self._attr_translation_key = f"{TRENDS_SENSOR_TYPES[scale].lower()}_energy"
-        self._attr_suggested_display_precision = 2
-        self._scale = scale
-        self._device = device
-
-    @property
-    def native_value(self) -> float:
-        """Return the state of the sensor."""
-        return self._device.energy_kwh[self._scale]
+    @callback
+    def _async_update_from_data(self):
+        """Get the latest data, update state. Must not do I/O."""
+        device_data = self._sense_devices_data.get_device_by_id(self._id)
+        if not device_data or "w" not in device_data:
+            new_state = 0
+        else:
+            new_state = int(device_data["w"])
+        if self._attr_available and self._attr_native_value == new_state:
+            return
+        self._attr_native_value = new_state
+        self._attr_available = True
+        self.async_write_ha_state()
diff --git a/homeassistant/components/sense/strings.json b/homeassistant/components/sense/strings.json
index 4579c84f050..a519155bee1 100644
--- a/homeassistant/components/sense/strings.json
+++ b/homeassistant/components/sense/strings.json
@@ -32,24 +32,5 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
-  },
-  "entity": {
-    "sensor": {
-      "daily_energy": {
-        "name": "Daily energy"
-      },
-      "weekly_energy": {
-        "name": "Weekly energy"
-      },
-      "monthly_energy": {
-        "name": "Monthly energy"
-      },
-      "yearly_energy": {
-        "name": "Yearly energy"
-      },
-      "bill_energy": {
-        "name": "Bill energy"
-      }
-    }
   }
 }
diff --git a/homeassistant/components/sensibo/config_flow.py b/homeassistant/components/sensibo/config_flow.py
index b8b1029f141..926e8216196 100644
--- a/homeassistant/components/sensibo/config_flow.py
+++ b/homeassistant/components/sensibo/config_flow.py
@@ -10,7 +10,6 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY
-from homeassistant.core import HomeAssistant
 from homeassistant.helpers.selector import TextSelector
 
 from .const import DEFAULT_NAME, DOMAIN
@@ -23,25 +22,6 @@ DATA_SCHEMA = vol.Schema(
 )
 
 
-async def validate_api(
-    hass: HomeAssistant, api_key: str
-) -> tuple[str | None, dict[str, str]]:
-    """Validate the API key."""
-    errors: dict[str, str] = {}
-    username: str | None = None
-    try:
-        username = await async_validate_api(hass, api_key)
-    except AuthenticationError:
-        errors["base"] = "invalid_auth"
-    except ConnectionError:
-        errors["base"] = "cannot_connect"
-    except NoDevicesError:
-        errors["base"] = "no_devices"
-    except NoUsernameError:
-        errors["base"] = "no_username"
-    return (username, errors)
-
-
 class SensiboConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Sensibo integration."""
 
@@ -61,8 +41,17 @@ class SensiboConfigFlow(ConfigFlow, domain=DOMAIN):
 
         if user_input:
             api_key = user_input[CONF_API_KEY]
-            username, errors = await validate_api(self.hass, api_key)
-            if username:
+            try:
+                username = await async_validate_api(self.hass, api_key)
+            except AuthenticationError:
+                errors["base"] = "invalid_auth"
+            except ConnectionError:
+                errors["base"] = "cannot_connect"
+            except NoDevicesError:
+                errors["base"] = "no_devices"
+            except NoUsernameError:
+                errors["base"] = "no_username"
+            else:
                 reauth_entry = self._get_reauth_entry()
                 if username == reauth_entry.unique_id:
                     return self.async_update_reload_and_abort(
@@ -79,32 +68,6 @@ class SensiboConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Reconfigure Sensibo."""
-        errors: dict[str, str] = {}
-
-        if user_input:
-            api_key = user_input[CONF_API_KEY]
-            username, errors = await validate_api(self.hass, api_key)
-            if username:
-                reconfigure_entry = self._get_reconfigure_entry()
-                if username == reconfigure_entry.unique_id:
-                    return self.async_update_reload_and_abort(
-                        reconfigure_entry,
-                        data_updates={
-                            CONF_API_KEY: api_key,
-                        },
-                    )
-                errors["base"] = "incorrect_api_key"
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=DATA_SCHEMA,
-            errors=errors,
-        )
-
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -114,8 +77,17 @@ class SensiboConfigFlow(ConfigFlow, domain=DOMAIN):
 
         if user_input:
             api_key = user_input[CONF_API_KEY]
-            username, errors = await validate_api(self.hass, api_key)
-            if username:
+            try:
+                username = await async_validate_api(self.hass, api_key)
+            except AuthenticationError:
+                errors["base"] = "invalid_auth"
+            except ConnectionError:
+                errors["base"] = "cannot_connect"
+            except NoDevicesError:
+                errors["base"] = "no_devices"
+            except NoUsernameError:
+                errors["base"] = "no_username"
+            else:
                 await self.async_set_unique_id(username)
                 self._abort_if_unique_id_configured()
 
diff --git a/homeassistant/components/sensibo/strings.json b/homeassistant/components/sensibo/strings.json
index bec402bee18..60a32028017 100644
--- a/homeassistant/components/sensibo/strings.json
+++ b/homeassistant/components/sensibo/strings.json
@@ -2,8 +2,7 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -28,14 +27,6 @@
         "data_description": {
           "api_key": "[%key:component::sensibo::config::step::user::data_description::api_key%]"
         }
-      },
-      "reconfigure": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]"
-        },
-        "data_description": {
-          "api_key": "[%key:component::sensibo::config::step::user::data_description::api_key%]"
-        }
       }
     }
   },
diff --git a/homeassistant/components/sensor/const.py b/homeassistant/components/sensor/const.py
index f4573f873a2..da0b48a23a0 100644
--- a/homeassistant/components/sensor/const.py
+++ b/homeassistant/components/sensor/const.py
@@ -17,7 +17,6 @@ from homeassistant.const import (
     SIGNAL_STRENGTH_DECIBELS,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     UnitOfApparentPower,
-    UnitOfBloodGlucoseConcentration,
     UnitOfConductivity,
     UnitOfDataRate,
     UnitOfElectricCurrent,
@@ -48,7 +47,6 @@ from homeassistant.helpers.deprecation import (
 )
 from homeassistant.util.unit_conversion import (
     BaseUnitConverter,
-    BloodGlucoseConcentrationConverter,
     ConductivityConverter,
     DataRateConverter,
     DistanceConverter,
@@ -129,12 +127,6 @@ class SensorDeviceClass(StrEnum):
     Unit of measurement: `%`
     """
 
-    BLOOD_GLUCOSE_CONCENTRATION = "blood_glucose_concentration"
-    """Blood glucose concentration.
-
-    Unit of measurement: `mg/dL`, `mmol/L`
-    """
-
     CO = "carbon_monoxide"
     """Carbon Monoxide gas concentration.
 
@@ -190,7 +182,7 @@ class SensorDeviceClass(StrEnum):
 
     Use this device class for sensors measuring energy consumption, for example
     electric energy consumption.
-    Unit of measurement: `J`, `kJ`, `MJ`, `GJ`, `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `cal`, `kcal`, `Mcal`, `Gcal`
+    Unit of measurement: `J`, `kJ`, `MJ`, `GJ`, `Wh`, `kWh`, `MWh`, `cal`, `kcal`, `Mcal`, `Gcal`
     """
 
     ENERGY_STORAGE = "energy_storage"
@@ -199,7 +191,7 @@ class SensorDeviceClass(StrEnum):
     Use this device class for sensors measuring stored energy, for example the amount
     of electric energy currently stored in a battery or the capacity of a battery.
 
-    Unit of measurement: `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `MJ`, `GJ`
+    Unit of measurement: `Wh`, `kWh`, `MWh`, `MJ`, `GJ`
     """
 
     FREQUENCY = "frequency"
@@ -307,7 +299,7 @@ class SensorDeviceClass(StrEnum):
     POWER = "power"
     """Power.
 
-    Unit of measurement: `W`, `kW`, `MW`, `GW`, `TW`
+    Unit of measurement: `W`, `kW`
     """
 
     PRECIPITATION = "precipitation"
@@ -501,7 +493,6 @@ STATE_CLASSES: Final[list[str]] = [cls.value for cls in SensorStateClass]
 
 UNIT_CONVERTERS: dict[SensorDeviceClass | str | None, type[BaseUnitConverter]] = {
     SensorDeviceClass.ATMOSPHERIC_PRESSURE: PressureConverter,
-    SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: BloodGlucoseConcentrationConverter,
     SensorDeviceClass.CONDUCTIVITY: ConductivityConverter,
     SensorDeviceClass.CURRENT: ElectricCurrentConverter,
     SensorDeviceClass.DATA_RATE: DataRateConverter,
@@ -533,7 +524,6 @@ DEVICE_CLASS_UNITS: dict[SensorDeviceClass, set[type[StrEnum] | str | None]] = {
     SensorDeviceClass.AQI: {None},
     SensorDeviceClass.ATMOSPHERIC_PRESSURE: set(UnitOfPressure),
     SensorDeviceClass.BATTERY: {PERCENTAGE},
-    SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: set(UnitOfBloodGlucoseConcentration),
     SensorDeviceClass.CO: {CONCENTRATION_PARTS_PER_MILLION},
     SensorDeviceClass.CO2: {CONCENTRATION_PARTS_PER_MILLION},
     SensorDeviceClass.CONDUCTIVITY: set(UnitOfConductivity),
@@ -609,7 +599,6 @@ DEVICE_CLASS_STATE_CLASSES: dict[SensorDeviceClass, set[SensorStateClass]] = {
     SensorDeviceClass.AQI: {SensorStateClass.MEASUREMENT},
     SensorDeviceClass.ATMOSPHERIC_PRESSURE: {SensorStateClass.MEASUREMENT},
     SensorDeviceClass.BATTERY: {SensorStateClass.MEASUREMENT},
-    SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: {SensorStateClass.MEASUREMENT},
     SensorDeviceClass.CO: {SensorStateClass.MEASUREMENT},
     SensorDeviceClass.CO2: {SensorStateClass.MEASUREMENT},
     SensorDeviceClass.CONDUCTIVITY: {SensorStateClass.MEASUREMENT},
diff --git a/homeassistant/components/sensor/device_condition.py b/homeassistant/components/sensor/device_condition.py
index 56ecb36adb3..f2b51899312 100644
--- a/homeassistant/components/sensor/device_condition.py
+++ b/homeassistant/components/sensor/device_condition.py
@@ -37,7 +37,6 @@ CONF_IS_APPARENT_POWER = "is_apparent_power"
 CONF_IS_AQI = "is_aqi"
 CONF_IS_ATMOSPHERIC_PRESSURE = "is_atmospheric_pressure"
 CONF_IS_BATTERY_LEVEL = "is_battery_level"
-CONF_IS_BLOOD_GLUCOSE_CONCENTRATION = "is_blood_glucose_concentration"
 CONF_IS_CO = "is_carbon_monoxide"
 CONF_IS_CO2 = "is_carbon_dioxide"
 CONF_IS_CONDUCTIVITY = "is_conductivity"
@@ -88,9 +87,6 @@ ENTITY_CONDITIONS = {
     SensorDeviceClass.AQI: [{CONF_TYPE: CONF_IS_AQI}],
     SensorDeviceClass.ATMOSPHERIC_PRESSURE: [{CONF_TYPE: CONF_IS_ATMOSPHERIC_PRESSURE}],
     SensorDeviceClass.BATTERY: [{CONF_TYPE: CONF_IS_BATTERY_LEVEL}],
-    SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: [
-        {CONF_TYPE: CONF_IS_BLOOD_GLUCOSE_CONCENTRATION}
-    ],
     SensorDeviceClass.CO: [{CONF_TYPE: CONF_IS_CO}],
     SensorDeviceClass.CO2: [{CONF_TYPE: CONF_IS_CO2}],
     SensorDeviceClass.CONDUCTIVITY: [{CONF_TYPE: CONF_IS_CONDUCTIVITY}],
@@ -155,7 +151,6 @@ CONDITION_SCHEMA = vol.All(
                     CONF_IS_AQI,
                     CONF_IS_ATMOSPHERIC_PRESSURE,
                     CONF_IS_BATTERY_LEVEL,
-                    CONF_IS_BLOOD_GLUCOSE_CONCENTRATION,
                     CONF_IS_CO,
                     CONF_IS_CO2,
                     CONF_IS_CONDUCTIVITY,
diff --git a/homeassistant/components/sensor/device_trigger.py b/homeassistant/components/sensor/device_trigger.py
index ffee10d9f40..b07b3fac11e 100644
--- a/homeassistant/components/sensor/device_trigger.py
+++ b/homeassistant/components/sensor/device_trigger.py
@@ -36,7 +36,6 @@ CONF_APPARENT_POWER = "apparent_power"
 CONF_AQI = "aqi"
 CONF_ATMOSPHERIC_PRESSURE = "atmospheric_pressure"
 CONF_BATTERY_LEVEL = "battery_level"
-CONF_BLOOD_GLUCOSE_CONCENTRATION = "blood_glucose_concentration"
 CONF_CO = "carbon_monoxide"
 CONF_CO2 = "carbon_dioxide"
 CONF_CONDUCTIVITY = "conductivity"
@@ -87,9 +86,6 @@ ENTITY_TRIGGERS = {
     SensorDeviceClass.AQI: [{CONF_TYPE: CONF_AQI}],
     SensorDeviceClass.ATMOSPHERIC_PRESSURE: [{CONF_TYPE: CONF_ATMOSPHERIC_PRESSURE}],
     SensorDeviceClass.BATTERY: [{CONF_TYPE: CONF_BATTERY_LEVEL}],
-    SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: [
-        {CONF_TYPE: CONF_BLOOD_GLUCOSE_CONCENTRATION}
-    ],
     SensorDeviceClass.CO: [{CONF_TYPE: CONF_CO}],
     SensorDeviceClass.CO2: [{CONF_TYPE: CONF_CO2}],
     SensorDeviceClass.CONDUCTIVITY: [{CONF_TYPE: CONF_CONDUCTIVITY}],
@@ -155,7 +151,6 @@ TRIGGER_SCHEMA = vol.All(
                     CONF_AQI,
                     CONF_ATMOSPHERIC_PRESSURE,
                     CONF_BATTERY_LEVEL,
-                    CONF_BLOOD_GLUCOSE_CONCENTRATION,
                     CONF_CO,
                     CONF_CO2,
                     CONF_CONDUCTIVITY,
diff --git a/homeassistant/components/sensor/icons.json b/homeassistant/components/sensor/icons.json
index ea4c902e665..6132fcbc1e9 100644
--- a/homeassistant/components/sensor/icons.json
+++ b/homeassistant/components/sensor/icons.json
@@ -12,9 +12,6 @@
     "atmospheric_pressure": {
       "default": "mdi:thermometer-lines"
     },
-    "blood_glucose_concentration": {
-      "default": "mdi:spoon-sugar"
-    },
     "carbon_dioxide": {
       "default": "mdi:molecule-co2"
     },
diff --git a/homeassistant/components/sensor/strings.json b/homeassistant/components/sensor/strings.json
index 6d529e72c3b..71bead342c4 100644
--- a/homeassistant/components/sensor/strings.json
+++ b/homeassistant/components/sensor/strings.json
@@ -6,7 +6,6 @@
       "is_aqi": "Current {entity_name} air quality index",
       "is_atmospheric_pressure": "Current {entity_name} atmospheric pressure",
       "is_battery_level": "Current {entity_name} battery level",
-      "is_blood_glucose_concentration": "Current {entity_name} blood glucose concentration",
       "is_carbon_monoxide": "Current {entity_name} carbon monoxide concentration level",
       "is_carbon_dioxide": "Current {entity_name} carbon dioxide concentration level",
       "is_conductivity": "Current {entity_name} conductivity",
@@ -57,7 +56,6 @@
       "aqi": "{entity_name} air quality index changes",
       "atmospheric_pressure": "{entity_name} atmospheric pressure changes",
       "battery_level": "{entity_name} battery level changes",
-      "blood_glucose_concentration": "{entity_name} blood glucose concentration changes",
       "carbon_monoxide": "{entity_name} carbon monoxide concentration changes",
       "carbon_dioxide": "{entity_name} carbon dioxide concentration changes",
       "conductivity": "{entity_name} conductivity changes",
@@ -151,9 +149,6 @@
     "battery": {
       "name": "Battery"
     },
-    "blood_glucose_concentration": {
-      "name": "Blood glucose concentration"
-    },
     "carbon_monoxide": {
       "name": "Carbon monoxide"
     },
diff --git a/homeassistant/components/sensorpush/manifest.json b/homeassistant/components/sensorpush/manifest.json
index 7729a67d7a1..0222a1c2884 100644
--- a/homeassistant/components/sensorpush/manifest.json
+++ b/homeassistant/components/sensorpush/manifest.json
@@ -17,5 +17,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/sensorpush",
   "iot_class": "local_push",
-  "requirements": ["sensorpush-ble==1.7.1"]
+  "requirements": ["sensorpush-ble==1.6.2"]
 }
diff --git a/homeassistant/components/sentry/config_flow.py b/homeassistant/components/sentry/config_flow.py
index 2fead7c27cd..59cd1f3f0e9 100644
--- a/homeassistant/components/sentry/config_flow.py
+++ b/homeassistant/components/sentry/config_flow.py
@@ -49,7 +49,7 @@ class SentryConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> SentryOptionsFlow:
         """Get the options flow for this handler."""
-        return SentryOptionsFlow()
+        return SentryOptionsFlow(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -78,6 +78,10 @@ class SentryConfigFlow(ConfigFlow, domain=DOMAIN):
 class SentryOptionsFlow(OptionsFlow):
     """Handle Sentry options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize Sentry options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/senz/__init__.py b/homeassistant/components/senz/__init__.py
index c3238f7355f..bd4dfae4571 100644
--- a/homeassistant/components/senz/__init__.py
+++ b/homeassistant/components/senz/__init__.py
@@ -60,7 +60,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator: SENZDataUpdateCoordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=account.username,
         update_interval=UPDATE_INTERVAL,
         update_method=update_thermostats,
diff --git a/homeassistant/components/seven_segments/manifest.json b/homeassistant/components/seven_segments/manifest.json
index af00a1fdfed..2f39644d6d3 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==11.0.0"]
+  "requirements": ["Pillow==10.4.0"]
 }
diff --git a/homeassistant/components/seventeentrack/services.py b/homeassistant/components/seventeentrack/services.py
index 54c23e6d619..0833bc0a97b 100644
--- a/homeassistant/components/seventeentrack/services.py
+++ b/homeassistant/components/seventeentrack/services.py
@@ -1,8 +1,8 @@
 """Services for the seventeentrack integration."""
 
-from typing import Any, Final
+from typing import Final
 
-from pyseventeentrack.package import PACKAGE_STATUS_MAP, Package
+from pyseventeentrack.package import PACKAGE_STATUS_MAP
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
@@ -81,7 +81,18 @@ def setup_services(hass: HomeAssistant) -> None:
 
         return {
             "packages": [
-                package_to_dict(package)
+                {
+                    ATTR_DESTINATION_COUNTRY: package.destination_country,
+                    ATTR_ORIGIN_COUNTRY: package.origin_country,
+                    ATTR_PACKAGE_TYPE: package.package_type,
+                    ATTR_TRACKING_INFO_LANGUAGE: package.tracking_info_language,
+                    ATTR_TRACKING_NUMBER: package.tracking_number,
+                    ATTR_LOCATION: package.location,
+                    ATTR_STATUS: package.status,
+                    ATTR_TIMESTAMP: package.timestamp.isoformat(),
+                    ATTR_INFO_TEXT: package.info_text,
+                    ATTR_FRIENDLY_NAME: package.friendly_name,
+                }
                 for package in live_packages
                 if slugify(package.status) in package_states or package_states == []
             ]
@@ -99,22 +110,6 @@ def setup_services(hass: HomeAssistant) -> None:
 
         await seventeen_coordinator.client.profile.archive_package(tracking_number)
 
-    def package_to_dict(package: Package) -> dict[str, Any]:
-        result = {
-            ATTR_DESTINATION_COUNTRY: package.destination_country,
-            ATTR_ORIGIN_COUNTRY: package.origin_country,
-            ATTR_PACKAGE_TYPE: package.package_type,
-            ATTR_TRACKING_INFO_LANGUAGE: package.tracking_info_language,
-            ATTR_TRACKING_NUMBER: package.tracking_number,
-            ATTR_LOCATION: package.location,
-            ATTR_STATUS: package.status,
-            ATTR_INFO_TEXT: package.info_text,
-            ATTR_FRIENDLY_NAME: package.friendly_name,
-        }
-        if timestamp := package.timestamp:
-            result[ATTR_TIMESTAMP] = timestamp.isoformat()
-        return result
-
     async def _validate_service(config_entry_id):
         entry: ConfigEntry | None = hass.config_entries.async_get_entry(config_entry_id)
         if not entry:
diff --git a/homeassistant/components/shelly/config_flow.py b/homeassistant/components/shelly/config_flow.py
index 1daa4710f30..717e0923fd6 100644
--- a/homeassistant/components/shelly/config_flow.py
+++ b/homeassistant/components/shelly/config_flow.py
@@ -444,7 +444,7 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     @classmethod
     @callback
@@ -460,6 +460,10 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Handle the option flow for shelly."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/shelly/coordinator.py b/homeassistant/components/shelly/coordinator.py
index a66fbb20f48..6332e139244 100644
--- a/homeassistant/components/shelly/coordinator.py
+++ b/homeassistant/components/shelly/coordinator.py
@@ -603,7 +603,7 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
 
     async def _async_update_data(self) -> None:
         """Fetch data."""
-        if self.update_sleep_period() or self.hass.is_stopping:
+        if self.update_sleep_period():
             return
 
         if self.sleep_period:
diff --git a/homeassistant/components/shelly/manifest.json b/homeassistant/components/shelly/manifest.json
index 38437fb2137..9530771c8f0 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==12.0.1"],
+  "requirements": ["aioshelly==12.0.0"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/shelly/update.py b/homeassistant/components/shelly/update.py
index f22547acf50..fb586ae8b85 100644
--- a/homeassistant/components/shelly/update.py
+++ b/homeassistant/components/shelly/update.py
@@ -238,8 +238,7 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
     ) -> None:
         """Initialize update entity."""
         super().__init__(coordinator, key, attribute, description)
-        self._ota_in_progress = False
-        self._ota_progress_percentage: int | None = None
+        self._ota_in_progress: bool | int = False
         self._attr_release_url = get_release_url(
             coordinator.device.gen, coordinator.model, description.beta
         )
@@ -257,12 +256,11 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
         if self.in_progress is not False:
             event_type = event["event"]
             if event_type == OTA_BEGIN:
-                self._ota_progress_percentage = 0
+                self._ota_in_progress = 0
             elif event_type == OTA_PROGRESS:
-                self._ota_progress_percentage = event["progress_percent"]
+                self._ota_in_progress = event["progress_percent"]
             elif event_type in (OTA_ERROR, OTA_SUCCESS):
                 self._ota_in_progress = False
-                self._ota_progress_percentage = None
             self.async_write_ha_state()
 
     @property
@@ -280,15 +278,10 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
         return self.installed_version
 
     @property
-    def in_progress(self) -> bool:
+    def in_progress(self) -> bool | int:
         """Update installation in progress."""
         return self._ota_in_progress
 
-    @property
-    def update_percentage(self) -> int | None:
-        """Update installation progress."""
-        return self._ota_progress_percentage
-
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
     ) -> None:
@@ -317,7 +310,6 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
             await self.coordinator.async_shutdown_device_and_start_reauth()
         else:
             self._ota_in_progress = True
-            self._ota_progress_percentage = None
             LOGGER.debug("OTA update call for %s successful", self.coordinator.name)
 
 
diff --git a/homeassistant/components/sia/alarm_control_panel.py b/homeassistant/components/sia/alarm_control_panel.py
index 7ea878f538d..04d52b7a595 100644
--- a/homeassistant/components/sia/alarm_control_panel.py
+++ b/homeassistant/components/sia/alarm_control_panel.py
@@ -4,19 +4,25 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 import logging
-from typing import TYPE_CHECKING
 
 from pysiaalarm import SIAEvent
 
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityDescription,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
 
 from .const import CONF_ACCOUNT, CONF_ACCOUNTS, CONF_ZONES, KEY_ALARM, PREVIOUS_STATE
 from .entity import SIABaseEntity, SIAEntityDescription
@@ -35,32 +41,32 @@ class SIAAlarmControlPanelEntityDescription(
 ENTITY_DESCRIPTION_ALARM = SIAAlarmControlPanelEntityDescription(
     key=KEY_ALARM,
     code_consequences={
-        "PA": AlarmControlPanelState.TRIGGERED,
-        "JA": AlarmControlPanelState.TRIGGERED,
-        "TA": AlarmControlPanelState.TRIGGERED,
-        "BA": AlarmControlPanelState.TRIGGERED,
-        "HA": AlarmControlPanelState.TRIGGERED,
-        "CA": AlarmControlPanelState.ARMED_AWAY,
-        "CB": AlarmControlPanelState.ARMED_AWAY,
-        "CG": AlarmControlPanelState.ARMED_AWAY,
-        "CL": AlarmControlPanelState.ARMED_AWAY,
-        "CP": AlarmControlPanelState.ARMED_AWAY,
-        "CQ": AlarmControlPanelState.ARMED_AWAY,
-        "CS": AlarmControlPanelState.ARMED_AWAY,
-        "CF": AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        "NP": AlarmControlPanelState.DISARMED,
-        "NO": AlarmControlPanelState.DISARMED,
-        "OA": AlarmControlPanelState.DISARMED,
-        "OB": AlarmControlPanelState.DISARMED,
-        "OG": AlarmControlPanelState.DISARMED,
-        "OP": AlarmControlPanelState.DISARMED,
-        "OQ": AlarmControlPanelState.DISARMED,
-        "OR": AlarmControlPanelState.DISARMED,
-        "OS": AlarmControlPanelState.DISARMED,
-        "NC": AlarmControlPanelState.ARMED_NIGHT,
-        "NL": AlarmControlPanelState.ARMED_NIGHT,
-        "NE": AlarmControlPanelState.ARMED_NIGHT,
-        "NF": AlarmControlPanelState.ARMED_NIGHT,
+        "PA": STATE_ALARM_TRIGGERED,
+        "JA": STATE_ALARM_TRIGGERED,
+        "TA": STATE_ALARM_TRIGGERED,
+        "BA": STATE_ALARM_TRIGGERED,
+        "HA": STATE_ALARM_TRIGGERED,
+        "CA": STATE_ALARM_ARMED_AWAY,
+        "CB": STATE_ALARM_ARMED_AWAY,
+        "CG": STATE_ALARM_ARMED_AWAY,
+        "CL": STATE_ALARM_ARMED_AWAY,
+        "CP": STATE_ALARM_ARMED_AWAY,
+        "CQ": STATE_ALARM_ARMED_AWAY,
+        "CS": STATE_ALARM_ARMED_AWAY,
+        "CF": STATE_ALARM_ARMED_CUSTOM_BYPASS,
+        "NP": STATE_ALARM_DISARMED,
+        "NO": STATE_ALARM_DISARMED,
+        "OA": STATE_ALARM_DISARMED,
+        "OB": STATE_ALARM_DISARMED,
+        "OG": STATE_ALARM_DISARMED,
+        "OP": STATE_ALARM_DISARMED,
+        "OQ": STATE_ALARM_DISARMED,
+        "OR": STATE_ALARM_DISARMED,
+        "OS": STATE_ALARM_DISARMED,
+        "NC": STATE_ALARM_ARMED_NIGHT,
+        "NL": STATE_ALARM_ARMED_NIGHT,
+        "NE": STATE_ALARM_ARMED_NIGHT,
+        "NF": STATE_ALARM_ARMED_NIGHT,
         "BR": PREVIOUS_STATE,
     },
 )
@@ -104,17 +110,13 @@ class SIAAlarmControlPanel(SIABaseEntity, AlarmControlPanelEntity):
             entity_description,
         )
 
-        self._attr_alarm_state: AlarmControlPanelState | None = None
-        self._old_state: AlarmControlPanelState | None = None
+        self._attr_state: StateType = None
+        self._old_state: StateType = None
 
     def handle_last_state(self, last_state: State | None) -> None:
         """Handle the last state."""
-        self._attr_alarm_state = None
-        if last_state is not None and last_state.state not in (
-            STATE_UNAVAILABLE,
-            STATE_UNKNOWN,
-        ):
-            self._attr_alarm_state = AlarmControlPanelState(last_state.state)
+        if last_state is not None:
+            self._attr_state = last_state.state
         if self.state == STATE_UNAVAILABLE:
             self._attr_available = False
 
@@ -131,7 +133,5 @@ class SIAAlarmControlPanel(SIABaseEntity, AlarmControlPanelEntity):
         _LOGGER.debug("New state will be %s", new_state)
         if new_state == PREVIOUS_STATE:
             new_state = self._old_state
-        if TYPE_CHECKING:
-            assert isinstance(new_state, AlarmControlPanelState)
-        self._attr_alarm_state, self._old_state = new_state, self._attr_alarm_state
+        self._attr_state, self._old_state = new_state, self._attr_state
         return True
diff --git a/homeassistant/components/sia/config_flow.py b/homeassistant/components/sia/config_flow.py
index a23978145e7..cb451133d41 100644
--- a/homeassistant/components/sia/config_flow.py
+++ b/homeassistant/components/sia/config_flow.py
@@ -181,6 +181,7 @@ class SIAOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize SIA options flow."""
+        self.config_entry = config_entry
         self.options = deepcopy(dict(config_entry.options))
         self.hub: SIAHub | None = None
         self.accounts_todo: list = []
diff --git a/homeassistant/components/sia/entity.py b/homeassistant/components/sia/entity.py
index 48af8e0beb4..aecac2b540b 100644
--- a/homeassistant/components/sia/entity.py
+++ b/homeassistant/components/sia/entity.py
@@ -8,7 +8,6 @@ import logging
 
 from pysiaalarm import SIAEvent
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PORT
 from homeassistant.core import CALLBACK_TYPE, State, callback
@@ -41,7 +40,7 @@ _LOGGER = logging.getLogger(__name__)
 class SIARequiredKeysMixin:
     """Required keys for SIA entities."""
 
-    code_consequences: dict[str, StateType | bool | AlarmControlPanelState]
+    code_consequences: dict[str, StateType | bool]
 
 
 @dataclass(frozen=True)
diff --git a/homeassistant/components/sighthound/manifest.json b/homeassistant/components/sighthound/manifest.json
index 7d08367cf7d..875c98acb6d 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==11.0.0", "simplehound==0.3"]
+  "requirements": ["Pillow==10.4.0", "simplehound==0.3"]
 }
diff --git a/homeassistant/components/simplisafe/alarm_control_panel.py b/homeassistant/components/simplisafe/alarm_control_panel.py
index 18f2d8ddcd5..478e5784e19 100644
--- a/homeassistant/components/simplisafe/alarm_control_panel.py
+++ b/homeassistant/components/simplisafe/alarm_control_panel.py
@@ -26,9 +26,16 @@ from simplipy.websocket import (
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -58,33 +65,33 @@ ATTR_WALL_POWER_LEVEL = "wall_power_level"
 ATTR_WIFI_STRENGTH = "wifi_strength"
 
 STATE_MAP_FROM_REST_API = {
-    SystemStates.ALARM: AlarmControlPanelState.TRIGGERED,
-    SystemStates.ALARM_COUNT: AlarmControlPanelState.PENDING,
-    SystemStates.AWAY: AlarmControlPanelState.ARMED_AWAY,
-    SystemStates.AWAY_COUNT: AlarmControlPanelState.ARMING,
-    SystemStates.ENTRY_DELAY: AlarmControlPanelState.PENDING,
-    SystemStates.EXIT_DELAY: AlarmControlPanelState.ARMING,
-    SystemStates.HOME: AlarmControlPanelState.ARMED_HOME,
-    SystemStates.HOME_COUNT: AlarmControlPanelState.ARMING,
-    SystemStates.OFF: AlarmControlPanelState.DISARMED,
-    SystemStates.TEST: AlarmControlPanelState.DISARMED,
+    SystemStates.ALARM: STATE_ALARM_TRIGGERED,
+    SystemStates.ALARM_COUNT: STATE_ALARM_PENDING,
+    SystemStates.AWAY: STATE_ALARM_ARMED_AWAY,
+    SystemStates.AWAY_COUNT: STATE_ALARM_ARMING,
+    SystemStates.ENTRY_DELAY: STATE_ALARM_PENDING,
+    SystemStates.EXIT_DELAY: STATE_ALARM_ARMING,
+    SystemStates.HOME: STATE_ALARM_ARMED_HOME,
+    SystemStates.HOME_COUNT: STATE_ALARM_ARMING,
+    SystemStates.OFF: STATE_ALARM_DISARMED,
+    SystemStates.TEST: STATE_ALARM_DISARMED,
 }
 
 STATE_MAP_FROM_WEBSOCKET_EVENT = {
-    EVENT_ALARM_CANCELED: AlarmControlPanelState.DISARMED,
-    EVENT_ALARM_TRIGGERED: AlarmControlPanelState.TRIGGERED,
-    EVENT_ARMED_AWAY: AlarmControlPanelState.ARMED_AWAY,
-    EVENT_ARMED_AWAY_BY_KEYPAD: AlarmControlPanelState.ARMED_AWAY,
-    EVENT_ARMED_AWAY_BY_REMOTE: AlarmControlPanelState.ARMED_AWAY,
-    EVENT_ARMED_HOME: AlarmControlPanelState.ARMED_HOME,
-    EVENT_AWAY_EXIT_DELAY_BY_KEYPAD: AlarmControlPanelState.ARMING,
-    EVENT_AWAY_EXIT_DELAY_BY_REMOTE: AlarmControlPanelState.ARMING,
-    EVENT_DISARMED_BY_KEYPAD: AlarmControlPanelState.DISARMED,
-    EVENT_DISARMED_BY_REMOTE: AlarmControlPanelState.DISARMED,
-    EVENT_ENTRY_DELAY: AlarmControlPanelState.PENDING,
-    EVENT_HOME_EXIT_DELAY: AlarmControlPanelState.ARMING,
-    EVENT_SECRET_ALERT_TRIGGERED: AlarmControlPanelState.TRIGGERED,
-    EVENT_USER_INITIATED_TEST: AlarmControlPanelState.DISARMED,
+    EVENT_ALARM_CANCELED: STATE_ALARM_DISARMED,
+    EVENT_ALARM_TRIGGERED: STATE_ALARM_TRIGGERED,
+    EVENT_ARMED_AWAY: STATE_ALARM_ARMED_AWAY,
+    EVENT_ARMED_AWAY_BY_KEYPAD: STATE_ALARM_ARMED_AWAY,
+    EVENT_ARMED_AWAY_BY_REMOTE: STATE_ALARM_ARMED_AWAY,
+    EVENT_ARMED_HOME: STATE_ALARM_ARMED_HOME,
+    EVENT_AWAY_EXIT_DELAY_BY_KEYPAD: STATE_ALARM_ARMING,
+    EVENT_AWAY_EXIT_DELAY_BY_REMOTE: STATE_ALARM_ARMING,
+    EVENT_DISARMED_BY_KEYPAD: STATE_ALARM_DISARMED,
+    EVENT_DISARMED_BY_REMOTE: STATE_ALARM_DISARMED,
+    EVENT_ENTRY_DELAY: STATE_ALARM_PENDING,
+    EVENT_HOME_EXIT_DELAY: STATE_ALARM_ARMING,
+    EVENT_SECRET_ALERT_TRIGGERED: STATE_ALARM_TRIGGERED,
+    EVENT_USER_INITIATED_TEST: STATE_ALARM_DISARMED,
 }
 
 WEBSOCKET_EVENTS_TO_LISTEN_FOR = (
@@ -138,9 +145,9 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
     def _set_state_from_system_data(self) -> None:
         """Set the state based on the latest REST API data."""
         if self._system.alarm_going_off:
-            self._attr_alarm_state = AlarmControlPanelState.TRIGGERED
+            self._attr_state = STATE_ALARM_TRIGGERED
         elif state := STATE_MAP_FROM_REST_API.get(self._system.state):
-            self._attr_alarm_state = state
+            self._attr_state = state
             self.async_reset_error_count()
         else:
             LOGGER.warning("Unexpected system state (REST API): %s", self._system.state)
@@ -155,7 +162,7 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
                 f'Error while disarming "{self._system.system_id}": {err}'
             ) from err
 
-        self._attr_alarm_state = AlarmControlPanelState.DISARMED
+        self._attr_state = STATE_ALARM_DISARMED
         self.async_write_ha_state()
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
@@ -167,7 +174,7 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
                 f'Error while arming (home) "{self._system.system_id}": {err}'
             ) from err
 
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+        self._attr_state = STATE_ALARM_ARMED_HOME
         self.async_write_ha_state()
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
@@ -179,7 +186,7 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
                 f'Error while arming (away) "{self._system.system_id}": {err}'
             ) from err
 
-        self._attr_alarm_state = AlarmControlPanelState.ARMING
+        self._attr_state = STATE_ALARM_ARMING
         self.async_write_ha_state()
 
     @callback
@@ -223,7 +230,7 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
         assert event.event_type
 
         if state := STATE_MAP_FROM_WEBSOCKET_EVENT.get(event.event_type):
-            self._attr_alarm_state = state
+            self._attr_state = state
             self.async_reset_error_count()
         else:
             LOGGER.error("Unknown alarm websocket event: %s", event.event_type)
diff --git a/homeassistant/components/simplisafe/config_flow.py b/homeassistant/components/simplisafe/config_flow.py
index 68974fe118f..6fdbd351a29 100644
--- a/homeassistant/components/simplisafe/config_flow.py
+++ b/homeassistant/components/simplisafe/config_flow.py
@@ -67,7 +67,7 @@ class SimpliSafeFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> SimpliSafeOptionsFlowHandler:
         """Define the config flow to handle options."""
-        return SimpliSafeOptionsFlowHandler()
+        return SimpliSafeOptionsFlowHandler(config_entry)
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
@@ -153,6 +153,10 @@ class SimpliSafeFlowHandler(ConfigFlow, domain=DOMAIN):
 class SimpliSafeOptionsFlowHandler(OptionsFlow):
     """Handle a SimpliSafe options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/sky_remote/__init__.py b/homeassistant/components/sky_remote/__init__.py
deleted file mode 100644
index 4daad78c558..00000000000
--- a/homeassistant/components/sky_remote/__init__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""The Sky Remote Control integration."""
-
-import logging
-
-from skyboxremote import RemoteControl, SkyBoxConnectionError
-
-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
-
-PLATFORMS = [Platform.REMOTE]
-
-_LOGGER = logging.getLogger(__name__)
-
-
-type SkyRemoteConfigEntry = ConfigEntry[RemoteControl]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: SkyRemoteConfigEntry) -> bool:
-    """Set up Sky remote."""
-    host = entry.data[CONF_HOST]
-    port = entry.data[CONF_PORT]
-
-    _LOGGER.debug("Setting up Host: %s, Port: %s", host, port)
-    remote = RemoteControl(host, port)
-    try:
-        await remote.check_connectable()
-    except SkyBoxConnectionError as e:
-        raise ConfigEntryNotReady from e
-
-    entry.runtime_data = remote
-    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/sky_remote/config_flow.py b/homeassistant/components/sky_remote/config_flow.py
deleted file mode 100644
index a55dfb2a52b..00000000000
--- a/homeassistant/components/sky_remote/config_flow.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""Config flow for sky_remote."""
-
-import logging
-from typing import Any
-
-from skyboxremote import RemoteControl, SkyBoxConnectionError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PORT
-import homeassistant.helpers.config_validation as cv
-
-from .const import DEFAULT_PORT, DOMAIN, LEGACY_PORT
-
-DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_HOST): cv.string,
-    }
-)
-
-
-async def async_find_box_port(host: str) -> int:
-    """Find port box uses for communication."""
-    logging.debug("Attempting to find port to connect to %s on", host)
-    remote = RemoteControl(host, DEFAULT_PORT)
-    try:
-        await remote.check_connectable()
-    except SkyBoxConnectionError:
-        # Try legacy port if the default one failed
-        remote = RemoteControl(host, LEGACY_PORT)
-        await remote.check_connectable()
-        return LEGACY_PORT
-    return DEFAULT_PORT
-
-
-class SkyRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Sky Remote."""
-
-    VERSION = 1
-    MINOR_VERSION = 1
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the user step."""
-
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            logging.debug("user_input: %s", user_input)
-            self._async_abort_entries_match(user_input)
-            try:
-                port = await async_find_box_port(user_input[CONF_HOST])
-            except SkyBoxConnectionError:
-                logging.exception("while finding port of skybox")
-                errors["base"] = "cannot_connect"
-            else:
-                return self.async_create_entry(
-                    title=user_input[CONF_HOST],
-                    data={**user_input, CONF_PORT: port},
-                )
-
-        return self.async_show_form(
-            step_id="user", data_schema=DATA_SCHEMA, errors=errors
-        )
diff --git a/homeassistant/components/sky_remote/const.py b/homeassistant/components/sky_remote/const.py
deleted file mode 100644
index e67744a741b..00000000000
--- a/homeassistant/components/sky_remote/const.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""Constants."""
-
-DOMAIN = "sky_remote"
-
-DEFAULT_PORT = 49160
-LEGACY_PORT = 5900
diff --git a/homeassistant/components/sky_remote/manifest.json b/homeassistant/components/sky_remote/manifest.json
deleted file mode 100644
index b00ff309b10..00000000000
--- a/homeassistant/components/sky_remote/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "domain": "sky_remote",
-  "name": "Sky Remote Control",
-  "codeowners": ["@dunnmj", "@saty9"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/sky_remote",
-  "integration_type": "device",
-  "iot_class": "assumed_state",
-  "requirements": ["skyboxremote==0.0.6"]
-}
diff --git a/homeassistant/components/sky_remote/remote.py b/homeassistant/components/sky_remote/remote.py
deleted file mode 100644
index 05a464f73a6..00000000000
--- a/homeassistant/components/sky_remote/remote.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""Home Assistant integration to control a sky box using the remote platform."""
-
-from collections.abc import Iterable
-import logging
-from typing import Any
-
-from skyboxremote import VALID_KEYS, RemoteControl
-
-from homeassistant.components.remote import RemoteEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import SkyRemoteConfigEntry
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config: SkyRemoteConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Sky remote platform."""
-    async_add_entities(
-        [SkyRemote(config.runtime_data, config.entry_id)],
-        True,
-    )
-
-
-class SkyRemote(RemoteEntity):
-    """Representation of a Sky Remote."""
-
-    _attr_has_entity_name = True
-    _attr_name = None
-
-    def __init__(self, remote: RemoteControl, unique_id: str) -> None:
-        """Initialize the Sky Remote."""
-        self._remote = remote
-        self._attr_unique_id = unique_id
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id)},
-            manufacturer="SKY",
-            model="Sky Box",
-            name=remote.host,
-        )
-
-    def turn_on(self, activity: str | None = None, **kwargs: Any) -> None:
-        """Send the power on command."""
-        self.send_command(["sky"])
-
-    def turn_off(self, activity: str | None = None, **kwargs: Any) -> None:
-        """Send the power command."""
-        self.send_command(["power"])
-
-    def send_command(self, command: Iterable[str], **kwargs: Any) -> None:
-        """Send a list of commands to the device."""
-        for cmd in command:
-            if cmd not in VALID_KEYS:
-                raise ServiceValidationError(
-                    f"{cmd} is not in Valid Keys: {VALID_KEYS}"
-                )
-        try:
-            self._remote.send_keys(command)
-        except ValueError as err:
-            _LOGGER.error("Invalid command: %s. Error: %s", command, err)
-            return
-        _LOGGER.debug("Successfully sent command %s", command)
diff --git a/homeassistant/components/sky_remote/strings.json b/homeassistant/components/sky_remote/strings.json
deleted file mode 100644
index af794490c43..00000000000
--- a/homeassistant/components/sky_remote/strings.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "config": {
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "step": {
-      "user": {
-        "title": "Add Sky Remote",
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "Hostname or IP address of your Sky device"
-        }
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/slide/manifest.json b/homeassistant/components/slide/manifest.json
index 111bc9bd7a9..bb25e10658a 100644
--- a/homeassistant/components/slide/manifest.json
+++ b/homeassistant/components/slide/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/slide",
   "iot_class": "cloud_polling",
   "loggers": ["goslideapi"],
-  "requirements": ["goslide-api==0.7.0"]
+  "requirements": ["goslide-api==0.5.1"]
 }
diff --git a/homeassistant/components/sma/__init__.py b/homeassistant/components/sma/__init__.py
index 37fb4d72284..d8a7929ae79 100644
--- a/homeassistant/components/sma/__init__.py
+++ b/homeassistant/components/sma/__init__.py
@@ -92,7 +92,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="sma",
         update_method=async_update_data,
         update_interval=interval,
diff --git a/homeassistant/components/smart_meter_texas/__init__.py b/homeassistant/components/smart_meter_texas/__init__.py
index 1cd7df68e91..c6e466392f0 100644
--- a/homeassistant/components/smart_meter_texas/__init__.py
+++ b/homeassistant/components/smart_meter_texas/__init__.py
@@ -64,7 +64,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="Smart Meter Texas",
         update_method=async_update_data,
         update_interval=SCAN_INTERVAL,
diff --git a/homeassistant/components/smarty/__init__.py b/homeassistant/components/smarty/__init__.py
index 0d043804c3d..17c4bd0a26a 100644
--- a/homeassistant/components/smarty/__init__.py
+++ b/homeassistant/components/smarty/__init__.py
@@ -1,20 +1,23 @@
 """Support to control a Salda Smarty XP/XV ventilation unit."""
 
+from datetime import timedelta
 import ipaddress
 import logging
 
+from pysmarty2 import Smarty
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import CONF_HOST, CONF_NAME, Platform
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers import issue_registry as ir
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import discovery
 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 DOMAIN
-from .coordinator import SmartyConfigEntry, SmartyCoordinator
+DOMAIN = "smarty"
+DATA_SMARTY = "smarty"
+SMARTY_NAME = "Smarty"
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -23,84 +26,48 @@ CONFIG_SCHEMA = vol.Schema(
         DOMAIN: vol.Schema(
             {
                 vol.Required(CONF_HOST): vol.All(ipaddress.ip_address, cv.string),
-                vol.Optional(CONF_NAME, default="Smarty"): cv.string,
+                vol.Optional(CONF_NAME, default=SMARTY_NAME): cv.string,
             }
         )
     },
     extra=vol.ALLOW_EXTRA,
 )
 
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.BUTTON,
-    Platform.FAN,
-    Platform.SENSOR,
-    Platform.SWITCH,
-]
+RPM = "rpm"
+SIGNAL_UPDATE_SMARTY = "smarty_update"
 
 
-async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
-    """Create a smarty system."""
-    if config := hass_config.get(DOMAIN):
-        hass.async_create_task(_async_import(hass, config))
-    return True
-
-
-async def _async_import(hass: HomeAssistant, config: ConfigType) -> None:
+def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the smarty environment."""
 
-    if not hass.config_entries.async_entries(DOMAIN):
-        # Start import flow
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
-        )
-        if result["type"] == FlowResultType.ABORT:
-            ir.async_create_issue(
-                hass,
-                DOMAIN,
-                f"deprecated_yaml_import_issue_{result['reason']}",
-                breaks_in_ha_version="2025.5.0",
-                is_fixable=False,
-                issue_domain=DOMAIN,
-                severity=ir.IssueSeverity.WARNING,
-                translation_key=f"deprecated_yaml_import_issue_{result['reason']}",
-                translation_placeholders={
-                    "domain": DOMAIN,
-                    "integration_title": "Smarty",
-                },
-            )
-            return
+    conf = config[DOMAIN]
 
-    ir.async_create_issue(
-        hass,
-        HOMEASSISTANT_DOMAIN,
-        f"deprecated_yaml_{DOMAIN}",
-        breaks_in_ha_version="2025.5.0",
-        is_fixable=False,
-        issue_domain=DOMAIN,
-        severity=ir.IssueSeverity.WARNING,
-        translation_key="deprecated_yaml",
-        translation_placeholders={
-            "domain": DOMAIN,
-            "integration_title": "Smarty",
-        },
-    )
+    host = conf[CONF_HOST]
+    name = conf[CONF_NAME]
 
+    _LOGGER.debug("Name: %s, host: %s", name, host)
 
-async def async_setup_entry(hass: HomeAssistant, entry: SmartyConfigEntry) -> bool:
-    """Set up the Smarty environment from a config entry."""
+    smarty = Smarty(host=host)
 
-    coordinator = SmartyCoordinator(hass)
+    hass.data[DOMAIN] = {"api": smarty, "name": name}
 
-    await coordinator.async_config_entry_first_refresh()
+    # Initial update
+    smarty.update()
 
-    entry.runtime_data = coordinator
+    # Load platforms
+    discovery.load_platform(hass, Platform.FAN, DOMAIN, {}, config)
+    discovery.load_platform(hass, Platform.SENSOR, DOMAIN, {}, config)
+    discovery.load_platform(hass, Platform.BINARY_SENSOR, DOMAIN, {}, config)
 
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    def poll_device_update(event_time):
+        """Update Smarty device."""
+        _LOGGER.debug("Updating Smarty device")
+        if smarty.update():
+            _LOGGER.debug("Update success")
+            dispatcher_send(hass, SIGNAL_UPDATE_SMARTY)
+        else:
+            _LOGGER.debug("Update failed")
+
+    track_time_interval(hass, poll_device_update, timedelta(seconds=30))
 
     return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: SmartyConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/smarty/binary_sensor.py b/homeassistant/components/smarty/binary_sensor.py
index 213cb00d47c..b31c51244b8 100644
--- a/homeassistant/components/smarty/binary_sensor.py
+++ b/homeassistant/components/smarty/binary_sensor.py
@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
-from dataclasses import dataclass
 import logging
 
 from pysmarty2 import Smarty
@@ -11,77 +9,104 @@ from pysmarty2 import Smarty
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
-    BinarySensorEntityDescription,
 )
-from homeassistant.core import HomeAssistant
+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 .coordinator import SmartyConfigEntry, SmartyCoordinator
-from .entity import SmartyEntity
+from . import DOMAIN, SIGNAL_UPDATE_SMARTY
 
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass(frozen=True, kw_only=True)
-class SmartyBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Class describing Smarty binary sensor entities."""
-
-    value_fn: Callable[[Smarty], bool]
-
-
-ENTITIES: tuple[SmartyBinarySensorEntityDescription, ...] = (
-    SmartyBinarySensorEntityDescription(
-        key="alarm",
-        translation_key="alarm",
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda smarty: smarty.alarm,
-    ),
-    SmartyBinarySensorEntityDescription(
-        key="warning",
-        translation_key="warning",
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        value_fn=lambda smarty: smarty.warning,
-    ),
-    SmartyBinarySensorEntityDescription(
-        key="boost",
-        translation_key="boost_state",
-        value_fn=lambda smarty: smarty.boost,
-    ),
-)
-
-
-async def async_setup_entry(
+async def async_setup_platform(
     hass: HomeAssistant,
-    entry: SmartyConfigEntry,
+    config: ConfigType,
     async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Smarty Binary Sensor Platform."""
+    smarty: Smarty = hass.data[DOMAIN]["api"]
+    name: str = hass.data[DOMAIN]["name"]
 
-    coordinator = entry.runtime_data
+    sensors = [
+        AlarmSensor(name, smarty),
+        WarningSensor(name, smarty),
+        BoostSensor(name, smarty),
+    ]
 
-    async_add_entities(
-        SmartyBinarySensor(coordinator, description) for description in ENTITIES
-    )
+    async_add_entities(sensors, True)
 
 
-class SmartyBinarySensor(SmartyEntity, BinarySensorEntity):
+class SmartyBinarySensor(BinarySensorEntity):
     """Representation of a Smarty Binary Sensor."""
 
-    entity_description: SmartyBinarySensorEntityDescription
+    _attr_should_poll = False
 
     def __init__(
         self,
-        coordinator: SmartyCoordinator,
-        entity_description: SmartyBinarySensorEntityDescription,
+        name: str,
+        device_class: BinarySensorDeviceClass | None,
+        smarty: Smarty,
     ) -> None:
         """Initialize the entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._attr_unique_id = (
-            f"{coordinator.config_entry.entry_id}_{entity_description.key}"
+        self._attr_name = name
+        self._attr_device_class = device_class
+        self._smarty = smarty
+
+    async def async_added_to_hass(self) -> None:
+        """Call to update."""
+        async_dispatcher_connect(self.hass, SIGNAL_UPDATE_SMARTY, self._update_callback)
+
+    @callback
+    def _update_callback(self) -> None:
+        """Call update method."""
+        self.async_schedule_update_ha_state(True)
+
+
+class BoostSensor(SmartyBinarySensor):
+    """Boost State Binary Sensor."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Alarm Sensor Init."""
+        super().__init__(name=f"{name} Boost State", device_class=None, smarty=smarty)
+
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_is_on = self._smarty.boost
+
+
+class AlarmSensor(SmartyBinarySensor):
+    """Alarm Binary Sensor."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Alarm Sensor Init."""
+        super().__init__(
+            name=f"{name} Alarm",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            smarty=smarty,
         )
 
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the binary sensor."""
-        return self.entity_description.value_fn(self.coordinator.client)
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_is_on = self._smarty.alarm
+
+
+class WarningSensor(SmartyBinarySensor):
+    """Warning Sensor."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Warning Sensor Init."""
+        super().__init__(
+            name=f"{name} Warning",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            smarty=smarty,
+        )
+
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_is_on = self._smarty.warning
diff --git a/homeassistant/components/smarty/button.py b/homeassistant/components/smarty/button.py
deleted file mode 100644
index b8e31cf6fc8..00000000000
--- a/homeassistant/components/smarty/button.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Platform to control a Salda Smarty XP/XV ventilation unit."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-import logging
-from typing import Any
-
-from pysmarty2 import Smarty
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .coordinator import SmartyConfigEntry, SmartyCoordinator
-from .entity import SmartyEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmartyButtonDescription(ButtonEntityDescription):
-    """Class describing Smarty button."""
-
-    press_fn: Callable[[Smarty], bool | None]
-
-
-ENTITIES: tuple[SmartyButtonDescription, ...] = (
-    SmartyButtonDescription(
-        key="reset_filters_timer",
-        translation_key="reset_filters_timer",
-        press_fn=lambda smarty: smarty.reset_filters_timer(),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: SmartyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Smarty Button Platform."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        SmartyButton(coordinator, description) for description in ENTITIES
-    )
-
-
-class SmartyButton(SmartyEntity, ButtonEntity):
-    """Representation of a Smarty Button."""
-
-    entity_description: SmartyButtonDescription
-
-    def __init__(
-        self,
-        coordinator: SmartyCoordinator,
-        entity_description: SmartyButtonDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._attr_unique_id = (
-            f"{coordinator.config_entry.entry_id}_{entity_description.key}"
-        )
-
-    async def async_press(self, **kwargs: Any) -> None:
-        """Press the button."""
-        await self.hass.async_add_executor_job(
-            self.entity_description.press_fn, self.coordinator.client
-        )
-        await self.coordinator.async_refresh()
diff --git a/homeassistant/components/smarty/config_flow.py b/homeassistant/components/smarty/config_flow.py
deleted file mode 100644
index 9a55356a990..00000000000
--- a/homeassistant/components/smarty/config_flow.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""Config flow for Smarty integration."""
-
-from typing import Any
-
-from pysmarty2 import Smarty
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_NAME
-
-from .const import DOMAIN
-
-
-class SmartyConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Smarty config flow."""
-
-    def _test_connection(self, host: str) -> str | None:
-        """Test the connection to the Smarty API."""
-        smarty = Smarty(host=host)
-        try:
-            if smarty.update():
-                return None
-        except Exception:  # noqa: BLE001
-            return "unknown"
-        else:
-            return "cannot_connect"
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initialized by the user."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            self._async_abort_entries_match(user_input)
-            error = await self.hass.async_add_executor_job(
-                self._test_connection, user_input[CONF_HOST]
-            )
-            if not error:
-                return self.async_create_entry(
-                    title=user_input[CONF_HOST], data=user_input
-                )
-            errors["base"] = error
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
-            errors=errors,
-        )
-
-    async def async_step_import(
-        self, import_config: dict[str, Any]
-    ) -> ConfigFlowResult:
-        """Handle a flow initialized by import."""
-        error = await self.hass.async_add_executor_job(
-            self._test_connection, import_config[CONF_HOST]
-        )
-        if not error:
-            return self.async_create_entry(
-                title=import_config[CONF_NAME],
-                data={CONF_HOST: import_config[CONF_HOST]},
-            )
-        return self.async_abort(reason=error)
diff --git a/homeassistant/components/smarty/const.py b/homeassistant/components/smarty/const.py
deleted file mode 100644
index 926c4233750..00000000000
--- a/homeassistant/components/smarty/const.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Constants for the Smarty component."""
-
-DOMAIN = "smarty"
diff --git a/homeassistant/components/smarty/coordinator.py b/homeassistant/components/smarty/coordinator.py
deleted file mode 100644
index d7f3e2452d1..00000000000
--- a/homeassistant/components/smarty/coordinator.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""Smarty Coordinator."""
-
-from datetime import timedelta
-import logging
-
-from pysmarty2 import Smarty
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-_LOGGER = logging.getLogger(__name__)
-
-type SmartyConfigEntry = ConfigEntry[SmartyCoordinator]
-
-
-class SmartyCoordinator(DataUpdateCoordinator[None]):
-    """Smarty Coordinator."""
-
-    config_entry: SmartyConfigEntry
-    software_version: str
-    configuration_version: str
-
-    def __init__(self, hass: HomeAssistant) -> None:
-        """Initialize."""
-        super().__init__(
-            hass,
-            logger=_LOGGER,
-            name="Smarty",
-            update_interval=timedelta(seconds=30),
-        )
-        self.client = Smarty(host=self.config_entry.data[CONF_HOST])
-
-    async def _async_setup(self) -> None:
-        if not await self.hass.async_add_executor_job(self.client.update):
-            raise UpdateFailed("Failed to update Smarty data")
-        self.software_version = self.client.get_software_version()
-        self.configuration_version = self.client.get_configuration_version()
-
-    async def _async_update_data(self) -> None:
-        """Fetch data from Smarty."""
-        if not await self.hass.async_add_executor_job(self.client.update):
-            raise UpdateFailed("Failed to update Smarty data")
diff --git a/homeassistant/components/smarty/entity.py b/homeassistant/components/smarty/entity.py
deleted file mode 100644
index d26b56d489f..00000000000
--- a/homeassistant/components/smarty/entity.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""Smarty Entity class."""
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from . import DOMAIN
-from .coordinator import SmartyCoordinator
-
-
-class SmartyEntity(CoordinatorEntity[SmartyCoordinator]):
-    """Representation of a Smarty Entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: SmartyCoordinator) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
-            manufacturer="Salda",
-            sw_version=self.coordinator.software_version,
-            hw_version=self.coordinator.configuration_version,
-        )
diff --git a/homeassistant/components/smarty/fan.py b/homeassistant/components/smarty/fan.py
index 378585a33e1..a2d72250197 100644
--- a/homeassistant/components/smarty/fan.py
+++ b/homeassistant/components/smarty/fan.py
@@ -6,19 +6,21 @@ import logging
 import math
 from typing import Any
 
+from pysmarty2 import Smarty
+
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 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 homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
     ranged_value_to_percentage,
 )
 from homeassistant.util.scaling import int_states_in_range
 
-from . import SmartyConfigEntry
-from .coordinator import SmartyCoordinator
-from .entity import SmartyEntity
+from . import DOMAIN, SIGNAL_UPDATE_SMARTY
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,23 +28,24 @@ DEFAULT_ON_PERCENTAGE = 66
 SPEED_RANGE = (1, 3)  # off is not included
 
 
-async def async_setup_entry(
+async def async_setup_platform(
     hass: HomeAssistant,
-    entry: SmartyConfigEntry,
+    config: ConfigType,
     async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Smarty Fan Platform."""
+    smarty: Smarty = hass.data[DOMAIN]["api"]
+    name: str = hass.data[DOMAIN]["name"]
 
-    coordinator = entry.runtime_data
-
-    async_add_entities([SmartyFan(coordinator)])
+    async_add_entities([SmartyFan(name, smarty)], True)
 
 
-class SmartyFan(SmartyEntity, FanEntity):
+class SmartyFan(FanEntity):
     """Representation of a Smarty Fan."""
 
-    _attr_name = None
-    _attr_translation_key = "fan"
+    _attr_icon = "mdi:air-conditioner"
+    _attr_should_poll = False
     _attr_supported_features = (
         FanEntityFeature.SET_SPEED
         | FanEntityFeature.TURN_OFF
@@ -50,12 +53,11 @@ class SmartyFan(SmartyEntity, FanEntity):
     )
     _enable_turn_on_off_backwards_compatibility = False
 
-    def __init__(self, coordinator: SmartyCoordinator) -> None:
+    def __init__(self, name, smarty):
         """Initialize the entity."""
-        super().__init__(coordinator)
+        self._attr_name = name
         self._smarty_fan_speed = 0
-        self._smarty = coordinator.client
-        self._attr_unique_id = coordinator.config_entry.entry_id
+        self._smarty = smarty
 
     @property
     def is_on(self) -> bool:
@@ -109,8 +111,17 @@ class SmartyFan(SmartyEntity, FanEntity):
         self._smarty_fan_speed = 0
         self.schedule_update_ha_state()
 
+    async def async_added_to_hass(self) -> None:
+        """Call to update fan."""
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass, SIGNAL_UPDATE_SMARTY, self._update_callback
+            )
+        )
+
     @callback
-    def _handle_coordinator_update(self) -> None:
+    def _update_callback(self) -> None:
         """Call update method."""
+        _LOGGER.debug("Updating state")
         self._smarty_fan_speed = self._smarty.fan_speed
-        super()._handle_coordinator_update()
+        self.async_write_ha_state()
diff --git a/homeassistant/components/smarty/icons.json b/homeassistant/components/smarty/icons.json
deleted file mode 100644
index 97e74199f0a..00000000000
--- a/homeassistant/components/smarty/icons.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "entity": {
-    "fan": {
-      "fan": {
-        "default": "mdi:air-conditioner"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/smarty/manifest.json b/homeassistant/components/smarty/manifest.json
index ca3133d8add..b83319b6744 100644
--- a/homeassistant/components/smarty/manifest.json
+++ b/homeassistant/components/smarty/manifest.json
@@ -2,7 +2,6 @@
   "domain": "smarty",
   "name": "Salda Smarty",
   "codeowners": ["@z0mbieprocess"],
-  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/smarty",
   "integration_type": "hub",
   "iot_class": "local_polling",
diff --git a/homeassistant/components/smarty/sensor.py b/homeassistant/components/smarty/sensor.py
index 9d847003a59..3c6873611b4 100644
--- a/homeassistant/components/smarty/sensor.py
+++ b/homeassistant/components/smarty/sensor.py
@@ -2,118 +2,182 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
-from dataclasses import dataclass
-from datetime import datetime, timedelta
+import datetime as dt
 import logging
 
 from pysmarty2 import Smarty
 
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-)
-from homeassistant.const import REVOLUTIONS_PER_MINUTE, UnitOfTemperature
-from homeassistant.core import HomeAssistant
+from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.const import UnitOfTemperature
+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
 import homeassistant.util.dt as dt_util
 
-from .coordinator import SmartyConfigEntry, SmartyCoordinator
-from .entity import SmartyEntity
+from . import DOMAIN, SIGNAL_UPDATE_SMARTY
 
 _LOGGER = logging.getLogger(__name__)
 
 
-def get_filter_days_left(smarty: Smarty) -> datetime | None:
-    """Return the date when the filter needs to be replaced."""
-    if (days_left := smarty.filter_timer) is not None:
-        return dt_util.now() + timedelta(days=days_left)
-    return None
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmartySensorDescription(SensorEntityDescription):
-    """Class describing Smarty sensor."""
-
-    value_fn: Callable[[Smarty], float | datetime | None]
-
-
-ENTITIES: tuple[SmartySensorDescription, ...] = (
-    SmartySensorDescription(
-        key="supply_air_temperature",
-        translation_key="supply_air_temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda smarty: smarty.supply_air_temperature,
-    ),
-    SmartySensorDescription(
-        key="extract_air_temperature",
-        translation_key="extract_air_temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda smarty: smarty.extract_air_temperature,
-    ),
-    SmartySensorDescription(
-        key="outdoor_air_temperature",
-        translation_key="outdoor_air_temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda smarty: smarty.outdoor_air_temperature,
-    ),
-    SmartySensorDescription(
-        key="supply_fan_speed",
-        translation_key="supply_fan_speed",
-        native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
-        value_fn=lambda smarty: smarty.supply_fan_speed,
-    ),
-    SmartySensorDescription(
-        key="extract_fan_speed",
-        translation_key="extract_fan_speed",
-        native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
-        value_fn=lambda smarty: smarty.extract_fan_speed,
-    ),
-    SmartySensorDescription(
-        key="filter_days_left",
-        translation_key="filter_days_left",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=get_filter_days_left,
-    ),
-)
-
-
-async def async_setup_entry(
+async def async_setup_platform(
     hass: HomeAssistant,
-    entry: SmartyConfigEntry,
+    config: ConfigType,
     async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Smarty Sensor Platform."""
+    smarty: Smarty = hass.data[DOMAIN]["api"]
+    name: str = hass.data[DOMAIN]["name"]
 
-    coordinator = entry.runtime_data
+    sensors = [
+        SupplyAirTemperatureSensor(name, smarty),
+        ExtractAirTemperatureSensor(name, smarty),
+        OutdoorAirTemperatureSensor(name, smarty),
+        SupplyFanSpeedSensor(name, smarty),
+        ExtractFanSpeedSensor(name, smarty),
+        FilterDaysLeftSensor(name, smarty),
+    ]
 
-    async_add_entities(
-        SmartySensor(coordinator, description) for description in ENTITIES
-    )
+    async_add_entities(sensors, True)
 
 
-class SmartySensor(SmartyEntity, SensorEntity):
+class SmartySensor(SensorEntity):
     """Representation of a Smarty Sensor."""
 
-    entity_description: SmartySensorDescription
+    _attr_should_poll = False
 
     def __init__(
         self,
-        coordinator: SmartyCoordinator,
-        entity_description: SmartySensorDescription,
+        name: str,
+        device_class: SensorDeviceClass | None,
+        smarty: Smarty,
+        unit_of_measurement: str | None,
     ) -> None:
         """Initialize the entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._attr_unique_id = (
-            f"{coordinator.config_entry.entry_id}_{entity_description.key}"
+        self._attr_name = name
+        self._attr_native_value = None
+        self._attr_device_class = device_class
+        self._attr_native_unit_of_measurement = unit_of_measurement
+        self._smarty = smarty
+
+    async def async_added_to_hass(self) -> None:
+        """Call to update."""
+        async_dispatcher_connect(self.hass, SIGNAL_UPDATE_SMARTY, self._update_callback)
+
+    @callback
+    def _update_callback(self) -> None:
+        """Call update method."""
+        self.async_schedule_update_ha_state(True)
+
+
+class SupplyAirTemperatureSensor(SmartySensor):
+    """Supply Air Temperature Sensor."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Supply Air Temperature Init."""
+        super().__init__(
+            name=f"{name} Supply Air Temperature",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            unit_of_measurement=UnitOfTemperature.CELSIUS,
+            smarty=smarty,
         )
 
-    @property
-    def native_value(self) -> float | datetime | None:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator.client)
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_native_value = self._smarty.supply_air_temperature
+
+
+class ExtractAirTemperatureSensor(SmartySensor):
+    """Extract Air Temperature Sensor."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Supply Air Temperature Init."""
+        super().__init__(
+            name=f"{name} Extract Air Temperature",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            unit_of_measurement=UnitOfTemperature.CELSIUS,
+            smarty=smarty,
+        )
+
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_native_value = self._smarty.extract_air_temperature
+
+
+class OutdoorAirTemperatureSensor(SmartySensor):
+    """Extract Air Temperature Sensor."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Outdoor Air Temperature Init."""
+        super().__init__(
+            name=f"{name} Outdoor Air Temperature",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            unit_of_measurement=UnitOfTemperature.CELSIUS,
+            smarty=smarty,
+        )
+
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_native_value = self._smarty.outdoor_air_temperature
+
+
+class SupplyFanSpeedSensor(SmartySensor):
+    """Supply Fan Speed RPM."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Supply Fan Speed RPM Init."""
+        super().__init__(
+            name=f"{name} Supply Fan Speed",
+            device_class=None,
+            unit_of_measurement=None,
+            smarty=smarty,
+        )
+
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_native_value = self._smarty.supply_fan_speed
+
+
+class ExtractFanSpeedSensor(SmartySensor):
+    """Extract Fan Speed RPM."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Extract Fan Speed RPM Init."""
+        super().__init__(
+            name=f"{name} Extract Fan Speed",
+            device_class=None,
+            unit_of_measurement=None,
+            smarty=smarty,
+        )
+
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        self._attr_native_value = self._smarty.extract_fan_speed
+
+
+class FilterDaysLeftSensor(SmartySensor):
+    """Filter Days Left."""
+
+    def __init__(self, name: str, smarty: Smarty) -> None:
+        """Filter Days Left Init."""
+        super().__init__(
+            name=f"{name} Filter Days Left",
+            device_class=SensorDeviceClass.TIMESTAMP,
+            unit_of_measurement=None,
+            smarty=smarty,
+        )
+        self._days_left = 91
+
+    def update(self) -> None:
+        """Update state."""
+        _LOGGER.debug("Updating sensor %s", self._attr_name)
+        days_left = self._smarty.filter_timer
+        if days_left is not None and days_left != self._days_left:
+            self._attr_native_value = dt_util.now() + dt.timedelta(days=days_left)
+            self._days_left = days_left
diff --git a/homeassistant/components/smarty/strings.json b/homeassistant/components/smarty/strings.json
deleted file mode 100644
index 341a300a26e..00000000000
--- a/homeassistant/components/smarty/strings.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "config": {
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the Smarty device"
-        }
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    }
-  },
-  "issues": {
-    "deprecated_yaml_import_issue_unknown": {
-      "title": "YAML import failed with unknown error",
-      "description": "Configuring {integration_title} using YAML is being removed but there was an unknown error while importing your existing configuration.\nSetup will not proceed.\n\nVerify that your {integration_title} is operating correctly and restart Home Assistant to attempt the import again.\n\nAlternatively, you may remove the `{domain}` configuration from your configuration.yaml entirely, restart Home Assistant, and add the {integration_title} integration manually."
-    },
-    "deprecated_yaml_import_issue_auth_error": {
-      "title": "YAML import failed due to an authentication error",
-      "description": "Configuring {integration_title} using YAML is being removed but there was an authentication error while importing your existing configuration.\nSetup will not proceed.\n\nVerify that your {integration_title} is operating correctly and restart Home Assistant to attempt the import again.\n\nAlternatively, you may remove the `{domain}` configuration from your configuration.yaml entirely, restart Home Assistant, and add the {integration_title} integration manually."
-    },
-    "deprecated_yaml_import_issue_cannot_connect": {
-      "title": "YAML import failed due to a connection error",
-      "description": "Configuring {integration_title} using YAML is being removed but there was a connect error while importing your existing configuration.\nSetup will not proceed.\n\nVerify that your {integration_title} is operating correctly and restart Home Assistant to attempt the import again.\n\nAlternatively, you may remove the `{domain}` configuration from your configuration.yaml entirely, restart Home Assistant, and add the {integration_title} integration manually."
-    }
-  },
-  "entity": {
-    "binary_sensor": {
-      "alarm": {
-        "name": "Alarm"
-      },
-      "warning": {
-        "name": "Warning"
-      },
-      "boost_state": {
-        "name": "Boost state"
-      }
-    },
-    "button": {
-      "reset_filters_timer": {
-        "name": "Reset filters timer"
-      }
-    },
-    "sensor": {
-      "supply_air_temperature": {
-        "name": "Supply air temperature"
-      },
-      "extract_air_temperature": {
-        "name": "Extract air temperature"
-      },
-      "outdoor_air_temperature": {
-        "name": "Outdoor air temperature"
-      },
-      "supply_fan_speed": {
-        "name": "Supply fan speed"
-      },
-      "extract_fan_speed": {
-        "name": "Extract fan speed"
-      },
-      "filter_days_left": {
-        "name": "Filter days left"
-      }
-    },
-    "switch": {
-      "boost": {
-        "name": "Boost"
-      }
-    }
-  }
-}
diff --git a/homeassistant/components/smarty/switch.py b/homeassistant/components/smarty/switch.py
deleted file mode 100644
index bf5fe80db44..00000000000
--- a/homeassistant/components/smarty/switch.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Platform to control a Salda Smarty XP/XV ventilation unit."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-import logging
-from typing import Any
-
-from pysmarty2 import Smarty
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .coordinator import SmartyConfigEntry, SmartyCoordinator
-from .entity import SmartyEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmartySwitchDescription(SwitchEntityDescription):
-    """Class describing Smarty switch."""
-
-    is_on_fn: Callable[[Smarty], bool]
-    turn_on_fn: Callable[[Smarty], bool | None]
-    turn_off_fn: Callable[[Smarty], bool | None]
-
-
-ENTITIES: tuple[SmartySwitchDescription, ...] = (
-    SmartySwitchDescription(
-        key="boost",
-        translation_key="boost",
-        is_on_fn=lambda smarty: smarty.boost,
-        turn_on_fn=lambda smarty: smarty.enable_boost(),
-        turn_off_fn=lambda smarty: smarty.disable_boost(),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: SmartyConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Smarty Switch Platform."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        SmartySwitch(coordinator, description) for description in ENTITIES
-    )
-
-
-class SmartySwitch(SmartyEntity, SwitchEntity):
-    """Representation of a Smarty Switch."""
-
-    entity_description: SmartySwitchDescription
-
-    def __init__(
-        self,
-        coordinator: SmartyCoordinator,
-        entity_description: SmartySwitchDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._attr_unique_id = (
-            f"{coordinator.config_entry.entry_id}_{entity_description.key}"
-        )
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the switch."""
-        return self.entity_description.is_on_fn(self.coordinator.client)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        await self.hass.async_add_executor_job(
-            self.entity_description.turn_on_fn, self.coordinator.client
-        )
-        await self.coordinator.async_refresh()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        await self.hass.async_add_executor_job(
-            self.entity_description.turn_off_fn, self.coordinator.client
-        )
-        await self.coordinator.async_refresh()
diff --git a/homeassistant/components/smlight/update.py b/homeassistant/components/smlight/update.py
index 147b1d766ef..cb28a197860 100644
--- a/homeassistant/components/smlight/update.py
+++ b/homeassistant/components/smlight/update.py
@@ -23,7 +23,6 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import SmConfigEntry
-from .const import LOGGER
 from .coordinator import SmFirmwareUpdateCoordinator, SmFwData
 from .entity import SmEntity
 
@@ -154,21 +153,19 @@ class SmUpdateEntity(SmEntity, UpdateEntity):
         """Update install progress on event."""
 
         progress = int(progress.data)
-        self._attr_update_percentage = progress
-        self.async_write_ha_state()
+        if progress > 1:
+            self._attr_in_progress = progress
+            self.async_write_ha_state()
 
     def _update_done(self) -> None:
         """Handle cleanup for update done."""
         self._finished_event.set()
+        self.coordinator.in_progress = False
 
         for remove_cb in self._unload:
             remove_cb()
         self._unload.clear()
 
-        self._attr_in_progress = False
-        self._attr_update_percentage = None
-        self.async_write_ha_state()
-
     @callback
     def _update_finished(self, event: MessageEvent) -> None:
         """Handle event for update finished."""
@@ -178,7 +175,7 @@ class SmUpdateEntity(SmEntity, UpdateEntity):
     @callback
     def _update_failed(self, event: MessageEvent) -> None:
         self._update_done()
-        self.coordinator.in_progress = False
+
         raise HomeAssistantError(f"Update failed for {self.name}")
 
     async def async_install(
@@ -189,7 +186,6 @@ class SmUpdateEntity(SmEntity, UpdateEntity):
         if not self.coordinator.in_progress and self._firmware:
             self.coordinator.in_progress = True
             self._attr_in_progress = True
-            self._attr_update_percentage = None
             self.register_callbacks()
 
             await self.coordinator.client.fw_update(self._firmware)
@@ -197,20 +193,5 @@ class SmUpdateEntity(SmEntity, UpdateEntity):
             # block until update finished event received
             await self._finished_event.wait()
 
-            # allow time for SLZB-06 to reboot before updating coordinator data
-            try:
-                async with asyncio.timeout(180):
-                    while (
-                        self.coordinator.in_progress
-                        and self.installed_version != self._firmware.ver
-                    ):
-                        await self.coordinator.async_refresh()
-                        await asyncio.sleep(1)
-            except TimeoutError:
-                LOGGER.warning(
-                    "Timeout waiting for %s to reboot after update",
-                    self.coordinator.data.info.hostname,
-                )
-
-            self.coordinator.in_progress = False
+            await self.coordinator.async_refresh()
             self._finished_event.clear()
diff --git a/homeassistant/components/solarlog/coordinator.py b/homeassistant/components/solarlog/coordinator.py
index 5fdf89c9e74..51199ab7051 100644
--- a/homeassistant/components/solarlog/coordinator.py
+++ b/homeassistant/components/solarlog/coordinator.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
 from datetime import timedelta
 import logging
 from typing import TYPE_CHECKING
@@ -19,11 +18,7 @@ from solarlog_cli.solarlog_models import SolarlogData
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import slugify
-
-from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -40,9 +35,6 @@ class SolarLogCoordinator(DataUpdateCoordinator[SolarlogData]):
             hass, _LOGGER, name="SolarLog", update_interval=timedelta(seconds=60)
         )
 
-        self.new_device_callbacks: list[Callable[[int], None]] = []
-        self._devices_last_update: set[tuple[int, str]] = set()
-
         host_entry = entry.data[CONF_HOST]
         password = entry.data.get("password", "")
 
@@ -65,8 +57,7 @@ class SolarLogCoordinator(DataUpdateCoordinator[SolarlogData]):
         _LOGGER.debug("Start async_setup")
         logged_in = False
         if self.solarlog.password != "":
-            if logged_in := await self.renew_authentication():
-                await self.solarlog.test_extended_data_available()
+            logged_in = await self.renew_authentication()
         if logged_in or await self.solarlog.test_extended_data_available():
             device_list = await self.solarlog.update_device_list()
             self.solarlog.set_enabled_devices({key: True for key in device_list})
@@ -93,55 +84,8 @@ class SolarLogCoordinator(DataUpdateCoordinator[SolarlogData]):
 
         _LOGGER.debug("Data successfully updated")
 
-        if self.solarlog.extended_data:
-            self._async_add_remove_devices(data)
-            _LOGGER.debug("Add_remove_devices finished")
-
         return data
 
-    def _async_add_remove_devices(self, data: SolarlogData) -> None:
-        """Add new devices, remove non-existing devices."""
-        if (
-            current_devices := {
-                (k, self.solarlog.device_name(k)) for k in data.inverter_data
-            }
-        ) == self._devices_last_update:
-            return
-
-        # remove old devices
-        if removed_devices := self._devices_last_update - current_devices:
-            _LOGGER.debug("Removed device(s): %s", ", ".join(map(str, removed_devices)))
-            device_registry = dr.async_get(self.hass)
-
-            for removed_device in removed_devices:
-                device_name = ""
-                for did, dn in self._devices_last_update:
-                    if did == removed_device[0]:
-                        device_name = dn
-                        break
-                if device := device_registry.async_get_device(
-                    identifiers={
-                        (
-                            DOMAIN,
-                            f"{self.unique_id}_{slugify(device_name)}",
-                        )
-                    }
-                ):
-                    device_registry.async_update_device(
-                        device_id=device.id,
-                        remove_config_entry_id=self.unique_id,
-                    )
-                    _LOGGER.debug("Device removed from device registry: %s", device.id)
-
-        # add new devices
-        if new_devices := current_devices - self._devices_last_update:
-            _LOGGER.debug("New device(s) found: %s", ", ".join(map(str, new_devices)))
-            for device_id in new_devices:
-                for callback in self.new_device_callbacks:
-                    callback(device_id[0])
-
-        self._devices_last_update = current_devices
-
     async def renew_authentication(self) -> bool:
         """Renew access token for SolarLog API."""
         logged_in = False
diff --git a/homeassistant/components/solarlog/sensor.py b/homeassistant/components/solarlog/sensor.py
index bcff5d57e1b..91e18da1cb2 100644
--- a/homeassistant/components/solarlog/sensor.py
+++ b/homeassistant/components/solarlog/sensor.py
@@ -87,7 +87,6 @@ SOLARLOG_SENSOR_TYPES: tuple[SolarLogCoordinatorSensorEntityDescription, ...] =
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
         suggested_display_precision=3,
         value_fn=lambda data: data.yield_day,
     ),
@@ -106,7 +105,6 @@ SOLARLOG_SENSOR_TYPES: tuple[SolarLogCoordinatorSensorEntityDescription, ...] =
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
         suggested_display_precision=3,
         value_fn=lambda data: data.yield_month,
     ),
@@ -116,7 +114,6 @@ SOLARLOG_SENSOR_TYPES: tuple[SolarLogCoordinatorSensorEntityDescription, ...] =
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
         value_fn=lambda data: data.yield_year,
     ),
     SolarLogCoordinatorSensorEntityDescription(
@@ -143,7 +140,6 @@ SOLARLOG_SENSOR_TYPES: tuple[SolarLogCoordinatorSensorEntityDescription, ...] =
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
         suggested_display_precision=3,
         value_fn=lambda data: data.consumption_day,
     ),
@@ -162,7 +158,6 @@ SOLARLOG_SENSOR_TYPES: tuple[SolarLogCoordinatorSensorEntityDescription, ...] =
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
         suggested_display_precision=3,
         value_fn=lambda data: data.consumption_month,
     ),
@@ -172,7 +167,6 @@ SOLARLOG_SENSOR_TYPES: tuple[SolarLogCoordinatorSensorEntityDescription, ...] =
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
         suggested_display_precision=3,
         value_fn=lambda data: data.consumption_year,
     ),
@@ -199,7 +193,6 @@ SOLARLOG_SENSOR_TYPES: tuple[SolarLogCoordinatorSensorEntityDescription, ...] =
         translation_key="total_power",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.total_power,
     ),
     SolarLogCoordinatorSensorEntityDescription(
@@ -254,9 +247,7 @@ INVERTER_SENSOR_TYPES: tuple[SolarLogInverterSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        value_fn=(
-            lambda inverter: None if inverter is None else inverter.current_power
-        ),
+        value_fn=lambda inverter: inverter.current_power,
     ),
     SolarLogInverterSensorEntityDescription(
         key="consumption_year",
@@ -264,10 +255,11 @@ INVERTER_SENSOR_TYPES: tuple[SolarLogInverterSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
         suggested_display_precision=3,
         value_fn=(
-            lambda inverter: None if inverter is None else inverter.consumption_year
+            lambda inverter: None
+            if inverter.consumption_year is None
+            else inverter.consumption_year
         ),
     ),
 )
@@ -297,14 +289,6 @@ async def async_setup_entry(
 
     async_add_entities(entities)
 
-    def _async_add_new_device(device_id: int) -> None:
-        async_add_entities(
-            SolarLogInverterSensor(coordinator, sensor, device_id)
-            for sensor in INVERTER_SENSOR_TYPES
-        )
-
-    coordinator.new_device_callbacks.append(_async_add_new_device)
-
 
 class SolarLogCoordinatorSensor(SolarLogCoordinatorEntity, SensorEntity):
     """Represents a SolarLog sensor."""
diff --git a/homeassistant/components/solax/__init__.py b/homeassistant/components/solax/__init__.py
index 3b9df623559..253f3b55e0a 100644
--- a/homeassistant/components/solax/__init__.py
+++ b/homeassistant/components/solax/__init__.py
@@ -54,7 +54,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: SolaxConfigEntry) -> boo
     coordinator = SolaxDataUpdateCoordinator(
         hass,
         logger=_LOGGER,
-        config_entry=entry,
         name=f"solax {entry.title}",
         update_interval=SCAN_INTERVAL,
         update_method=_async_update,
diff --git a/homeassistant/components/somfy_mylink/config_flow.py b/homeassistant/components/somfy_mylink/config_flow.py
index c2d85160175..705db43362e 100644
--- a/homeassistant/components/somfy_mylink/config_flow.py
+++ b/homeassistant/components/somfy_mylink/config_flow.py
@@ -130,6 +130,7 @@ class OptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self.options = deepcopy(dict(config_entry.options))
         self._target_id: str | None = None
 
diff --git a/homeassistant/components/sonarr/config_flow.py b/homeassistant/components/sonarr/config_flow.py
index e1cedba10e7..1c1d02638d8 100644
--- a/homeassistant/components/sonarr/config_flow.py
+++ b/homeassistant/components/sonarr/config_flow.py
@@ -63,7 +63,7 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> SonarrOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return SonarrOptionsFlowHandler()
+        return SonarrOptionsFlowHandler(config_entry)
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
@@ -93,13 +93,6 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
         errors = {}
 
         if user_input is not None:
-            # aiopyarr defaults to the service port if one isn't given
-            # this is counter to standard practice where http = 80
-            # and https = 443.
-            if CONF_URL in user_input:
-                url = yarl.URL(user_input[CONF_URL])
-                user_input[CONF_URL] = f"{url.scheme}://{url.host}:{url.port}{url.path}"
-
             if self.source == SOURCE_REAUTH:
                 user_input = {**self._get_reauth_entry().data, **user_input}
 
@@ -155,6 +148,10 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
 class SonarrOptionsFlowHandler(OptionsFlow):
     """Handle Sonarr client options."""
 
+    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, int] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/sonos/manifest.json b/homeassistant/components/sonos/manifest.json
index 76a7d0bfa91..d6c5eb298d8 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.30.6", "sonos-websocket==0.1.3"],
+  "requirements": ["soco==0.30.4", "sonos-websocket==0.1.3"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:ZonePlayer:1"
diff --git a/homeassistant/components/spc/alarm_control_panel.py b/homeassistant/components/spc/alarm_control_panel.py
index 44e0572c9e9..7e584ff5e63 100644
--- a/homeassistant/components/spc/alarm_control_panel.py
+++ b/homeassistant/components/spc/alarm_control_panel.py
@@ -9,7 +9,13 @@ from pyspcwebgw.const import AreaMode
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
+)
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -19,17 +25,17 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from . import DATA_API, SIGNAL_UPDATE_ALARM
 
 
-def _get_alarm_state(area: Area) -> AlarmControlPanelState | None:
+def _get_alarm_state(area: Area) -> str | None:
     """Get the alarm state."""
 
     if area.verified_alarm:
-        return AlarmControlPanelState.TRIGGERED
+        return STATE_ALARM_TRIGGERED
 
     mode_to_state = {
-        AreaMode.UNSET: AlarmControlPanelState.DISARMED,
-        AreaMode.PART_SET_A: AlarmControlPanelState.ARMED_HOME,
-        AreaMode.PART_SET_B: AlarmControlPanelState.ARMED_NIGHT,
-        AreaMode.FULL_SET: AlarmControlPanelState.ARMED_AWAY,
+        AreaMode.UNSET: STATE_ALARM_DISARMED,
+        AreaMode.PART_SET_A: STATE_ALARM_ARMED_HOME,
+        AreaMode.PART_SET_B: STATE_ALARM_ARMED_NIGHT,
+        AreaMode.FULL_SET: STATE_ALARM_ARMED_AWAY,
     }
     return mode_to_state.get(area.mode)
 
@@ -85,7 +91,7 @@ class SpcAlarm(AlarmControlPanelEntity):
         return self._area.last_changed_by
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         return _get_alarm_state(self._area)
 
diff --git a/homeassistant/components/speedtestdotnet/__init__.py b/homeassistant/components/speedtestdotnet/__init__.py
index e4c51ab7aa0..aed1cce33db 100644
--- a/homeassistant/components/speedtestdotnet/__init__.py
+++ b/homeassistant/components/speedtestdotnet/__init__.py
@@ -6,7 +6,7 @@ from functools import partial
 
 import speedtest
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -35,10 +35,7 @@ async def async_setup_entry(
 
     async def _async_finish_startup(hass: HomeAssistant) -> None:
         """Run this only when HA has finished its startup."""
-        if config_entry.state is ConfigEntryState.LOADED:
-            await coordinator.async_refresh()
-        else:
-            await coordinator.async_config_entry_first_refresh()
+        await coordinator.async_config_entry_first_refresh()
 
     # Don't start a speedtest during startup
     async_at_started(hass, _async_finish_startup)
diff --git a/homeassistant/components/speedtestdotnet/config_flow.py b/homeassistant/components/speedtestdotnet/config_flow.py
index 3bfd4eb6e4a..dc64448bbef 100644
--- a/homeassistant/components/speedtestdotnet/config_flow.py
+++ b/homeassistant/components/speedtestdotnet/config_flow.py
@@ -30,7 +30,7 @@ class SpeedTestFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: SpeedTestConfigEntry,
     ) -> SpeedTestOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return SpeedTestOptionsFlowHandler()
+        return SpeedTestOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -48,8 +48,9 @@ class SpeedTestFlowHandler(ConfigFlow, domain=DOMAIN):
 class SpeedTestOptionsFlowHandler(OptionsFlow):
     """Handle SpeedTest options."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: SpeedTestConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self._servers: dict = {}
 
     async def async_step_init(
diff --git a/homeassistant/components/spotify/__init__.py b/homeassistant/components/spotify/__init__.py
index cfcc9011b37..d05d376f67f 100644
--- a/homeassistant/components/spotify/__init__.py
+++ b/homeassistant/components/spotify/__init__.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .browse_media import async_browse_media
 from .const import DOMAIN, LOGGER, SPOTIFY_SCOPES
-from .coordinator import SpotifyConfigEntry, SpotifyCoordinator
+from .coordinator import SpotifyCoordinator
 from .models import SpotifyData
 from .util import (
     is_spotify_media_type,
@@ -40,6 +40,9 @@ __all__ = [
 ]
 
 
+type SpotifyConfigEntry = ConfigEntry[SpotifyData]
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: SpotifyConfigEntry) -> bool:
     """Set up Spotify from a config entry."""
     implementation = await async_get_config_entry_implementation(hass, entry)
@@ -77,7 +80,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: SpotifyConfigEntry) -> b
         hass,
         LOGGER,
         name=f"{entry.title} Devices",
-        config_entry=entry,
         update_interval=timedelta(minutes=5),
         update_method=_update_devices,
     )
diff --git a/homeassistant/components/spotify/coordinator.py b/homeassistant/components/spotify/coordinator.py
index 9e62d5f137e..556ad88127b 100644
--- a/homeassistant/components/spotify/coordinator.py
+++ b/homeassistant/components/spotify/coordinator.py
@@ -3,7 +3,6 @@
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import logging
-from typing import TYPE_CHECKING
 
 from spotifyaio import (
     ContextType,
@@ -16,22 +15,15 @@ from spotifyaio import (
 )
 from spotifyaio.models import AudioFeatures
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 import homeassistant.util.dt as dt_util
 
 from .const import DOMAIN
 
-if TYPE_CHECKING:
-    from .models import SpotifyData
-
 _LOGGER = logging.getLogger(__name__)
 
 
-type SpotifyConfigEntry = ConfigEntry[SpotifyData]
-
-
 @dataclass
 class SpotifyCoordinatorData:
     """Class to hold Spotify data."""
@@ -53,7 +45,6 @@ class SpotifyCoordinator(DataUpdateCoordinator[SpotifyCoordinatorData]):
     """Class to manage fetching Spotify data."""
 
     current_user: UserProfile
-    config_entry: SpotifyConfigEntry
 
     def __init__(self, hass: HomeAssistant, client: SpotifyClient) -> None:
         """Initialize."""
@@ -75,10 +66,7 @@ class SpotifyCoordinator(DataUpdateCoordinator[SpotifyCoordinatorData]):
             raise UpdateFailed("Error communicating with Spotify API") from err
 
     async def _async_update_data(self) -> SpotifyCoordinatorData:
-        try:
-            current = await self.client.get_playback()
-        except SpotifyConnectionError as err:
-            raise UpdateFailed("Error communicating with Spotify API") from err
+        current = await self.client.get_playback()
         if not current:
             return SpotifyCoordinatorData(
                 current_playback=None,
@@ -93,17 +81,8 @@ class SpotifyCoordinator(DataUpdateCoordinator[SpotifyCoordinatorData]):
         audio_features: AudioFeatures | None = None
         if (item := current.item) is not None and item.type == ItemType.TRACK:
             if item.uri != self._currently_loaded_track:
-                try:
-                    audio_features = await self.client.get_audio_features(item.uri)
-                except SpotifyConnectionError:
-                    _LOGGER.debug(
-                        "Unable to load audio features for track '%s'. "
-                        "Continuing without audio features",
-                        item.uri,
-                    )
-                    audio_features = None
-                else:
-                    self._currently_loaded_track = item.uri
+                self._currently_loaded_track = item.uri
+                audio_features = await self.client.get_audio_features(item.uri)
             else:
                 audio_features = self.data.audio_features
         dj_playlist = False
diff --git a/homeassistant/components/spotify/diagnostics.py b/homeassistant/components/spotify/diagnostics.py
index 82ce40eb22a..6acce72a951 100644
--- a/homeassistant/components/spotify/diagnostics.py
+++ b/homeassistant/components/spotify/diagnostics.py
@@ -7,7 +7,7 @@ from typing import Any
 
 from homeassistant.core import HomeAssistant
 
-from .coordinator import SpotifyConfigEntry
+from . import SpotifyConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/homeassistant/components/spotify/entity.py b/homeassistant/components/spotify/entity.py
deleted file mode 100644
index 6ab82977089..00000000000
--- a/homeassistant/components/spotify/entity.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""Base entity for Spotify."""
-
-from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import SpotifyCoordinator
-
-
-class SpotifyEntity(CoordinatorEntity[SpotifyCoordinator]):
-    """Defines a base Spotify entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: SpotifyCoordinator) -> None:
-        """Initialize the Spotify entity."""
-        super().__init__(coordinator)
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, coordinator.current_user.user_id)},
-            manufacturer="Spotify AB",
-            model=f"Spotify {coordinator.current_user.product}",
-            name=f"Spotify {coordinator.config_entry.title}",
-            entry_type=DeviceEntryType.SERVICE,
-            configuration_url="https://open.spotify.com",
-        )
diff --git a/homeassistant/components/spotify/icons.json b/homeassistant/components/spotify/icons.json
index e1b08127e43..00c63141eae 100644
--- a/homeassistant/components/spotify/icons.json
+++ b/homeassistant/components/spotify/icons.json
@@ -4,41 +4,6 @@
       "spotify": {
         "default": "mdi:spotify"
       }
-    },
-    "sensor": {
-      "song_tempo": {
-        "default": "mdi:metronome"
-      },
-      "danceability": {
-        "default": "mdi:dance-ballroom"
-      },
-      "energy": {
-        "default": "mdi:lightning-bolt"
-      },
-      "mode": {
-        "default": "mdi:music"
-      },
-      "speechiness": {
-        "default": "mdi:speaker-message"
-      },
-      "acousticness": {
-        "default": "mdi:guitar-acoustic"
-      },
-      "instrumentalness": {
-        "default": "mdi:guitar-electric"
-      },
-      "valence": {
-        "default": "mdi:emoticon-happy"
-      },
-      "liveness": {
-        "default": "mdi:music-note"
-      },
-      "time_signature": {
-        "default": "mdi:music-clef-treble"
-      },
-      "key": {
-        "default": "mdi:music-clef-treble"
-      }
     }
   }
 }
diff --git a/homeassistant/components/spotify/manifest.json b/homeassistant/components/spotify/manifest.json
index 8f8f7e0d588..f799f9d8ea5 100644
--- a/homeassistant/components/spotify/manifest.json
+++ b/homeassistant/components/spotify/manifest.json
@@ -9,6 +9,6 @@
   "iot_class": "cloud_polling",
   "loggers": ["spotipy"],
   "quality_scale": "silver",
-  "requirements": ["spotifyaio==0.8.8"],
+  "requirements": ["spotifyaio==0.7.1"],
   "zeroconf": ["_spotify-connect._tcp.local."]
 }
diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py
index 7687936fe4c..72c6d76eb96 100644
--- a/homeassistant/components/spotify/media_player.py
+++ b/homeassistant/components/spotify/media_player.py
@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-import asyncio
-from collections.abc import Awaitable, Callable, Coroutine
+from collections.abc import Callable
 import datetime as dt
 import logging
-from typing import TYPE_CHECKING, Any, Concatenate
+from typing import TYPE_CHECKING, Any
 
 from spotifyaio import (
     Device,
@@ -31,13 +30,17 @@ from homeassistant.components.media_player import (
     RepeatMode,
 )
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
+from . import SpotifyConfigEntry
 from .browse_media import async_browse_media_internal
-from .const import MEDIA_PLAYER_PREFIX, PLAYABLE_MEDIA_TYPES
-from .coordinator import SpotifyConfigEntry, SpotifyCoordinator
-from .entity import SpotifyEntity
+from .const import DOMAIN, MEDIA_PLAYER_PREFIX, PLAYABLE_MEDIA_TYPES
+from .coordinator import SpotifyCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -64,7 +67,6 @@ REPEAT_MODE_MAPPING_TO_HA = {
 REPEAT_MODE_MAPPING_TO_SPOTIFY = {
     value: key for key, value in REPEAT_MODE_MAPPING_TO_HA.items()
 }
-AFTER_REQUEST_SLEEP = 1
 
 
 async def async_setup_entry(
@@ -78,6 +80,8 @@ async def async_setup_entry(
     spotify = SpotifyMediaPlayer(
         data.coordinator,
         data.devices,
+        entry.unique_id,
+        entry.title,
     )
     async_add_entities([spotify])
 
@@ -95,22 +99,10 @@ def ensure_item[_R](
     return wrapper
 
 
-def async_refresh_after[_T: SpotifyEntity, **_P](
-    func: Callable[Concatenate[_T, _P], Awaitable[None]],
-) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, None]]:
-    """Define a wrapper to yield and refresh after."""
-
-    async def _async_wrap(self: _T, *args: _P.args, **kwargs: _P.kwargs) -> None:
-        await func(self, *args, **kwargs)
-        await asyncio.sleep(AFTER_REQUEST_SLEEP)
-        await self.coordinator.async_refresh()
-
-    return _async_wrap
-
-
-class SpotifyMediaPlayer(SpotifyEntity, MediaPlayerEntity):
+class SpotifyMediaPlayer(CoordinatorEntity[SpotifyCoordinator], MediaPlayerEntity):
     """Representation of a Spotify controller."""
 
+    _attr_has_entity_name = True
     _attr_media_image_remotely_accessible = False
     _attr_name = None
     _attr_translation_key = "spotify"
@@ -119,11 +111,23 @@ class SpotifyMediaPlayer(SpotifyEntity, MediaPlayerEntity):
         self,
         coordinator: SpotifyCoordinator,
         device_coordinator: DataUpdateCoordinator[list[Device]],
+        user_id: str,
+        name: str,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
         self.devices = device_coordinator
-        self._attr_unique_id = coordinator.current_user.user_id
+
+        self._attr_unique_id = user_id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, user_id)},
+            manufacturer="Spotify AB",
+            model=f"Spotify {coordinator.current_user.product}",
+            name=f"Spotify {name}",
+            entry_type=DeviceEntryType.SERVICE,
+            configuration_url="https://open.spotify.com",
+        )
 
     @property
     def currently_playing(self) -> PlaybackState | None:
@@ -282,37 +286,30 @@ class SpotifyMediaPlayer(SpotifyEntity, MediaPlayerEntity):
             return None
         return REPEAT_MODE_MAPPING_TO_HA.get(self.currently_playing.repeat_mode)
 
-    @async_refresh_after
     async def async_set_volume_level(self, volume: float) -> None:
         """Set the volume level."""
         await self.coordinator.client.set_volume(int(volume * 100))
 
-    @async_refresh_after
     async def async_media_play(self) -> None:
         """Start or resume playback."""
         await self.coordinator.client.start_playback()
 
-    @async_refresh_after
     async def async_media_pause(self) -> None:
         """Pause playback."""
         await self.coordinator.client.pause_playback()
 
-    @async_refresh_after
     async def async_media_previous_track(self) -> None:
         """Skip to previous track."""
         await self.coordinator.client.previous_track()
 
-    @async_refresh_after
     async def async_media_next_track(self) -> None:
         """Skip to next track."""
         await self.coordinator.client.next_track()
 
-    @async_refresh_after
     async def async_media_seek(self, position: float) -> None:
         """Send seek command."""
         await self.coordinator.client.seek_track(int(position * 1000))
 
-    @async_refresh_after
     async def async_play_media(
         self, media_type: MediaType | str, media_id: str, **kwargs: Any
     ) -> None:
@@ -356,7 +353,6 @@ class SpotifyMediaPlayer(SpotifyEntity, MediaPlayerEntity):
 
         await self.coordinator.client.start_playback(**kwargs)
 
-    @async_refresh_after
     async def async_select_source(self, source: str) -> None:
         """Select playback device."""
         for device in self.devices.data:
@@ -364,12 +360,10 @@ class SpotifyMediaPlayer(SpotifyEntity, MediaPlayerEntity):
                 await self.coordinator.client.transfer_playback(device.device_id)
                 return
 
-    @async_refresh_after
     async def async_set_shuffle(self, shuffle: bool) -> None:
         """Enable/Disable shuffle mode."""
         await self.coordinator.client.set_shuffle(state=shuffle)
 
-    @async_refresh_after
     async def async_set_repeat(self, repeat: RepeatMode) -> None:
         """Set repeat mode."""
         if repeat not in REPEAT_MODE_MAPPING_TO_SPOTIFY:
diff --git a/homeassistant/components/spotify/sensor.py b/homeassistant/components/spotify/sensor.py
index 3486a911b0d..bf3fd8b07d0 100644
--- a/homeassistant/components/spotify/sensor.py
+++ b/homeassistant/components/spotify/sensor.py
@@ -3,50 +3,23 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from spotifyaio.models import AudioFeatures, Key
+from spotifyaio.models import AudioFeatures
 
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-)
-from homeassistant.const import PERCENTAGE
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .coordinator import SpotifyConfigEntry, SpotifyCoordinator
-from .entity import SpotifyEntity
+from . import DOMAIN, SpotifyConfigEntry
+from .coordinator import SpotifyCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
 class SpotifyAudioFeaturesSensorEntityDescription(SensorEntityDescription):
     """Describes Spotify sensor entity."""
 
-    value_fn: Callable[[AudioFeatures], float | str | None]
-
-
-KEYS: dict[Key, str] = {
-    Key.C: "C",
-    Key.C_SHARP_D_FLAT: "C♯/D♭",
-    Key.D: "D",
-    Key.D_SHARP_E_FLAT: "D♯/E♭",
-    Key.E: "E",
-    Key.F: "F",
-    Key.F_SHARP_G_FLAT: "F♯/G♭",
-    Key.G: "G",
-    Key.G_SHARP_A_FLAT: "G♯/A♭",
-    Key.A: "A",
-    Key.A_SHARP_B_FLAT: "A♯/B♭",
-    Key.B: "B",
-}
-
-KEY_OPTIONS = list(KEYS.values())
-
-
-def _get_key(audio_features: AudioFeatures) -> str | None:
-    if audio_features.key is None:
-        return None
-    return KEYS[audio_features.key]
+    value_fn: Callable[[AudioFeatures], float]
 
 
 AUDIO_FEATURE_SENSORS: tuple[SpotifyAudioFeaturesSensorEntityDescription, ...] = (
@@ -57,86 +30,6 @@ AUDIO_FEATURE_SENSORS: tuple[SpotifyAudioFeaturesSensorEntityDescription, ...] =
         suggested_display_precision=0,
         value_fn=lambda audio_features: audio_features.tempo,
     ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="danceability",
-        translation_key="danceability",
-        native_unit_of_measurement=PERCENTAGE,
-        suggested_display_precision=0,
-        value_fn=lambda audio_features: audio_features.danceability * 100,
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="energy",
-        translation_key="energy",
-        native_unit_of_measurement=PERCENTAGE,
-        suggested_display_precision=0,
-        value_fn=lambda audio_features: audio_features.energy * 100,
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="mode",
-        translation_key="mode",
-        device_class=SensorDeviceClass.ENUM,
-        options=["major", "minor"],
-        value_fn=lambda audio_features: audio_features.mode.name.lower(),
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="speechiness",
-        translation_key="speechiness",
-        native_unit_of_measurement=PERCENTAGE,
-        suggested_display_precision=0,
-        value_fn=lambda audio_features: audio_features.speechiness * 100,
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="acousticness",
-        translation_key="acousticness",
-        native_unit_of_measurement=PERCENTAGE,
-        suggested_display_precision=0,
-        value_fn=lambda audio_features: audio_features.acousticness * 100,
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="instrumentalness",
-        translation_key="instrumentalness",
-        native_unit_of_measurement=PERCENTAGE,
-        suggested_display_precision=0,
-        value_fn=lambda audio_features: audio_features.instrumentalness * 100,
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="liveness",
-        translation_key="liveness",
-        native_unit_of_measurement=PERCENTAGE,
-        suggested_display_precision=0,
-        value_fn=lambda audio_features: audio_features.liveness * 100,
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="valence",
-        translation_key="valence",
-        native_unit_of_measurement=PERCENTAGE,
-        suggested_display_precision=0,
-        value_fn=lambda audio_features: audio_features.valence * 100,
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="time_signature",
-        translation_key="time_signature",
-        device_class=SensorDeviceClass.ENUM,
-        options=["3/4", "4/4", "5/4", "6/4", "7/4"],
-        value_fn=lambda audio_features: f"{audio_features.time_signature}/4",
-        entity_registry_enabled_default=False,
-    ),
-    SpotifyAudioFeaturesSensorEntityDescription(
-        key="key",
-        translation_key="key",
-        device_class=SensorDeviceClass.ENUM,
-        options=KEY_OPTIONS,
-        value_fn=_get_key,
-        entity_registry_enabled_default=False,
-    ),
 )
 
 
@@ -148,31 +41,44 @@ async def async_setup_entry(
     """Set up Spotify sensor based on a config entry."""
     coordinator = entry.runtime_data.coordinator
 
+    user_id = entry.unique_id
+
+    assert user_id is not None
+
     async_add_entities(
-        SpotifyAudioFeatureSensor(coordinator, description)
+        SpotifyAudioFeatureSensor(coordinator, description, user_id, entry.title)
         for description in AUDIO_FEATURE_SENSORS
     )
 
 
-class SpotifyAudioFeatureSensor(SpotifyEntity, SensorEntity):
+class SpotifyAudioFeatureSensor(CoordinatorEntity[SpotifyCoordinator], SensorEntity):
     """Representation of a Spotify sensor."""
 
+    _attr_has_entity_name = True
     entity_description: SpotifyAudioFeaturesSensorEntityDescription
 
     def __init__(
         self,
         coordinator: SpotifyCoordinator,
         entity_description: SpotifyAudioFeaturesSensorEntityDescription,
+        user_id: str,
+        name: str,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
-        self._attr_unique_id = (
-            f"{coordinator.current_user.user_id}_{entity_description.key}"
-        )
+        self._attr_unique_id = f"{user_id}_{entity_description.key}"
         self.entity_description = entity_description
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, user_id)},
+            manufacturer="Spotify AB",
+            model=f"Spotify {coordinator.current_user.product}",
+            name=f"Spotify {name}",
+            entry_type=DeviceEntryType.SERVICE,
+            configuration_url="https://open.spotify.com",
+        )
 
     @property
-    def native_value(self) -> float | str | None:
+    def native_value(self) -> float | None:
         """Return the state of the sensor."""
         if (audio_features := self.coordinator.data.audio_features) is None:
             return None
diff --git a/homeassistant/components/spotify/strings.json b/homeassistant/components/spotify/strings.json
index faf20d740d9..d98e70b9fe1 100644
--- a/homeassistant/components/spotify/strings.json
+++ b/homeassistant/components/spotify/strings.json
@@ -35,40 +35,6 @@
     "sensor": {
       "song_tempo": {
         "name": "Song tempo"
-      },
-      "danceability": {
-        "name": "Song danceability"
-      },
-      "energy": {
-        "name": "Song energy"
-      },
-      "mode": {
-        "name": "Song mode",
-        "state": {
-          "minor": "Minor",
-          "major": "Major"
-        }
-      },
-      "speechiness": {
-        "name": "Song speechiness"
-      },
-      "acousticness": {
-        "name": "Song acousticness"
-      },
-      "instrumentalness": {
-        "name": "Song instrumentalness"
-      },
-      "valence": {
-        "name": "Song valence"
-      },
-      "liveness": {
-        "name": "Song liveness"
-      },
-      "time_signature": {
-        "name": "Song time signature"
-      },
-      "key": {
-        "name": "Song key"
       }
     }
   }
diff --git a/homeassistant/components/sql/config_flow.py b/homeassistant/components/sql/config_flow.py
index 4fe04f2401c..5537c7ff3b0 100644
--- a/homeassistant/components/sql/config_flow.py
+++ b/homeassistant/components/sql/config_flow.py
@@ -23,7 +23,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import (
     CONF_DEVICE_CLASS,
@@ -144,7 +144,7 @@ class SQLConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> SQLOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return SQLOptionsFlowHandler()
+        return SQLOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -209,7 +209,7 @@ class SQLConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class SQLOptionsFlowHandler(OptionsFlow):
+class SQLOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle SQL options."""
 
     async def async_step_init(
@@ -223,7 +223,7 @@ class SQLOptionsFlowHandler(OptionsFlow):
             db_url = user_input.get(CONF_DB_URL)
             query = user_input[CONF_QUERY]
             column = user_input[CONF_COLUMN_NAME]
-            name = self.config_entry.options.get(CONF_NAME, self.config_entry.title)
+            name = self.options.get(CONF_NAME, self.config_entry.title)
 
             try:
                 query = validate_sql_select(query)
@@ -275,7 +275,7 @@ class SQLOptionsFlowHandler(OptionsFlow):
         return self.async_show_form(
             step_id="init",
             data_schema=self.add_suggested_values_to_schema(
-                OPTIONS_SCHEMA, user_input or self.config_entry.options
+                OPTIONS_SCHEMA, user_input or self.options
             ),
             errors=errors,
             description_placeholders=description_placeholders,
diff --git a/homeassistant/components/squeezebox/__init__.py b/homeassistant/components/squeezebox/__init__.py
index f466f3bcb62..c0a5b906474 100644
--- a/homeassistant/components/squeezebox/__init__.py
+++ b/homeassistant/components/squeezebox/__init__.py
@@ -2,10 +2,9 @@
 
 from asyncio import timeout
 from dataclasses import dataclass
-from datetime import datetime
 import logging
 
-from pysqueezebox import Player, Server
+from pysqueezebox import Server
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -24,30 +23,20 @@ from homeassistant.helpers.device_registry import (
     DeviceEntryType,
     format_mac,
 )
-from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.event import async_call_later
 
 from .const import (
     CONF_HTTPS,
-    DISCOVERY_INTERVAL,
     DISCOVERY_TASK,
     DOMAIN,
-    KNOWN_PLAYERS,
-    KNOWN_SERVERS,
     MANUFACTURER,
     SERVER_MODEL,
-    SIGNAL_PLAYER_DISCOVERED,
-    SIGNAL_PLAYER_REDISCOVERED,
     STATUS_API_TIMEOUT,
     STATUS_QUERY_LIBRARYNAME,
     STATUS_QUERY_MAC,
     STATUS_QUERY_UUID,
     STATUS_QUERY_VERSION,
 )
-from .coordinator import (
-    LMSStatusDataUpdateCoordinator,
-    SqueezeBoxPlayerUpdateCoordinator,
-)
+from .coordinator import LMSStatusDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -128,55 +117,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: SqueezeboxConfigEntry) -
     )
     _LOGGER.debug("LMS Device %s", device)
 
-    server_coordinator = LMSStatusDataUpdateCoordinator(hass, lms)
+    coordinator = LMSStatusDataUpdateCoordinator(hass, lms)
 
     entry.runtime_data = SqueezeboxData(
-        coordinator=server_coordinator,
+        coordinator=coordinator,
         server=lms,
     )
 
-    # set up player discovery
-    known_servers = hass.data.setdefault(DOMAIN, {}).setdefault(KNOWN_SERVERS, {})
-    known_players = known_servers.setdefault(lms.uuid, {}).setdefault(KNOWN_PLAYERS, [])
-
-    async def _player_discovery(now: datetime | None = None) -> None:
-        """Discover squeezebox players by polling server."""
-
-        async def _discovered_player(player: Player) -> None:
-            """Handle a (re)discovered player."""
-            if player.player_id in known_players:
-                await player.async_update()
-                async_dispatcher_send(
-                    hass, SIGNAL_PLAYER_REDISCOVERED, player.player_id, player.connected
-                )
-            else:
-                _LOGGER.debug("Adding new entity: %s", player)
-                player_coordinator = SqueezeBoxPlayerUpdateCoordinator(
-                    hass, player, lms.uuid
-                )
-                known_players.append(player.player_id)
-                async_dispatcher_send(
-                    hass, SIGNAL_PLAYER_DISCOVERED, player_coordinator
-                )
-
-        if players := await lms.async_get_players():
-            for player in players:
-                hass.async_create_task(_discovered_player(player))
-
-        entry.async_on_unload(
-            async_call_later(hass, DISCOVERY_INTERVAL, _player_discovery)
-        )
-
-    await server_coordinator.async_config_entry_first_refresh()
+    await coordinator.async_config_entry_first_refresh()
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    _LOGGER.debug(
-        "Adding player discovery job for LMS server: %s", entry.data[CONF_HOST]
-    )
-    entry.async_create_background_task(
-        hass, _player_discovery(), "squeezebox.media_player.player_discovery"
-    )
-
     return True
 
 
diff --git a/homeassistant/components/squeezebox/const.py b/homeassistant/components/squeezebox/const.py
index 8bc33214170..0bf8c24a5d1 100644
--- a/homeassistant/components/squeezebox/const.py
+++ b/homeassistant/components/squeezebox/const.py
@@ -5,7 +5,6 @@ DISCOVERY_TASK = "discovery_task"
 DOMAIN = "squeezebox"
 DEFAULT_PORT = 9000
 KNOWN_PLAYERS = "known_players"
-KNOWN_SERVERS = "known_servers"
 MANUFACTURER = "https://lyrion.org/"
 PLAYER_DISCOVERY_UNSUB = "player_discovery_unsub"
 SENSOR_UPDATE_INTERVAL = 60
@@ -28,7 +27,3 @@ STATUS_QUERY_MAC = "mac"
 STATUS_QUERY_UUID = "uuid"
 STATUS_QUERY_VERSION = "version"
 SQUEEZEBOX_SOURCE_STRINGS = ("source:", "wavin:", "spotify:")
-SIGNAL_PLAYER_DISCOVERED = "squeezebox_player_discovered"
-SIGNAL_PLAYER_REDISCOVERED = "squeezebox_player_rediscovered"
-DISCOVERY_INTERVAL = 60
-PLAYER_UPDATE_INTERVAL = 5
diff --git a/homeassistant/components/squeezebox/coordinator.py b/homeassistant/components/squeezebox/coordinator.py
index f3aacbc9833..0d958399bcb 100644
--- a/homeassistant/components/squeezebox/coordinator.py
+++ b/homeassistant/components/squeezebox/coordinator.py
@@ -1,23 +1,18 @@
 """DataUpdateCoordinator for the Squeezebox integration."""
 
 from asyncio import timeout
-from collections.abc import Callable
 from datetime import timedelta
 import logging
 import re
-from typing import Any
 
-from pysqueezebox import Player, Server
+from pysqueezebox import Server
 
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
 from .const import (
-    PLAYER_UPDATE_INTERVAL,
     SENSOR_UPDATE_INTERVAL,
-    SIGNAL_PLAYER_REDISCOVERED,
     STATUS_API_TIMEOUT,
     STATUS_SENSOR_LASTSCAN,
     STATUS_SENSOR_NEEDSRESTART,
@@ -43,7 +38,7 @@ class LMSStatusDataUpdateCoordinator(DataUpdateCoordinator):
         self.newversion_regex = re.compile("<.*$")
 
     async def _async_update_data(self) -> dict:
-        """Fetch data from LMS status call.
+        """Fetch data fromn LMS status call.
 
         Then we process only a subset to make then nice for HA
         """
@@ -75,46 +70,3 @@ class LMSStatusDataUpdateCoordinator(DataUpdateCoordinator):
 
         _LOGGER.debug("Processed serverstatus %s=%s", self.lms.name, data)
         return data
-
-
-class SqueezeBoxPlayerUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
-    """Coordinator for Squeezebox players."""
-
-    def __init__(self, hass: HomeAssistant, player: Player, server_uuid: str) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=player.name,
-            update_interval=timedelta(seconds=PLAYER_UPDATE_INTERVAL),
-            always_update=True,
-        )
-        self.player = player
-        self.available = True
-        self._remove_dispatcher: Callable | None = None
-        self.server_uuid = server_uuid
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Update Player if available, or listen for rediscovery if not."""
-        if self.available:
-            # Only update players available at last update, unavailable players are rediscovered instead
-            await self.player.async_update()
-
-            if self.player.connected is False:
-                _LOGGER.debug("Player %s is not available", self.name)
-                self.available = False
-
-                # start listening for restored players
-                self._remove_dispatcher = async_dispatcher_connect(
-                    self.hass, SIGNAL_PLAYER_REDISCOVERED, self.rediscovered
-                )
-        return {}
-
-    @callback
-    def rediscovered(self, unique_id: str, connected: bool) -> None:
-        """Make a player available again."""
-        if unique_id == self.player.player_id and connected:
-            self.available = True
-            _LOGGER.debug("Player %s is available again", self.name)
-            if self._remove_dispatcher:
-                self._remove_dispatcher()
diff --git a/homeassistant/components/squeezebox/media_player.py b/homeassistant/components/squeezebox/media_player.py
index 19cd1e36910..54cb07cafaf 100644
--- a/homeassistant/components/squeezebox/media_player.py
+++ b/homeassistant/components/squeezebox/media_player.py
@@ -6,9 +6,9 @@ from collections.abc import Callable
 from datetime import datetime
 import json
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
-from pysqueezebox import Server, async_discover
+from pysqueezebox import Player, Server, async_discover
 import voluptuous as vol
 
 from homeassistant.components import media_source
@@ -25,53 +25,50 @@ from homeassistant.components.media_player import (
     async_process_play_media_url,
 )
 from homeassistant.config_entries import SOURCE_INTEGRATION_DISCOVERY
-from homeassistant.const import ATTR_COMMAND, CONF_HOST, CONF_PORT, Platform
+from homeassistant.const import ATTR_COMMAND, CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import (
     config_validation as cv,
     discovery_flow,
     entity_platform,
-    entity_registry as er,
 )
 from homeassistant.helpers.device_registry import (
     CONNECTION_NETWORK_MAC,
     DeviceInfo,
     format_mac,
 )
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+    async_dispatcher_send,
+)
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.start import async_at_start
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utcnow
 
+from . import SqueezeboxConfigEntry
 from .browse_media import (
     build_item_response,
     generate_playlist,
     library_payload,
     media_source_content_filter,
 )
-from .const import (
-    DISCOVERY_TASK,
-    DOMAIN,
-    KNOWN_PLAYERS,
-    KNOWN_SERVERS,
-    SIGNAL_PLAYER_DISCOVERED,
-    SQUEEZEBOX_SOURCE_STRINGS,
-)
-from .coordinator import SqueezeBoxPlayerUpdateCoordinator
-
-if TYPE_CHECKING:
-    from . import SqueezeboxConfigEntry
+from .const import DISCOVERY_TASK, DOMAIN, KNOWN_PLAYERS, SQUEEZEBOX_SOURCE_STRINGS
 
 SERVICE_CALL_METHOD = "call_method"
 SERVICE_CALL_QUERY = "call_query"
 
 ATTR_QUERY_RESULT = "query_result"
 
+SIGNAL_PLAYER_REDISCOVERED = "squeezebox_player_rediscovered"
+
 _LOGGER = logging.getLogger(__name__)
 
+DISCOVERY_INTERVAL = 60
 
+
+KNOWN_SERVERS = "known_servers"
 ATTR_PARAMETERS = "parameters"
 ATTR_OTHER_PLAYER = "other_player"
 
@@ -115,15 +112,49 @@ async def async_setup_entry(
     entry: SqueezeboxConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up the Squeezebox media_player platform from a server config entry."""
+    """Set up an player discovery from a config entry."""
+    hass.data.setdefault(DOMAIN, {})
+    known_players = hass.data[DOMAIN].setdefault(KNOWN_PLAYERS, [])
+    lms = entry.runtime_data.server
 
-    # Add media player entities when discovered
-    async def _player_discovered(player: SqueezeBoxPlayerUpdateCoordinator) -> None:
-        _LOGGER.debug("Setting up media_player entity for player %s", player)
-        async_add_entities([SqueezeBoxMediaPlayerEntity(player)])
+    async def _player_discovery(now: datetime | None = None) -> None:
+        """Discover squeezebox players by polling server."""
 
-    entry.async_on_unload(
-        async_dispatcher_connect(hass, SIGNAL_PLAYER_DISCOVERED, _player_discovered)
+        async def _discovered_player(player: Player) -> None:
+            """Handle a (re)discovered player."""
+            entity = next(
+                (
+                    known
+                    for known in known_players
+                    if known.unique_id == player.player_id
+                ),
+                None,
+            )
+            if entity:
+                await player.async_update()
+                async_dispatcher_send(
+                    hass, SIGNAL_PLAYER_REDISCOVERED, player.player_id, player.connected
+                )
+
+            if not entity:
+                _LOGGER.debug("Adding new entity: %s", player)
+                entity = SqueezeBoxEntity(player, lms)
+                known_players.append(entity)
+                async_add_entities([entity], True)
+
+        if players := await lms.async_get_players():
+            for player in players:
+                hass.async_create_task(_discovered_player(player))
+
+        entry.async_on_unload(
+            async_call_later(hass, DISCOVERY_INTERVAL, _player_discovery)
+        )
+
+    _LOGGER.debug(
+        "Adding player discovery job for LMS server: %s", entry.data[CONF_HOST]
+    )
+    entry.async_create_background_task(
+        hass, _player_discovery(), "squeezebox.media_player.player_discovery"
     )
 
     # Register entity services
@@ -153,10 +184,8 @@ async def async_setup_entry(
     entry.async_on_unload(async_at_start(hass, start_server_discovery))
 
 
-class SqueezeBoxMediaPlayerEntity(
-    CoordinatorEntity[SqueezeBoxPlayerUpdateCoordinator], MediaPlayerEntity
-):
-    """Representation of the media player features of a SqueezeBox device.
+class SqueezeBoxEntity(MediaPlayerEntity):
+    """Representation of a SqueezeBox device.
 
     Wraps a pysqueezebox.Player() object.
     """
@@ -183,18 +212,13 @@ class SqueezeBoxMediaPlayerEntity(
     _attr_has_entity_name = True
     _attr_name = None
     _last_update: datetime | None = None
+    _attr_available = True
 
-    def __init__(
-        self,
-        coordinator: SqueezeBoxPlayerUpdateCoordinator,
-    ) -> None:
+    def __init__(self, player: Player, server: Server) -> None:
         """Initialize the SqueezeBox device."""
-        super().__init__(coordinator)
-        player = coordinator.player
         self._player = player
         self._query_result: bool | dict = {}
         self._remove_dispatcher: Callable | None = None
-        self._previous_media_position = 0
         self._attr_unique_id = format_mac(player.player_id)
         _manufacturer = None
         if player.model == "SqueezeLite" or "SqueezePlay" in player.model:
@@ -210,24 +234,11 @@ class SqueezeBoxMediaPlayerEntity(
             identifiers={(DOMAIN, self._attr_unique_id)},
             name=player.name,
             connections={(CONNECTION_NETWORK_MAC, self._attr_unique_id)},
-            via_device=(DOMAIN, coordinator.server_uuid),
+            via_device=(DOMAIN, server.uuid),
             model=player.model,
             manufacturer=_manufacturer,
         )
 
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        if self._previous_media_position != self.media_position:
-            self._previous_media_position = self.media_position
-            self._last_update = utcnow()
-        self.async_write_ha_state()
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return self.coordinator.available and super().available
-
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return device-specific attributes."""
@@ -237,6 +248,15 @@ class SqueezeBoxMediaPlayerEntity(
             if getattr(self, attr) is not None
         }
 
+    @callback
+    def rediscovered(self, unique_id: str, connected: bool) -> None:
+        """Make a player available again."""
+        if unique_id == self.unique_id and connected:
+            self._attr_available = True
+            _LOGGER.debug("Player %s is available again", self.name)
+            if self._remove_dispatcher:
+                self._remove_dispatcher()
+
     @property
     def state(self) -> MediaPlayerState | None:
         """Return the state of the device."""
@@ -249,11 +269,26 @@ class SqueezeBoxMediaPlayerEntity(
         )
         return None
 
+    async def async_update(self) -> None:
+        """Update the Player() object."""
+        # only update available players, newly available players will be rediscovered and marked available
+        if self._attr_available:
+            last_media_position = self.media_position
+            await self._player.async_update()
+            if self.media_position != last_media_position:
+                self._last_update = utcnow()
+            if self._player.connected is False:
+                _LOGGER.debug("Player %s is not available", self.name)
+                self._attr_available = False
+
+                # start listening for restored players
+                self._remove_dispatcher = async_dispatcher_connect(
+                    self.hass, SIGNAL_PLAYER_REDISCOVERED, self.rediscovered
+                )
+
     async def async_will_remove_from_hass(self) -> None:
         """Remove from list of known players when removed from hass."""
-        known_servers = self.hass.data[DOMAIN][KNOWN_SERVERS]
-        known_players = known_servers[self.coordinator.server_uuid][KNOWN_PLAYERS]
-        known_players.remove(self.coordinator.player.player_id)
+        self.hass.data[DOMAIN][KNOWN_PLAYERS].remove(self)
 
     @property
     def volume_level(self) -> float | None:
@@ -345,15 +380,13 @@ class SqueezeBoxMediaPlayerEntity(
     @property
     def group_members(self) -> list[str]:
         """List players we are synced with."""
-        ent_reg = er.async_get(self.hass)
+        player_ids = {
+            p.unique_id: p.entity_id for p in self.hass.data[DOMAIN][KNOWN_PLAYERS]
+        }
         return [
-            entity_id
+            player_ids[player]
             for player in self._player.sync_group
-            if (
-                entity_id := ent_reg.async_get_entity_id(
-                    Platform.MEDIA_PLAYER, DOMAIN, player
-                )
-            )
+            if player in player_ids
         ]
 
     @property
@@ -364,68 +397,55 @@ class SqueezeBoxMediaPlayerEntity(
     async def async_turn_off(self) -> None:
         """Turn off media player."""
         await self._player.async_set_power(False)
-        await self.coordinator.async_refresh()
 
     async def async_volume_up(self) -> None:
         """Volume up media player."""
         await self._player.async_set_volume("+5")
-        await self.coordinator.async_refresh()
 
     async def async_volume_down(self) -> None:
         """Volume down media player."""
         await self._player.async_set_volume("-5")
-        await self.coordinator.async_refresh()
 
     async def async_set_volume_level(self, volume: float) -> None:
         """Set volume level, range 0..1."""
         volume_percent = str(int(volume * 100))
         await self._player.async_set_volume(volume_percent)
-        await self.coordinator.async_refresh()
 
     async def async_mute_volume(self, mute: bool) -> None:
         """Mute (true) or unmute (false) media player."""
         await self._player.async_set_muting(mute)
-        await self.coordinator.async_refresh()
 
     async def async_media_stop(self) -> None:
         """Send stop command to media player."""
         await self._player.async_stop()
-        await self.coordinator.async_refresh()
 
     async def async_media_play_pause(self) -> None:
         """Send pause command to media player."""
         await self._player.async_toggle_pause()
-        await self.coordinator.async_refresh()
 
     async def async_media_play(self) -> None:
         """Send play command to media player."""
         await self._player.async_play()
-        await self.coordinator.async_refresh()
 
     async def async_media_pause(self) -> None:
         """Send pause command to media player."""
         await self._player.async_pause()
-        await self.coordinator.async_refresh()
 
     async def async_media_next_track(self) -> None:
         """Send next track command."""
         await self._player.async_index("+1")
-        await self.coordinator.async_refresh()
 
     async def async_media_previous_track(self) -> None:
         """Send next track command."""
         await self._player.async_index("-1")
-        await self.coordinator.async_refresh()
 
     async def async_media_seek(self, position: float) -> None:
         """Send seek command."""
         await self._player.async_time(position)
-        await self.coordinator.async_refresh()
 
     async def async_turn_on(self) -> None:
         """Turn the media player on."""
         await self._player.async_set_power(True)
-        await self.coordinator.async_refresh()
 
     async def async_play_media(
         self, media_type: MediaType | str, media_id: str, **kwargs: Any
@@ -484,7 +504,6 @@ class SqueezeBoxMediaPlayerEntity(
         await self._player.async_load_playlist(playlist, cmd)
         if index is not None:
             await self._player.async_index(index)
-        await self.coordinator.async_refresh()
 
     async def async_set_repeat(self, repeat: RepeatMode) -> None:
         """Set the repeat mode."""
@@ -496,18 +515,15 @@ class SqueezeBoxMediaPlayerEntity(
             repeat_mode = "none"
 
         await self._player.async_set_repeat(repeat_mode)
-        await self.coordinator.async_refresh()
 
     async def async_set_shuffle(self, shuffle: bool) -> None:
         """Enable/disable shuffle mode."""
         shuffle_mode = "song" if shuffle else "none"
         await self._player.async_set_shuffle(shuffle_mode)
-        await self.coordinator.async_refresh()
 
     async def async_clear_playlist(self) -> None:
         """Send the media player the command for clear playlist."""
         await self._player.async_clear_playlist()
-        await self.coordinator.async_refresh()
 
     async def async_call_method(
         self, command: str, parameters: list[str] | None = None
@@ -535,7 +551,6 @@ class SqueezeBoxMediaPlayerEntity(
             all_params.extend(parameters)
         self._query_result = await self._player.async_query(*all_params)
         _LOGGER.debug("call_query got result %s", self._query_result)
-        self.async_write_ha_state()
 
     async def async_join_players(self, group_members: list[str]) -> None:
         """Add other Squeezebox players to this player's sync group.
@@ -543,24 +558,21 @@ class SqueezeBoxMediaPlayerEntity(
         If the other player is a member of a sync group, it will leave the current sync group
         without asking.
         """
-        ent_reg = er.async_get(self.hass)
-        for other_player_entity_id in group_members:
-            other_player = ent_reg.async_get(other_player_entity_id)
-            if other_player is None:
-                raise ServiceValidationError(
-                    f"Could not find player with entity_id {other_player_entity_id}"
-                )
-            if other_player_id := other_player.unique_id:
+        player_ids = {
+            p.entity_id: p.unique_id for p in self.hass.data[DOMAIN][KNOWN_PLAYERS]
+        }
+
+        for other_player in group_members:
+            if other_player_id := player_ids.get(other_player):
                 await self._player.async_sync(other_player_id)
             else:
                 raise ServiceValidationError(
-                    f"Could not join unknown player {other_player_entity_id}"
+                    f"Could not join unknown player {other_player}"
                 )
 
     async def async_unjoin_player(self) -> None:
         """Unsync this Squeezebox player."""
         await self._player.async_unsync()
-        await self.coordinator.async_refresh()
 
     async def async_browse_media(
         self,
diff --git a/homeassistant/components/srp_energy/strings.json b/homeassistant/components/srp_energy/strings.json
index eca4f465435..191d10a70dd 100644
--- a/homeassistant/components/srp_energy/strings.json
+++ b/homeassistant/components/srp_energy/strings.json
@@ -17,8 +17,7 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "unknown": "Unexpected error"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   },
   "entity": {
diff --git a/homeassistant/components/statistics/config_flow.py b/homeassistant/components/statistics/config_flow.py
index 4280c92131a..145a7655b36 100644
--- a/homeassistant/components/statistics/config_flow.py
+++ b/homeassistant/components/statistics/config_flow.py
@@ -169,8 +169,8 @@ class StatisticsConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
         vol.Required("user_input"): dict,
     }
 )
-@websocket_api.async_response
-async def ws_start_preview(
+@callback
+def ws_start_preview(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,
     msg: dict[str, Any],
@@ -234,6 +234,6 @@ async def ws_start_preview(
     preview_entity.hass = hass
 
     connection.send_result(msg["id"])
-    connection.subscriptions[msg["id"]] = await preview_entity.async_start_preview(
+    connection.subscriptions[msg["id"]] = preview_entity.async_start_preview(
         async_preview_updated
     )
diff --git a/homeassistant/components/statistics/sensor.py b/homeassistant/components/statistics/sensor.py
index 50d07d4e466..ba98fe3ec6e 100644
--- a/homeassistant/components/statistics/sensor.py
+++ b/homeassistant/components/statistics/sensor.py
@@ -17,7 +17,6 @@ from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAI
 from homeassistant.components.recorder import get_instance, history
 from homeassistant.components.sensor import (
     DEVICE_CLASS_STATE_CLASSES,
-    DEVICE_CLASS_UNITS,
     PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
@@ -38,7 +37,6 @@ from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
     EventStateChangedData,
-    EventStateReportedData,
     HomeAssistant,
     State,
     callback,
@@ -50,9 +48,9 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import (
     async_track_point_in_utc_time,
     async_track_state_change_event,
-    async_track_state_report_event,
 )
 from homeassistant.helpers.reload import async_setup_reload_service
+from homeassistant.helpers.start import async_at_start
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 from homeassistant.util import dt as dt_util
 from homeassistant.util.enum import try_parse_enum
@@ -360,20 +358,23 @@ class StatisticsSensor(SensorEntity):
         self.samples_keep_last: bool = samples_keep_last
         self._precision: int = precision
         self._percentile: int = percentile
-        self._attr_available: bool = False
+        self._value: StateType | datetime = None
+        self._unit_of_measurement: str | None = None
+        self._available: bool = False
 
         self.states: deque[float | bool] = deque(maxlen=self._samples_max_buffer_size)
         self.ages: deque[datetime] = deque(maxlen=self._samples_max_buffer_size)
         self.attributes: dict[str, StateType] = {}
 
-        self._state_characteristic_fn: Callable[[], float | int | datetime | None] = (
+        self._state_characteristic_fn: Callable[[], StateType | datetime] = (
             self._callable_characteristic_fn(self._state_characteristic)
         )
 
         self._update_listener: CALLBACK_TYPE | None = None
         self._preview_callback: Callable[[str, Mapping[str, Any]], None] | None = None
 
-    async def async_start_preview(
+    @callback
+    def async_start_preview(
         self,
         preview_callback: Callable[[str, Mapping[str, Any]], None],
     ) -> CALLBACK_TYPE:
@@ -384,22 +385,23 @@ class StatisticsSensor(SensorEntity):
         if not self._source_entity_id or (
             self._samples_max_buffer_size is None and self._samples_max_age is None
         ):
-            self._attr_available = False
+            self._available = False
             calculated_state = self._async_calculate_state()
             preview_callback(calculated_state.state, calculated_state.attributes)
             return self._call_on_remove_callbacks
 
         self._preview_callback = preview_callback
 
-        await self._async_stats_sensor_startup()
+        self._async_stats_sensor_startup(self.hass)
         return self._call_on_remove_callbacks
 
-    def _async_handle_new_state(
+    @callback
+    def _async_stats_sensor_state_listener(
         self,
-        reported_state: State | None,
+        event: Event[EventStateChangedData],
     ) -> None:
         """Handle the sensor state changes."""
-        if (new_state := reported_state) is None:
+        if (new_state := event.data["new_state"]) is None:
             return
         self._add_state_to_queue(new_state)
         self._async_purge_update_and_schedule()
@@ -412,55 +414,28 @@ class StatisticsSensor(SensorEntity):
             self.async_write_ha_state()
 
     @callback
-    def _async_stats_sensor_state_change_listener(
-        self,
-        event: Event[EventStateChangedData],
-    ) -> None:
-        self._async_handle_new_state(event.data["new_state"])
-
-    @callback
-    def _async_stats_sensor_state_report_listener(
-        self,
-        event: Event[EventStateReportedData],
-    ) -> None:
-        self._async_handle_new_state(event.data["new_state"])
-
-    async def _async_stats_sensor_startup(self) -> None:
-        """Add listener and get recorded state.
-
-        Historical data needs to be loaded from the database first before we
-        can start accepting new incoming changes.
-        This is needed to ensure that the buffer is properly sorted by time.
-        """
+    def _async_stats_sensor_startup(self, _: HomeAssistant) -> None:
+        """Add listener and get recorded state."""
         _LOGGER.debug("Startup for %s", self.entity_id)
-        if "recorder" in self.hass.config.components:
-            await self._initialize_from_database()
         self.async_on_remove(
             async_track_state_change_event(
                 self.hass,
                 [self._source_entity_id],
-                self._async_stats_sensor_state_change_listener,
-            )
-        )
-        self.async_on_remove(
-            async_track_state_report_event(
-                self.hass,
-                [self._source_entity_id],
-                self._async_stats_sensor_state_report_listener,
+                self._async_stats_sensor_state_listener,
             )
         )
+        if "recorder" in self.hass.config.components:
+            self.hass.async_create_task(self._initialize_from_database())
 
     async def async_added_to_hass(self) -> None:
         """Register callbacks."""
-        await self._async_stats_sensor_startup()
+        self.async_on_remove(
+            async_at_start(self.hass, self._async_stats_sensor_startup)
+        )
 
     def _add_state_to_queue(self, new_state: State) -> None:
         """Add the state to the queue."""
-
-        # Attention: it is not safe to store the new_state object,
-        # since the "last_reported" value will be updated over time.
-        # Here we make a copy the current value, which is okay.
-        self._attr_available = new_state.state != STATE_UNAVAILABLE
+        self._available = new_state.state != STATE_UNAVAILABLE
         if new_state.state == STATE_UNAVAILABLE:
             self.attributes[STAT_SOURCE_VALUE_VALID] = None
             return
@@ -474,7 +449,7 @@ class StatisticsSensor(SensorEntity):
                 self.states.append(new_state.state == "on")
             else:
                 self.states.append(float(new_state.state))
-            self.ages.append(new_state.last_reported)
+            self.ages.append(new_state.last_updated)
             self.attributes[STAT_SOURCE_VALUE_VALID] = True
         except ValueError:
             self.attributes[STAT_SOURCE_VALUE_VALID] = False
@@ -485,28 +460,11 @@ class StatisticsSensor(SensorEntity):
             )
             return
 
-        self._calculate_state_attributes(new_state)
-
-    def _calculate_state_attributes(self, new_state: State) -> None:
-        """Set the entity state attributes."""
-
-        self._attr_native_unit_of_measurement = self._calculate_unit_of_measurement(
-            new_state
-        )
-        self._attr_device_class = self._calculate_device_class(
-            new_state, self._attr_native_unit_of_measurement
-        )
-        self._attr_state_class = self._calculate_state_class(new_state)
-
-    def _calculate_unit_of_measurement(self, new_state: State) -> str | None:
-        """Return the calculated unit of measurement.
-
-        The unit of measurement is that of the source sensor, adjusted based on the
-        state characteristics.
-        """
+        self._unit_of_measurement = self._derive_unit_of_measurement(new_state)
 
+    def _derive_unit_of_measurement(self, new_state: State) -> str | None:
         base_unit: str | None = new_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
-        unit: str | None = None
+        unit: str | None
         if self.is_binary and self._state_characteristic in STATS_BINARY_PERCENTAGE:
             unit = PERCENTAGE
         elif not base_unit:
@@ -529,61 +487,53 @@ class StatisticsSensor(SensorEntity):
             unit = base_unit + "/sample"
         elif self._state_characteristic == STAT_CHANGE_SECOND:
             unit = base_unit + "/s"
-
         return unit
 
-    def _calculate_device_class(
-        self, new_state: State, unit: str | None
-    ) -> SensorDeviceClass | None:
-        """Return the calculated device class.
-
-        The device class is calculated based on the state characteristics,
-        the source device class and the unit of measurement is
-        in the device class units list.
-        """
-
-        device_class: SensorDeviceClass | None = None
+    @property
+    def device_class(self) -> SensorDeviceClass | None:
+        """Return the class of this device."""
         if self._state_characteristic in STATS_DATETIME:
             return SensorDeviceClass.TIMESTAMP
         if self._state_characteristic in STATS_NUMERIC_RETAIN_UNIT:
-            device_class = new_state.attributes.get(ATTR_DEVICE_CLASS)
-            if device_class is None:
+            source_state = self.hass.states.get(self._source_entity_id)
+            if source_state is None:
                 return None
-            if (
-                sensor_device_class := try_parse_enum(SensorDeviceClass, device_class)
-            ) is None:
+            source_device_class = source_state.attributes.get(ATTR_DEVICE_CLASS)
+            if source_device_class is None:
                 return None
-            if (
-                sensor_device_class
-                and (
-                    sensor_state_classes := DEVICE_CLASS_STATE_CLASSES.get(
-                        sensor_device_class
-                    )
-                )
-                and sensor_state_classes
-                and SensorStateClass.MEASUREMENT not in sensor_state_classes
-            ):
+            sensor_device_class = try_parse_enum(SensorDeviceClass, source_device_class)
+            if sensor_device_class is None:
                 return None
-            if device_class not in DEVICE_CLASS_UNITS:
-                return None
-            if (
-                device_class in DEVICE_CLASS_UNITS
-                and unit not in DEVICE_CLASS_UNITS[device_class]
-            ):
+            sensor_state_classes = DEVICE_CLASS_STATE_CLASSES.get(
+                sensor_device_class, set()
+            )
+            if SensorStateClass.MEASUREMENT not in sensor_state_classes:
                 return None
+            return sensor_device_class
+        return None
 
-        return device_class
-
-    def _calculate_state_class(self, new_state: State) -> SensorStateClass | None:
-        """Return the calculated state class.
-
-        Will be None if the characteristics is not numerical, otherwise
-        SensorStateClass.MEASUREMENT.
-        """
+    @property
+    def state_class(self) -> SensorStateClass | None:
+        """Return the state class of this entity."""
         if self._state_characteristic in STATS_NOT_A_NUMBER:
             return None
         return SensorStateClass.MEASUREMENT
 
+    @property
+    def native_value(self) -> StateType | datetime:
+        """Return the state of the sensor."""
+        return self._value
+
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        """Return the unit the value is expressed in."""
+        return self._unit_of_measurement
+
+    @property
+    def available(self) -> bool:
+        """Return the availability of the sensor linked to the source sensor."""
+        return self._available
+
     @property
     def extra_state_attributes(self) -> dict[str, StateType] | None:
         """Return the state attributes of the sensor."""
@@ -727,7 +677,7 @@ class StatisticsSensor(SensorEntity):
         ):
             for state in reversed(states):
                 self._add_state_to_queue(state)
-                self._calculate_state_attributes(state)
+
         self._async_purge_update_and_schedule()
 
         # only write state to the state machine if we are not in preview mode
@@ -762,21 +712,19 @@ class StatisticsSensor(SensorEntity):
         """
 
         value = self._state_characteristic_fn()
-        _LOGGER.debug(
-            "Updating value: states: %s, ages: %s => %s", self.states, self.ages, value
-        )
+
         if self._state_characteristic not in STATS_NOT_A_NUMBER:
             with contextlib.suppress(TypeError):
                 value = round(cast(float, value), self._precision)
                 if self._precision == 0:
                     value = int(value)
-        self._attr_native_value = value
+        self._value = value
 
     def _callable_characteristic_fn(
         self, characteristic: str
-    ) -> Callable[[], float | int | datetime | None]:
+    ) -> Callable[[], StateType | datetime]:
         """Return the function callable of one characteristic function."""
-        function: Callable[[], float | int | datetime | None] = getattr(
+        function: Callable[[], StateType | datetime] = getattr(
             self,
             f"_stat_binary_{characteristic}"
             if self.is_binary
@@ -787,8 +735,6 @@ class StatisticsSensor(SensorEntity):
     # Statistics for numeric sensor
 
     def _stat_average_linear(self) -> StateType:
-        if len(self.states) == 1:
-            return self.states[0]
         if len(self.states) >= 2:
             area: float = 0
             for i in range(1, len(self.states)):
@@ -802,8 +748,6 @@ class StatisticsSensor(SensorEntity):
         return None
 
     def _stat_average_step(self) -> StateType:
-        if len(self.states) == 1:
-            return self.states[0]
         if len(self.states) >= 2:
             area: float = 0
             for i in range(1, len(self.states)):
@@ -859,12 +803,12 @@ class StatisticsSensor(SensorEntity):
         return None
 
     def _stat_distance_95_percent_of_values(self) -> StateType:
-        if len(self.states) >= 1:
+        if len(self.states) >= 2:
             return 2 * 1.96 * cast(float, self._stat_standard_deviation())
         return None
 
     def _stat_distance_99_percent_of_values(self) -> StateType:
-        if len(self.states) >= 1:
+        if len(self.states) >= 2:
             return 2 * 2.58 * cast(float, self._stat_standard_deviation())
         return None
 
@@ -891,23 +835,17 @@ class StatisticsSensor(SensorEntity):
         return None
 
     def _stat_noisiness(self) -> StateType:
-        if len(self.states) == 1:
-            return 0.0
         if len(self.states) >= 2:
             return cast(float, self._stat_sum_differences()) / (len(self.states) - 1)
         return None
 
     def _stat_percentile(self) -> StateType:
-        if len(self.states) == 1:
-            return self.states[0]
         if len(self.states) >= 2:
             percentiles = statistics.quantiles(self.states, n=100, method="exclusive")
             return percentiles[self._percentile - 1]
         return None
 
     def _stat_standard_deviation(self) -> StateType:
-        if len(self.states) == 1:
-            return 0.0
         if len(self.states) >= 2:
             return statistics.stdev(self.states)
         return None
@@ -918,8 +856,6 @@ class StatisticsSensor(SensorEntity):
         return None
 
     def _stat_sum_differences(self) -> StateType:
-        if len(self.states) == 1:
-            return 0.0
         if len(self.states) >= 2:
             return sum(
                 abs(j - i)
@@ -928,8 +864,6 @@ class StatisticsSensor(SensorEntity):
         return None
 
     def _stat_sum_differences_nonnegative(self) -> StateType:
-        if len(self.states) == 1:
-            return 0.0
         if len(self.states) >= 2:
             return sum(
                 (j - i if j >= i else j - 0)
@@ -951,8 +885,6 @@ class StatisticsSensor(SensorEntity):
         return None
 
     def _stat_variance(self) -> StateType:
-        if len(self.states) == 1:
-            return 0.0
         if len(self.states) >= 2:
             return statistics.variance(self.states)
         return None
@@ -960,8 +892,6 @@ class StatisticsSensor(SensorEntity):
     # Statistics for binary sensor
 
     def _stat_binary_average_step(self) -> StateType:
-        if len(self.states) == 1:
-            return 100.0 * int(self.states[0] is True)
         if len(self.states) >= 2:
             on_seconds: float = 0
             for i in range(1, len(self.states)):
diff --git a/homeassistant/components/statistics/strings.json b/homeassistant/components/statistics/strings.json
index 3e6fec9d986..a060c88da24 100644
--- a/homeassistant/components/statistics/strings.json
+++ b/homeassistant/components/statistics/strings.json
@@ -23,10 +23,10 @@
       "state_characteristic": {
         "description": "Read the documention for further details on available options and how to use them.",
         "data": {
-          "state_characteristic": "Statistic characteristic"
+          "state_characteristic": "State_characteristic"
         },
         "data_description": {
-          "state_characteristic": "The statistic characteristic that should be used as the state of the sensor."
+          "state_characteristic": "The characteristic that should be used as the state of the statistics sensor."
         }
       },
       "options": {
diff --git a/homeassistant/components/steam_online/config_flow.py b/homeassistant/components/steam_online/config_flow.py
index 69009fca8c4..704eef616f6 100644
--- a/homeassistant/components/steam_online/config_flow.py
+++ b/homeassistant/components/steam_online/config_flow.py
@@ -40,7 +40,7 @@ class SteamFlowHandler(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(
         config_entry: SteamConfigEntry,
-    ) -> SteamOptionsFlowHandler:
+    ) -> OptionsFlow:
         """Get the options flow for this handler."""
         return SteamOptionsFlowHandler(config_entry)
 
@@ -123,6 +123,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, entry: SteamConfigEntry) -> None:
         """Initialize options flow."""
+        self.entry = entry
         self.options = dict(entry.options)
 
     async def async_step_init(
@@ -130,7 +131,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
     ) -> ConfigFlowResult:
         """Manage Steam options."""
         if user_input is not None:
-            await self.hass.config_entries.async_unload(self.config_entry.entry_id)
+            await self.hass.config_entries.async_unload(self.entry.entry_id)
             for _id in self.options[CONF_ACCOUNTS]:
                 if _id not in user_input[CONF_ACCOUNTS] and (
                     entity_id := er.async_get(self.hass).async_get_entity_id(
@@ -145,7 +146,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
                     if _id in user_input[CONF_ACCOUNTS]
                 }
             }
-            await self.hass.config_entries.async_reload(self.config_entry.entry_id)
+            await self.hass.config_entries.async_reload(self.entry.entry_id)
             return self.async_create_entry(title="", data=channel_data)
         error = None
         try:
@@ -175,9 +176,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
         """Get accounts."""
         interface = steam.api.interface("ISteamUser")
         try:
-            friends = interface.GetFriendList(
-                steamid=self.config_entry.data[CONF_ACCOUNT]
-            )
+            friends = interface.GetFriendList(steamid=self.entry.data[CONF_ACCOUNT])
             _users_str = [user["steamid"] for user in friends["friendslist"]["friends"]]
         except steam.api.HTTPError:
             return []
diff --git a/homeassistant/components/stream/const.py b/homeassistant/components/stream/const.py
index 66455ffad1a..a2fa065e019 100644
--- a/homeassistant/components/stream/const.py
+++ b/homeassistant/components/stream/const.py
@@ -1,9 +1,5 @@
 """Constants for Stream component."""
 
-from __future__ import annotations
-
-from typing import Final
-
 DOMAIN = "stream"
 
 ATTR_ENDPOINTS = "endpoints"
@@ -15,8 +11,8 @@ RECORDER_PROVIDER = "recorder"
 
 OUTPUT_FORMATS = [HLS_PROVIDER]
 
-SEGMENT_CONTAINER_FORMAT: Final = "mp4"  # format for segments
-RECORDER_CONTAINER_FORMAT: Final = "mp4"  # format for recorder output
+SEGMENT_CONTAINER_FORMAT = "mp4"  # format for segments
+RECORDER_CONTAINER_FORMAT = "mp4"  # format for recorder output
 AUDIO_CODECS = {"aac", "mp3"}
 
 FORMAT_CONTENT_TYPE = {HLS_PROVIDER: "application/vnd.apple.mpegurl"}
diff --git a/homeassistant/components/stream/core.py b/homeassistant/components/stream/core.py
index 4184b23b9a0..68c08a4f072 100644
--- a/homeassistant/components/stream/core.py
+++ b/homeassistant/components/stream/core.py
@@ -9,7 +9,7 @@ from dataclasses import dataclass, field
 import datetime
 from enum import IntEnum
 import logging
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any
 
 from aiohttp import web
 import numpy as np
@@ -27,7 +27,7 @@ from .const import (
 )
 
 if TYPE_CHECKING:
-    from av import Packet, VideoCodecContext
+    from av import CodecContext, Packet
 
     from homeassistant.components.camera import DynamicStreamSettings
 
@@ -438,17 +438,17 @@ class KeyFrameConverter:
         """Initialize."""
 
         # Keep import here so that we can import stream integration
-        # without installing reqs
+        # without installingreqs
         # pylint: disable-next=import-outside-toplevel
         from homeassistant.components.camera.img_util import TurboJPEGSingleton
 
-        self._packet: Packet | None = None
+        self._packet: Packet = None
         self._event: asyncio.Event = asyncio.Event()
         self._hass = hass
         self._image: bytes | None = None
         self._turbojpeg = TurboJPEGSingleton.instance()
         self._lock = asyncio.Lock()
-        self._codec_context: VideoCodecContext | None = None
+        self._codec_context: CodecContext | None = None
         self._stream_settings = stream_settings
         self._dynamic_stream_settings = dynamic_stream_settings
 
@@ -460,7 +460,7 @@ class KeyFrameConverter:
         self._packet = packet
         self._hass.loop.call_soon_threadsafe(self._event.set)
 
-    def create_codec_context(self, codec_context: VideoCodecContext) -> None:
+    def create_codec_context(self, codec_context: CodecContext) -> None:
         """Create a codec context to be used for decoding the keyframes.
 
         This is run by the worker thread and will only be called once per worker.
@@ -474,9 +474,7 @@ class KeyFrameConverter:
         # pylint: disable-next=import-outside-toplevel
         from av import CodecContext
 
-        self._codec_context = cast(
-            "VideoCodecContext", CodecContext.create(codec_context.name, "r")
-        )
+        self._codec_context = CodecContext.create(codec_context.name, "r")
         self._codec_context.extradata = codec_context.extradata
         self._codec_context.skip_frame = "NONKEY"
         self._codec_context.thread_type = "NONE"
@@ -508,8 +506,9 @@ class KeyFrameConverter:
                     frames = self._codec_context.decode(None)
                 break
             except EOFError:
-                _LOGGER.debug("Codec context needs flushing")
-                self._codec_context.flush_buffers()
+                _LOGGER.debug("Codec context needs flushing, attempting to reopen")
+                self._codec_context.close()
+                self._codec_context.open()
         else:
             _LOGGER.debug("Unable to decode keyframe")
             return
diff --git a/homeassistant/components/stream/manifest.json b/homeassistant/components/stream/manifest.json
index fdf81d99e65..00387d97b83 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.7.5", "av==13.1.0", "numpy==2.1.3"]
+  "requirements": ["PyTurboJPEG==1.7.5", "ha-av==10.1.1", "numpy==1.26.4"]
 }
diff --git a/homeassistant/components/stream/recorder.py b/homeassistant/components/stream/recorder.py
index a24440e6d19..6dfc09891b7 100644
--- a/homeassistant/components/stream/recorder.py
+++ b/homeassistant/components/stream/recorder.py
@@ -9,7 +9,6 @@ import os
 from typing import TYPE_CHECKING
 
 import av
-import av.container
 
 from homeassistant.core import HomeAssistant, callback
 
@@ -106,23 +105,24 @@ class RecorderOutput(StreamOutput):
 
             # Create output on first segment
             if not output:
-                container_options: dict[str, str] = {
-                    "video_track_timescale": str(int(1 / source_v.time_base)),  # type: ignore[operator]
-                    "movflags": "frag_keyframe+empty_moov",
-                    "min_frag_duration": str(self.stream_settings.min_segment_duration),
-                }
                 output = av.open(
                     self.video_path + ".tmp",
                     "w",
                     format=RECORDER_CONTAINER_FORMAT,
-                    container_options=container_options,
+                    container_options={
+                        "video_track_timescale": str(int(1 / source_v.time_base)),
+                        "movflags": "frag_keyframe+empty_moov",
+                        "min_frag_duration": str(
+                            self.stream_settings.min_segment_duration
+                        ),
+                    },
                 )
 
             # Add output streams if necessary
             if not output_v:
                 output_v = output.add_stream(template=source_v)
                 context = output_v.codec_context
-                context.global_header = True
+                context.flags |= "GLOBAL_HEADER"
             if source_a and not output_a:
                 output_a = output.add_stream(template=source_a)
 
@@ -132,23 +132,21 @@ class RecorderOutput(StreamOutput):
                 last_stream_id = segment.stream_id
                 pts_adjuster["video"] = int(
                     (running_duration - source.start_time)
-                    / (av.time_base * source_v.time_base)  # type: ignore[operator]
+                    / (av.time_base * source_v.time_base)
                 )
                 if source_a:
                     pts_adjuster["audio"] = int(
                         (running_duration - source.start_time)
-                        / (av.time_base * source_a.time_base)  # type: ignore[operator]
+                        / (av.time_base * source_a.time_base)
                     )
 
             # Remux video
             for packet in source.demux():
-                if packet.pts is None:
+                if packet.dts is None:
                     continue
-                packet.pts += pts_adjuster[packet.stream.type]  # type: ignore[operator]
-                packet.dts += pts_adjuster[packet.stream.type]  # type: ignore[operator]
-                stream = output_v if packet.stream.type == "video" else output_a
-                assert stream
-                packet.stream = stream
+                packet.pts += pts_adjuster[packet.stream.type]
+                packet.dts += pts_adjuster[packet.stream.type]
+                packet.stream = output_v if packet.stream.type == "video" else output_a
                 output.mux(packet)
 
             running_duration += source.duration - source.start_time
@@ -171,9 +169,7 @@ class RecorderOutput(StreamOutput):
             os.remove(video_path + ".tmp")
 
         def finish_writing(
-            segments: deque[Segment],
-            output: av.container.OutputContainer | None,
-            video_path: str,
+            segments: deque[Segment], output: av.OutputContainer, video_path: str
         ) -> None:
             """Finish writing output."""
             # Should only have 0 or 1 segments, but loop through just in case
diff --git a/homeassistant/components/stream/worker.py b/homeassistant/components/stream/worker.py
index 8c9bb1b8e9e..0d72a9b0818 100644
--- a/homeassistant/components/stream/worker.py
+++ b/homeassistant/components/stream/worker.py
@@ -13,9 +13,6 @@ from threading import Event
 from typing import Any, Self, cast
 
 import av
-import av.audio
-import av.container
-import av.stream
 
 from homeassistant.core import HomeAssistant
 from homeassistant.util import dt as dt_util
@@ -50,10 +47,10 @@ class StreamWorkerError(Exception):
     """An exception thrown while processing a stream."""
 
 
-def redact_av_error_string(err: av.FFmpegError) -> str:
+def redact_av_error_string(err: av.AVError) -> str:
     """Return an error string with credentials redacted from the url."""
-    parts = [str(err.type), err.strerror]  # type: ignore[attr-defined]
-    if err.filename:
+    parts = [str(err.type), err.strerror]
+    if err.filename is not None:
         parts.append(redact_credentials(err.filename))
     return ", ".join(parts)
 
@@ -126,31 +123,30 @@ class StreamState:
 class StreamMuxer:
     """StreamMuxer re-packages video/audio packets for output."""
 
-    _segment_start_dts: int
-    _memory_file: BytesIO
-    _av_output: av.container.OutputContainer
-    _output_video_stream: av.VideoStream
-    _output_audio_stream: av.audio.AudioStream | None
-    _segment: Segment | None
-    # the following 2 member variables are used for Part formation
-    _memory_file_pos: int
-    _part_start_dts: float
-
     def __init__(
         self,
         hass: HomeAssistant,
-        video_stream: av.VideoStream,
-        audio_stream: av.audio.AudioStream | None,
-        audio_bsf: str | None,
+        video_stream: av.video.VideoStream,
+        audio_stream: av.audio.stream.AudioStream | None,
+        audio_bsf: av.BitStreamFilter | None,
         stream_state: StreamState,
         stream_settings: StreamSettings,
     ) -> None:
         """Initialize StreamMuxer."""
         self._hass = hass
-        self._input_video_stream = video_stream
-        self._input_audio_stream = audio_stream
+        self._segment_start_dts: int = cast(int, None)
+        self._memory_file: BytesIO = cast(BytesIO, None)
+        self._av_output: av.container.OutputContainer = None
+        self._input_video_stream: av.video.VideoStream = video_stream
+        self._input_audio_stream: av.audio.stream.AudioStream | None = audio_stream
         self._audio_bsf = audio_bsf
-        self._audio_bsf_context: av.BitStreamFilterContext | None = None
+        self._audio_bsf_context: av.BitStreamFilterContext = None
+        self._output_video_stream: av.video.VideoStream = None
+        self._output_audio_stream: av.audio.stream.AudioStream | None = None
+        self._segment: Segment | None = None
+        # the following 3 member variables are used for Part formation
+        self._memory_file_pos: int = cast(int, None)
+        self._part_start_dts: int = cast(int, None)
         self._part_has_keyframe = False
         self._stream_settings = stream_settings
         self._stream_state = stream_state
@@ -160,83 +156,83 @@ class StreamMuxer:
         self,
         memory_file: BytesIO,
         sequence: int,
-        input_vstream: av.VideoStream,
-        input_astream: av.audio.AudioStream | None,
+        input_vstream: av.video.VideoStream,
+        input_astream: av.audio.stream.AudioStream | None,
     ) -> tuple[
         av.container.OutputContainer,
-        av.VideoStream,
-        av.audio.AudioStream | None,
+        av.video.VideoStream,
+        av.audio.stream.AudioStream | None,
     ]:
         """Make a new av OutputContainer and add output streams."""
-        container_options: dict[str, str] = {
-            # Removed skip_sidx - see:
-            # https://github.com/home-assistant/core/pull/39970
-            # "cmaf" flag replaces several of the movflags used,
-            # but too recent to use for now
-            "movflags": "frag_custom+empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
-            # Sometimes the first segment begins with negative timestamps,
-            # and this setting just
-            # adjusts the timestamps in the output from that segment to start
-            # from 0. Helps from having to make some adjustments
-            # in test_durations
-            "avoid_negative_ts": "make_non_negative",
-            "fragment_index": str(sequence + 1),
-            "video_track_timescale": str(int(1 / input_vstream.time_base)),  # type: ignore[operator]
-            # Only do extra fragmenting if we are using ll_hls
-            # Let ffmpeg do the work using frag_duration
-            # Fragment durations may exceed the 15% allowed variance but it seems ok
-            **(
-                {
-                    "movflags": "empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
-                    # Create a fragment every TARGET_PART_DURATION. The data from
-                    # each fragment is stored in a "Part" that can be combined with
-                    # the data from all the other "Part"s, plus an init section,
-                    # to reconstitute the data in a "Segment".
-                    #
-                    # The LL-HLS spec allows for a fragment's duration to be within
-                    # the range [0.85x,1.0x] of the part target duration. We use the
-                    # frag_duration option to tell ffmpeg to try to cut the
-                    # fragments when they reach frag_duration. However,
-                    # the resulting fragments can have variability in their
-                    # durations and can end up being too short or too long. With a
-                    # video track with no audio, the discrete nature of frames means
-                    # that the frame at the end of a fragment will sometimes extend
-                    # slightly beyond the desired frag_duration.
-                    #
-                    # If there are two tracks, as in the case of a video feed with
-                    # audio, there is an added wrinkle as the fragment cut seems to
-                    # be done on the first track that crosses the desired threshold,
-                    # and cutting on the audio track may also result in a shorter
-                    # video fragment than desired.
-                    #
-                    # Given this, our approach is to give ffmpeg a frag_duration
-                    # somewhere in the middle of the range, hoping that the parts
-                    # stay pretty well bounded, and we adjust the part durations
-                    # a bit in the hls metadata so that everything "looks" ok.
-                    "frag_duration": str(
-                        int(self._stream_settings.part_target_duration * 9e5)
-                    ),
-                }
-                if self._stream_settings.ll_hls
-                else {}
-            ),
-        }
         container = av.open(
             memory_file,
             mode="w",
             format=SEGMENT_CONTAINER_FORMAT,
-            container_options=container_options,
+            container_options={
+                # Removed skip_sidx - see:
+                # https://github.com/home-assistant/core/pull/39970
+                # "cmaf" flag replaces several of the movflags used,
+                # but too recent to use for now
+                "movflags": "frag_custom+empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
+                # Sometimes the first segment begins with negative timestamps,
+                # and this setting just
+                # adjusts the timestamps in the output from that segment to start
+                # from 0. Helps from having to make some adjustments
+                # in test_durations
+                "avoid_negative_ts": "make_non_negative",
+                "fragment_index": str(sequence + 1),
+                "video_track_timescale": str(int(1 / input_vstream.time_base)),
+                # Only do extra fragmenting if we are using ll_hls
+                # Let ffmpeg do the work using frag_duration
+                # Fragment durations may exceed the 15% allowed variance but it seems ok
+                **(
+                    {
+                        "movflags": "empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
+                        # Create a fragment every TARGET_PART_DURATION. The data from
+                        # each fragment is stored in a "Part" that can be combined with
+                        # the data from all the other "Part"s, plus an init section,
+                        # to reconstitute the data in a "Segment".
+                        #
+                        # The LL-HLS spec allows for a fragment's duration to be within
+                        # the range [0.85x,1.0x] of the part target duration. We use the
+                        # frag_duration option to tell ffmpeg to try to cut the
+                        # fragments when they reach frag_duration. However,
+                        # the resulting fragments can have variability in their
+                        # durations and can end up being too short or too long. With a
+                        # video track with no audio, the discrete nature of frames means
+                        # that the frame at the end of a fragment will sometimes extend
+                        # slightly beyond the desired frag_duration.
+                        #
+                        # If there are two tracks, as in the case of a video feed with
+                        # audio, there is an added wrinkle as the fragment cut seems to
+                        # be done on the first track that crosses the desired threshold,
+                        # and cutting on the audio track may also result in a shorter
+                        # video fragment than desired.
+                        #
+                        # Given this, our approach is to give ffmpeg a frag_duration
+                        # somewhere in the middle of the range, hoping that the parts
+                        # stay pretty well bounded, and we adjust the part durations
+                        # a bit in the hls metadata so that everything "looks" ok.
+                        "frag_duration": str(
+                            int(self._stream_settings.part_target_duration * 9e5)
+                        ),
+                    }
+                    if self._stream_settings.ll_hls
+                    else {}
+                ),
+            },
         )
         output_vstream = container.add_stream(template=input_vstream)
         # Check if audio is requested
         output_astream = None
         if input_astream:
             if self._audio_bsf:
-                self._audio_bsf_context = av.BitStreamFilterContext(
-                    self._audio_bsf, input_astream
-                )
-            output_astream = container.add_stream(template=input_astream)
-        return container, output_vstream, output_astream  # type: ignore[return-value]
+                self._audio_bsf_context = self._audio_bsf.create()
+                self._audio_bsf_context.set_input_stream(input_astream)
+            output_astream = container.add_stream(
+                template=self._audio_bsf_context or input_astream
+            )
+        return container, output_vstream, output_astream
 
     def reset(self, video_dts: int) -> None:
         """Initialize a new stream segment."""
@@ -255,7 +251,7 @@ class StreamMuxer:
             input_astream=self._input_audio_stream,
         )
         if self._output_video_stream.name == "hevc":
-            self._output_video_stream.codec_context.codec_tag = "hvc1"
+            self._output_video_stream.codec_tag = "hvc1"
 
     def mux_packet(self, packet: av.Packet) -> None:
         """Mux a packet to the appropriate output stream."""
@@ -277,11 +273,11 @@ class StreamMuxer:
             self._part_has_keyframe |= packet.is_keyframe
 
         elif packet.stream == self._input_audio_stream:
-            assert self._output_audio_stream
             if self._audio_bsf_context:
-                for audio_packet in self._audio_bsf_context.filter(packet):
-                    audio_packet.stream = self._output_audio_stream
-                    self._av_output.mux(audio_packet)
+                self._audio_bsf_context.send(packet)
+                while packet := self._audio_bsf_context.recv():
+                    packet.stream = self._output_audio_stream
+                    self._av_output.mux(packet)
                 return
             packet.stream = self._output_audio_stream
             self._av_output.mux(packet)
@@ -399,7 +395,7 @@ class StreamMuxer:
         self._memory_file.close()
 
 
-class PeekIterator(Iterator[av.Packet]):
+class PeekIterator(Iterator):
     """An Iterator that may allow multiple passes.
 
     This may be consumed like a normal Iterator, however also supports a
@@ -463,7 +459,7 @@ class TimestampValidator:
         """Validate the packet timestamp based on ordering within the stream."""
         # Discard packets missing DTS. Terminate if too many are missing.
         if packet.dts is None:
-            if self._missing_dts >= MAX_MISSING_DTS:  # type: ignore[unreachable]
+            if self._missing_dts >= MAX_MISSING_DTS:
                 raise StreamWorkerError(
                     f"No dts in {MAX_MISSING_DTS+1} consecutive packets"
                 )
@@ -490,7 +486,7 @@ def is_keyframe(packet: av.Packet) -> Any:
 
 def get_audio_bitstream_filter(
     packets: Iterator[av.Packet], audio_stream: Any
-) -> str | None:
+) -> av.BitStreamFilterContext | None:
     """Return the aac_adtstoasc bitstream filter if ADTS AAC is detected."""
     if not audio_stream:
         return None
@@ -507,7 +503,7 @@ def get_audio_bitstream_filter(
                         _LOGGER.debug(
                             "ADTS AAC detected. Adding aac_adtstoaac bitstream filter"
                         )
-                        return "aac_adtstoasc"
+                        return av.BitStreamFilter("aac_adtstoasc")
             break
     return None
 
@@ -528,7 +524,7 @@ def stream_worker(
         del pyav_options["stimeout"]
     try:
         container = av.open(source, options=pyav_options, timeout=SOURCE_TIMEOUT)
-    except av.FFmpegError as err:
+    except av.AVError as err:
         raise StreamWorkerError(
             f"Error opening stream ({redact_av_error_string(err)})"
         ) from err
@@ -545,7 +541,7 @@ def stream_worker(
         audio_stream = None
     # Some audio streams do not have a profile and throw errors when remuxing
     if audio_stream and audio_stream.profile is None:
-        audio_stream = None  # type: ignore[unreachable]
+        audio_stream = None
     # Disable ll-hls for hls inputs
     if container.format.name == "hls":
         for field in fields(StreamSettings):
@@ -560,8 +556,8 @@ def stream_worker(
         stream_state.diagnostics.set_value("audio_codec", audio_stream.name)
 
     dts_validator = TimestampValidator(
-        int(1 / video_stream.time_base),  # type: ignore[operator]
-        int(1 / audio_stream.time_base) if audio_stream else 1,  # type: ignore[operator]
+        int(1 / video_stream.time_base),
+        1 / audio_stream.time_base if audio_stream else 1,
     )
     container_packets = PeekIterator(
         filter(dts_validator.is_valid, container.demux((video_stream, audio_stream)))
@@ -602,7 +598,7 @@ def stream_worker(
     except StopIteration as ex:
         container.close()
         raise StreamEndedError("Stream ended; no additional packets") from ex
-    except av.FFmpegError as ex:
+    except av.AVError as ex:
         container.close()
         raise StreamWorkerError(
             f"Error demuxing stream while finding first packet ({redact_av_error_string(ex)})"
@@ -629,7 +625,7 @@ def stream_worker(
                 raise
             except StopIteration as ex:
                 raise StreamEndedError("Stream ended; no additional packets") from ex
-            except av.FFmpegError as ex:
+            except av.AVError as ex:
                 raise StreamWorkerError(
                     f"Error demuxing stream ({redact_av_error_string(ex)})"
                 ) from ex
diff --git a/homeassistant/components/subaru/__init__.py b/homeassistant/components/subaru/__init__.py
index 3762b16e58b..db2ee7fdbbc 100644
--- a/homeassistant/components/subaru/__init__.py
+++ b/homeassistant/components/subaru/__init__.py
@@ -85,7 +85,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=COORDINATOR_NAME,
         update_method=async_update_data,
         update_interval=timedelta(seconds=FETCH_INTERVAL),
diff --git a/homeassistant/components/subaru/config_flow.py b/homeassistant/components/subaru/config_flow.py
index 0ef4ed29941..3d96a89a14f 100644
--- a/homeassistant/components/subaru/config_flow.py
+++ b/homeassistant/components/subaru/config_flow.py
@@ -106,7 +106,7 @@ class SubaruConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def validate_login_creds(self, data):
         """Validate the user input allows us to connect.
@@ -218,6 +218,10 @@ class SubaruConfigFlow(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for Subaru."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/subaru/strings.json b/homeassistant/components/subaru/strings.json
index 00da729dccd..78625192e4a 100644
--- a/homeassistant/components/subaru/strings.json
+++ b/homeassistant/components/subaru/strings.json
@@ -37,13 +37,13 @@
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "incorrect_pin": "Incorrect PIN",
       "bad_pin_format": "PIN should be 4 digits",
+      "two_factor_request_failed": "Request for 2FA code failed, please try again",
       "bad_validation_code_format": "Validation code should be 6 digits",
       "incorrect_validation_code": "Incorrect validation code"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "two_factor_request_failed": "Request for 2FA code failed, please try again"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/suez_water/__init__.py b/homeassistant/components/suez_water/__init__.py
index 06f503b85c2..f5b2880e011 100644
--- a/homeassistant/components/suez_water/__init__.py
+++ b/homeassistant/components/suez_water/__init__.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
+from pysuez import SuezClient
+from pysuez.client import PySuezError
 
-from .const import DOMAIN
-from .coordinator import SuezWaterCoordinator
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+
+from .const import CONF_COUNTER_ID, DOMAIN
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
@@ -15,10 +18,23 @@ PLATFORMS: list[Platform] = [Platform.SENSOR]
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Suez Water from a config entry."""
 
-    coordinator = SuezWaterCoordinator(hass, entry)
-    await coordinator.async_config_entry_first_refresh()
+    def get_client() -> SuezClient:
+        try:
+            client = SuezClient(
+                entry.data[CONF_USERNAME],
+                entry.data[CONF_PASSWORD],
+                entry.data[CONF_COUNTER_ID],
+                provider=None,
+            )
+            if not client.check_credentials():
+                raise ConfigEntryError
+        except PySuezError as ex:
+            raise ConfigEntryNotReady from ex
+        return client
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    hass.data.setdefault(DOMAIN, {})[
+        entry.entry_id
+    ] = await hass.async_add_executor_job(get_client)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
diff --git a/homeassistant/components/suez_water/config_flow.py b/homeassistant/components/suez_water/config_flow.py
index ac09cf4a1d3..28b211dc808 100644
--- a/homeassistant/components/suez_water/config_flow.py
+++ b/homeassistant/components/suez_water/config_flow.py
@@ -5,7 +5,8 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from pysuez import PySuezError, SuezClient
+from pysuez import SuezClient
+from pysuez.client import PySuezError
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
@@ -20,34 +21,28 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_USERNAME): str,
         vol.Required(CONF_PASSWORD): str,
-        vol.Optional(CONF_COUNTER_ID): str,
+        vol.Required(CONF_COUNTER_ID): str,
     }
 )
 
 
-async def validate_input(data: dict[str, Any]) -> None:
+def validate_input(data: dict[str, Any]) -> None:
     """Validate the user input allows us to connect.
 
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
     try:
-        counter_id = data.get(CONF_COUNTER_ID)
         client = SuezClient(
             data[CONF_USERNAME],
             data[CONF_PASSWORD],
-            counter_id,
+            data[CONF_COUNTER_ID],
+            provider=None,
         )
-        if not await client.check_credentials():
+        if not client.check_credentials():
             raise InvalidAuth
     except PySuezError as ex:
         raise CannotConnect from ex
 
-    if counter_id is None:
-        try:
-            data[CONF_COUNTER_ID] = await client.find_counter()
-        except PySuezError as ex:
-            raise CounterNotFound from ex
-
 
 class SuezWaterConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Suez Water."""
@@ -63,13 +58,11 @@ class SuezWaterConfigFlow(ConfigFlow, domain=DOMAIN):
             await self.async_set_unique_id(user_input[CONF_USERNAME])
             self._abort_if_unique_id_configured()
             try:
-                await validate_input(user_input)
+                await self.hass.async_add_executor_job(validate_input, user_input)
             except CannotConnect:
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
                 errors["base"] = "invalid_auth"
-            except CounterNotFound:
-                errors["base"] = "counter_not_found"
             except Exception:
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
@@ -89,7 +82,3 @@ class CannotConnect(HomeAssistantError):
 
 class InvalidAuth(HomeAssistantError):
     """Error to indicate there is invalid auth."""
-
-
-class CounterNotFound(HomeAssistantError):
-    """Error to indicate we cannot automatically found the counter id."""
diff --git a/homeassistant/components/suez_water/const.py b/homeassistant/components/suez_water/const.py
index cecd779c22c..7afc0d3ce3e 100644
--- a/homeassistant/components/suez_water/const.py
+++ b/homeassistant/components/suez_water/const.py
@@ -1,9 +1,5 @@
 """Constants for the Suez Water integration."""
 
-from datetime import timedelta
-
 DOMAIN = "suez_water"
 
 CONF_COUNTER_ID = "counter_id"
-
-DATA_REFRESH_INTERVAL = timedelta(hours=12)
diff --git a/homeassistant/components/suez_water/coordinator.py b/homeassistant/components/suez_water/coordinator.py
deleted file mode 100644
index 224929c606e..00000000000
--- a/homeassistant/components/suez_water/coordinator.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""Suez water update coordinator."""
-
-from collections.abc import Mapping
-from dataclasses import dataclass
-from datetime import date
-from typing import Any
-
-from pysuez import PySuezError, SuezClient
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import _LOGGER, HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import CONF_COUNTER_ID, DATA_REFRESH_INTERVAL, DOMAIN
-
-
-@dataclass
-class SuezWaterAggregatedAttributes:
-    """Class containing aggregated sensor extra attributes."""
-
-    this_month_consumption: dict[date, float]
-    previous_month_consumption: dict[date, float]
-    last_year_overall: dict[str, float]
-    this_year_overall: dict[str, float]
-    history: dict[date, float]
-    highest_monthly_consumption: float
-
-
-@dataclass
-class SuezWaterData:
-    """Class used to hold all fetch data from suez api."""
-
-    aggregated_value: float
-    aggregated_attr: Mapping[str, Any]
-    price: float
-
-
-class SuezWaterCoordinator(DataUpdateCoordinator[SuezWaterData]):
-    """Suez water coordinator."""
-
-    _suez_client: SuezClient
-    config_entry: ConfigEntry
-
-    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
-        """Initialize suez water coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=DOMAIN,
-            update_interval=DATA_REFRESH_INTERVAL,
-            always_update=True,
-            config_entry=config_entry,
-        )
-
-    async def _async_setup(self) -> None:
-        self._suez_client = SuezClient(
-            username=self.config_entry.data[CONF_USERNAME],
-            password=self.config_entry.data[CONF_PASSWORD],
-            counter_id=self.config_entry.data[CONF_COUNTER_ID],
-        )
-        if not await self._suez_client.check_credentials():
-            raise ConfigEntryError("Invalid credentials for suez water")
-
-    async def _async_update_data(self) -> SuezWaterData:
-        """Fetch data from API endpoint."""
-        try:
-            aggregated = await self._suez_client.fetch_aggregated_data()
-            data = SuezWaterData(
-                aggregated_value=aggregated.value,
-                aggregated_attr={
-                    "this_month_consumption": aggregated.current_month,
-                    "previous_month_consumption": aggregated.previous_month,
-                    "highest_monthly_consumption": aggregated.highest_monthly_consumption,
-                    "last_year_overall": aggregated.previous_year,
-                    "this_year_overall": aggregated.current_year,
-                    "history": aggregated.history,
-                },
-                price=(await self._suez_client.get_price()).price,
-            )
-        except PySuezError as err:
-            _LOGGER.exception(err)
-            raise UpdateFailed(
-                f"Suez coordinator error communicating with API: {err}"
-            ) from err
-        _LOGGER.debug("Successfully fetched suez data")
-        return data
diff --git a/homeassistant/components/suez_water/manifest.json b/homeassistant/components/suez_water/manifest.json
index 5eb05b9acb7..4503d7a1119 100644
--- a/homeassistant/components/suez_water/manifest.json
+++ b/homeassistant/components/suez_water/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "suez_water",
   "name": "Suez Water",
-  "codeowners": ["@ooii", "@jb101010-2"],
+  "codeowners": ["@ooii"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/suez_water",
   "iot_class": "cloud_polling",
   "loggers": ["pysuez", "regex"],
-  "requirements": ["pysuezV2==1.3.1"]
+  "requirements": ["pysuez==0.2.0"]
 }
diff --git a/homeassistant/components/suez_water/sensor.py b/homeassistant/components/suez_water/sensor.py
index 2ba699a9af1..5b00cbf2dc4 100644
--- a/homeassistant/components/suez_water/sensor.py
+++ b/homeassistant/components/suez_water/sensor.py
@@ -2,53 +2,24 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Mapping
-from dataclasses import dataclass
-from typing import Any
+from datetime import timedelta
+import logging
 
-from pysuez.const import ATTRIBUTION
+from pysuez import SuezClient
+from pysuez.client import PySuezError
 
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-)
+from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CURRENCY_EURO, UnitOfVolume
+from homeassistant.const import UnitOfVolume
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_COUNTER_ID, DOMAIN
-from .coordinator import SuezWaterCoordinator, SuezWaterData
 
+_LOGGER = logging.getLogger(__name__)
 
-@dataclass(frozen=True, kw_only=True)
-class SuezWaterSensorEntityDescription(SensorEntityDescription):
-    """Describes Suez water sensor entity."""
-
-    value_fn: Callable[[SuezWaterData], float | str | None]
-    attr_fn: Callable[[SuezWaterData], Mapping[str, Any] | None] = lambda _: None
-
-
-SENSORS: tuple[SuezWaterSensorEntityDescription, ...] = (
-    SuezWaterSensorEntityDescription(
-        key="water_usage_yesterday",
-        translation_key="water_usage_yesterday",
-        native_unit_of_measurement=UnitOfVolume.LITERS,
-        device_class=SensorDeviceClass.WATER,
-        value_fn=lambda suez_data: suez_data.aggregated_value,
-        attr_fn=lambda suez_data: suez_data.aggregated_attr,
-    ),
-    SuezWaterSensorEntityDescription(
-        key="water_price",
-        translation_key="water_price",
-        native_unit_of_measurement=CURRENCY_EURO,
-        device_class=SensorDeviceClass.MONETARY,
-        value_fn=lambda suez_data: suez_data.price,
-    ),
-)
+SCAN_INTERVAL = timedelta(hours=12)
 
 
 async def async_setup_entry(
@@ -57,43 +28,68 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Suez Water sensor from a config entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
-    counter_id = entry.data[CONF_COUNTER_ID]
-
-    async_add_entities(
-        SuezWaterSensor(coordinator, counter_id, description) for description in SENSORS
-    )
+    client = hass.data[DOMAIN][entry.entry_id]
+    async_add_entities([SuezSensor(client, entry.data[CONF_COUNTER_ID])], True)
 
 
-class SuezWaterSensor(CoordinatorEntity[SuezWaterCoordinator], SensorEntity):
-    """Representation of a Suez water sensor."""
+class SuezSensor(SensorEntity):
+    """Representation of a Sensor."""
 
     _attr_has_entity_name = True
-    _attr_attribution = ATTRIBUTION
-    entity_description: SuezWaterSensorEntityDescription
+    _attr_translation_key = "water_usage_yesterday"
+    _attr_native_unit_of_measurement = UnitOfVolume.LITERS
+    _attr_device_class = SensorDeviceClass.WATER
 
-    def __init__(
-        self,
-        coordinator: SuezWaterCoordinator,
-        counter_id: int,
-        entity_description: SuezWaterSensorEntityDescription,
-    ) -> None:
-        """Initialize the suez water sensor entity."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{counter_id}_{entity_description.key}"
+    def __init__(self, client: SuezClient, counter_id: int) -> None:
+        """Initialize the data object."""
+        self.client = client
+        self._attr_extra_state_attributes = {}
+        self._attr_unique_id = f"{counter_id}_water_usage_yesterday"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, str(counter_id))},
             entry_type=DeviceEntryType.SERVICE,
             manufacturer="Suez",
         )
-        self.entity_description = entity_description
 
-    @property
-    def native_value(self) -> float | str | None:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator.data)
+    def _fetch_data(self) -> None:
+        """Fetch latest data from Suez."""
+        try:
+            self.client.update()
+            # _state holds the volume of consumed water during previous day
+            self._attr_native_value = self.client.state
+            self._attr_available = True
+            self._attr_attribution = self.client.attributes["attribution"]
 
-    @property
-    def extra_state_attributes(self) -> Mapping[str, Any] | None:
-        """Return extra state of the sensor."""
-        return self.entity_description.attr_fn(self.coordinator.data)
+            self._attr_extra_state_attributes["this_month_consumption"] = {}
+            for item in self.client.attributes["thisMonthConsumption"]:
+                self._attr_extra_state_attributes["this_month_consumption"][item] = (
+                    self.client.attributes["thisMonthConsumption"][item]
+                )
+            self._attr_extra_state_attributes["previous_month_consumption"] = {}
+            for item in self.client.attributes["previousMonthConsumption"]:
+                self._attr_extra_state_attributes["previous_month_consumption"][
+                    item
+                ] = self.client.attributes["previousMonthConsumption"][item]
+            self._attr_extra_state_attributes["highest_monthly_consumption"] = (
+                self.client.attributes["highestMonthlyConsumption"]
+            )
+            self._attr_extra_state_attributes["last_year_overall"] = (
+                self.client.attributes["lastYearOverAll"]
+            )
+            self._attr_extra_state_attributes["this_year_overall"] = (
+                self.client.attributes["thisYearOverAll"]
+            )
+            self._attr_extra_state_attributes["history"] = {}
+            for item in self.client.attributes["history"]:
+                self._attr_extra_state_attributes["history"][item] = (
+                    self.client.attributes["history"][item]
+                )
+
+        except PySuezError:
+            self._attr_available = False
+            _LOGGER.warning("Unable to fetch data")
+
+    def update(self) -> None:
+        """Return the latest collected data from Suez."""
+        self._fetch_data()
+        _LOGGER.debug("Suez data state is: %s", self.native_value)
diff --git a/homeassistant/components/suez_water/strings.json b/homeassistant/components/suez_water/strings.json
index 6be2affab97..f9abd70fc19 100644
--- a/homeassistant/components/suez_water/strings.json
+++ b/homeassistant/components/suez_water/strings.json
@@ -12,8 +12,7 @@
     "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%]",
-      "counter_not_found": "Could not find counter id automatically"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
@@ -23,9 +22,6 @@
     "sensor": {
       "water_usage_yesterday": {
         "name": "Water usage yesterday"
-      },
-      "water_price": {
-        "name": "Water price"
       }
     }
   }
diff --git a/homeassistant/components/switchbot/__init__.py b/homeassistant/components/switchbot/__init__.py
index c2b4b2ad736..75845d3f3ce 100644
--- a/homeassistant/components/switchbot/__init__.py
+++ b/homeassistant/components/switchbot/__init__.py
@@ -41,7 +41,6 @@ PLATFORMS_BY_TYPE = {
         Platform.SENSOR,
     ],
     SupportedModels.HYGROMETER.value: [Platform.SENSOR],
-    SupportedModels.HYGROMETER_CO2.value: [Platform.SENSOR],
     SupportedModels.CONTACT.value: [Platform.BINARY_SENSOR, Platform.SENSOR],
     SupportedModels.MOTION.value: [Platform.BINARY_SENSOR, Platform.SENSOR],
     SupportedModels.HUMIDIFIER.value: [Platform.HUMIDIFIER, Platform.SENSOR],
diff --git a/homeassistant/components/switchbot/config_flow.py b/homeassistant/components/switchbot/config_flow.py
index a0e45169770..0468db5618a 100644
--- a/homeassistant/components/switchbot/config_flow.py
+++ b/homeassistant/components/switchbot/config_flow.py
@@ -80,7 +80,7 @@ class SwitchbotConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> SwitchbotOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return SwitchbotOptionsFlowHandler()
+        return SwitchbotOptionsFlowHandler(config_entry)
 
     def __init__(self) -> None:
         """Initialize the config flow."""
@@ -346,6 +346,10 @@ class SwitchbotConfigFlow(ConfigFlow, domain=DOMAIN):
 class SwitchbotOptionsFlowHandler(OptionsFlow):
     """Handle Switchbot options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/switchbot/const.py b/homeassistant/components/switchbot/const.py
index 19b264bd46f..bd727edfea4 100644
--- a/homeassistant/components/switchbot/const.py
+++ b/homeassistant/components/switchbot/const.py
@@ -20,7 +20,6 @@ class SupportedModels(StrEnum):
     CEILING_LIGHT = "ceiling_light"
     CURTAIN = "curtain"
     HYGROMETER = "hygrometer"
-    HYGROMETER_CO2 = "hygrometer_co2"
     LIGHT_STRIP = "light_strip"
     CONTACT = "contact"
     PLUG = "plug"
@@ -49,8 +48,6 @@ CONNECTABLE_SUPPORTED_MODEL_TYPES = {
 NON_CONNECTABLE_SUPPORTED_MODEL_TYPES = {
     SwitchbotModel.METER: SupportedModels.HYGROMETER,
     SwitchbotModel.IO_METER: SupportedModels.HYGROMETER,
-    SwitchbotModel.METER_PRO: SupportedModels.HYGROMETER,
-    SwitchbotModel.METER_PRO_C: SupportedModels.HYGROMETER_CO2,
     SwitchbotModel.CONTACT_SENSOR: SupportedModels.CONTACT,
     SwitchbotModel.MOTION_SENSOR: SupportedModels.MOTION,
 }
diff --git a/homeassistant/components/switchbot/manifest.json b/homeassistant/components/switchbot/manifest.json
index 0e369f8ad2d..f97162184c6 100644
--- a/homeassistant/components/switchbot/manifest.json
+++ b/homeassistant/components/switchbot/manifest.json
@@ -39,5 +39,5 @@
   "documentation": "https://www.home-assistant.io/integrations/switchbot",
   "iot_class": "local_push",
   "loggers": ["switchbot"],
-  "requirements": ["PySwitchbot==0.51.0"]
+  "requirements": ["PySwitchbot==0.48.2"]
 }
diff --git a/homeassistant/components/switchbot/sensor.py b/homeassistant/components/switchbot/sensor.py
index fd3de3e31e9..e696f21e082 100644
--- a/homeassistant/components/switchbot/sensor.py
+++ b/homeassistant/components/switchbot/sensor.py
@@ -10,7 +10,6 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
@@ -51,12 +50,6 @@ SENSOR_TYPES: dict[str, SensorEntityDescription] = {
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    "co2": SensorEntityDescription(
-        key="co2",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.CO2,
-    ),
     "lightLevel": SensorEntityDescription(
         key="lightLevel",
         translation_key="light_level",
diff --git a/homeassistant/components/switchbot_cloud/__init__.py b/homeassistant/components/switchbot_cloud/__init__.py
index 625b4698301..39a179aaa21 100644
--- a/homeassistant/components/switchbot_cloud/__init__.py
+++ b/homeassistant/components/switchbot_cloud/__init__.py
@@ -17,7 +17,6 @@ from .coordinator import SwitchBotCoordinator
 _LOGGER = getLogger(__name__)
 PLATFORMS: list[Platform] = [
     Platform.CLIMATE,
-    Platform.LOCK,
     Platform.SENSOR,
     Platform.SWITCH,
     Platform.VACUUM,
@@ -32,7 +31,6 @@ class SwitchbotDevices:
     switches: list[Device | Remote] = field(default_factory=list)
     sensors: list[Device] = field(default_factory=list)
     vacuums: list[Device] = field(default_factory=list)
-    locks: list[Device] = field(default_factory=list)
 
 
 @dataclass
@@ -85,9 +83,6 @@ def make_device_data(
             "Meter",
             "MeterPlus",
             "WoIOSensor",
-            "Hub 2",
-            "MeterPro",
-            "MeterPro(CO2)",
         ]:
             devices_data.sensors.append(
                 prepare_device(hass, api, device, coordinators_by_id)
@@ -102,10 +97,6 @@ def make_device_data(
                 prepare_device(hass, api, device, coordinators_by_id)
             )
 
-        if isinstance(device, Device) and device.device_type.startswith("Smart Lock"):
-            devices_data.locks.append(
-                prepare_device(hass, api, device, coordinators_by_id)
-            )
     return devices_data
 
 
diff --git a/homeassistant/components/switchbot_cloud/lock.py b/homeassistant/components/switchbot_cloud/lock.py
deleted file mode 100644
index 2fbd551b919..00000000000
--- a/homeassistant/components/switchbot_cloud/lock.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""Support for the Switchbot lock."""
-
-from typing import Any
-
-from switchbot_api import LockCommands
-
-from homeassistant.components.lock import LockEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import SwitchbotCloudData
-from .const import DOMAIN
-from .entity import SwitchBotCloudEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SwitchBot Cloud entry."""
-    data: SwitchbotCloudData = hass.data[DOMAIN][config.entry_id]
-    async_add_entities(
-        SwitchBotCloudLock(data.api, device, coordinator)
-        for device, coordinator in data.devices.locks
-    )
-
-
-class SwitchBotCloudLock(SwitchBotCloudEntity, LockEntity):
-    """Representation of a SwitchBot lock."""
-
-    _attr_name = None
-
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        if coord_data := self.coordinator.data:
-            self._attr_is_locked = coord_data["lockState"] == "locked"
-            self.async_write_ha_state()
-
-    async def async_lock(self, **kwargs: Any) -> None:
-        """Lock the lock."""
-        await self.send_api_command(LockCommands.LOCK)
-        self._attr_is_locked = True
-        self.async_write_ha_state()
-
-    async def async_unlock(self, **kwargs: Any) -> None:
-        """Unlock the lock."""
-
-        await self.send_api_command(LockCommands.UNLOCK)
-        self._attr_is_locked = False
-        self.async_write_ha_state()
diff --git a/homeassistant/components/switchbot_cloud/sensor.py b/homeassistant/components/switchbot_cloud/sensor.py
index 90135ad96b3..ac612aea119 100644
--- a/homeassistant/components/switchbot_cloud/sensor.py
+++ b/homeassistant/components/switchbot_cloud/sensor.py
@@ -9,11 +9,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfTemperature,
-)
+from homeassistant.const import PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -25,7 +21,6 @@ from .entity import SwitchBotCloudEntity
 SENSOR_TYPE_TEMPERATURE = "temperature"
 SENSOR_TYPE_HUMIDITY = "humidity"
 SENSOR_TYPE_BATTERY = "battery"
-SENSOR_TYPE_CO2 = "CO2"
 
 METER_PLUS_SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
@@ -48,16 +43,6 @@ METER_PLUS_SENSOR_DESCRIPTIONS = (
     ),
 )
 
-METER_PRO_CO2_SENSOR_DESCRIPTIONS = (
-    *METER_PLUS_SENSOR_DESCRIPTIONS,
-    SensorEntityDescription(
-        key=SENSOR_TYPE_CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.CO2,
-    ),
-)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -70,11 +55,7 @@ async def async_setup_entry(
     async_add_entities(
         SwitchBotCloudSensor(data.api, device, coordinator, description)
         for device, coordinator in data.devices.sensors
-        for description in (
-            METER_PRO_CO2_SENSOR_DESCRIPTIONS
-            if device.device_type == "MeterPro(CO2)"
-            else METER_PLUS_SENSOR_DESCRIPTIONS
-        )
+        for description in METER_PLUS_SENSOR_DESCRIPTIONS
     )
 
 
diff --git a/homeassistant/components/switcher_kis/coordinator.py b/homeassistant/components/switcher_kis/coordinator.py
index 118c86b8d78..d292e9f8f39 100644
--- a/homeassistant/components/switcher_kis/coordinator.py
+++ b/homeassistant/components/switcher_kis/coordinator.py
@@ -23,8 +23,6 @@ class SwitcherDataUpdateCoordinator(
 ):
     """Switcher device data update coordinator."""
 
-    config_entry: ConfigEntry
-
     def __init__(
         self,
         hass: HomeAssistant,
@@ -35,10 +33,10 @@ class SwitcherDataUpdateCoordinator(
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=device.name,
             update_interval=timedelta(seconds=MAX_UPDATE_INTERVAL_SEC),
         )
+        self.entry = entry
         self.data = device
         self.token = entry.data.get(CONF_TOKEN)
 
@@ -69,7 +67,7 @@ class SwitcherDataUpdateCoordinator(
         """Set up the coordinator."""
         dev_reg = dr.async_get(self.hass)
         dev_reg.async_get_or_create(
-            config_entry_id=self.config_entry.entry_id,
+            config_entry_id=self.entry.entry_id,
             connections={(dr.CONNECTION_NETWORK_MAC, self.mac_address)},
             identifiers={(DOMAIN, self.device_id)},
             manufacturer="Switcher",
diff --git a/homeassistant/components/switcher_kis/cover.py b/homeassistant/components/switcher_kis/cover.py
index dc3b6d96aed..d81611b1629 100644
--- a/homeassistant/components/switcher_kis/cover.py
+++ b/homeassistant/components/switcher_kis/cover.py
@@ -40,31 +40,21 @@ async def async_setup_entry(
     @callback
     def async_add_cover(coordinator: SwitcherDataUpdateCoordinator) -> None:
         """Add cover from Switcher device."""
-        entities: list[CoverEntity] = []
-
         if coordinator.data.device_type.category in (
             DeviceCategory.SHUTTER,
             DeviceCategory.SINGLE_SHUTTER_DUAL_LIGHT,
-            DeviceCategory.DUAL_SHUTTER_SINGLE_LIGHT,
         ):
-            number_of_covers = len(cast(SwitcherShutter, coordinator.data).position)
-            if number_of_covers == 1:
-                entities.append(SwitcherSingleCoverEntity(coordinator, 0))
-            else:
-                entities.extend(
-                    SwitcherMultiCoverEntity(coordinator, i)
-                    for i in range(number_of_covers)
-                )
-        async_add_entities(entities)
+            async_add_entities([SwitcherCoverEntity(coordinator, 0)])
 
     config_entry.async_on_unload(
         async_dispatcher_connect(hass, SIGNAL_DEVICE_ADD, async_add_cover)
     )
 
 
-class SwitcherBaseCoverEntity(SwitcherEntity, CoverEntity):
+class SwitcherCoverEntity(SwitcherEntity, CoverEntity):
     """Representation of a Switcher cover entity."""
 
+    _attr_name = None
     _attr_device_class = CoverDeviceClass.SHUTTER
     _attr_supported_features = (
         CoverEntityFeature.OPEN
@@ -72,7 +62,19 @@ class SwitcherBaseCoverEntity(SwitcherEntity, CoverEntity):
         | CoverEntityFeature.SET_POSITION
         | CoverEntityFeature.STOP
     )
-    _cover_id: int
+
+    def __init__(
+        self,
+        coordinator: SwitcherDataUpdateCoordinator,
+        cover_id: int | None = None,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+        self._cover_id = cover_id
+
+        self._attr_unique_id = f"{coordinator.device_id}-{coordinator.mac_address}"
+
+        self._update_data()
 
     @callback
     def _handle_coordinator_update(self) -> None:
@@ -83,14 +85,10 @@ class SwitcherBaseCoverEntity(SwitcherEntity, CoverEntity):
     def _update_data(self) -> None:
         """Update data from device."""
         data = cast(SwitcherShutter, self.coordinator.data)
-        self._attr_current_cover_position = data.position[self._cover_id]
-        self._attr_is_closed = data.position[self._cover_id] == 0
-        self._attr_is_closing = (
-            data.direction[self._cover_id] == ShutterDirection.SHUTTER_DOWN
-        )
-        self._attr_is_opening = (
-            data.direction[self._cover_id] == ShutterDirection.SHUTTER_UP
-        )
+        self._attr_current_cover_position = data.position
+        self._attr_is_closed = data.position == 0
+        self._attr_is_closing = data.direction == ShutterDirection.SHUTTER_DOWN
+        self._attr_is_opening = data.direction == ShutterDirection.SHUTTER_UP
 
     async def _async_call_api(self, api: str, *args: Any) -> None:
         """Call Switcher API."""
@@ -135,44 +133,3 @@ class SwitcherBaseCoverEntity(SwitcherEntity, CoverEntity):
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
         await self._async_call_api(API_STOP, self._cover_id)
-
-
-class SwitcherSingleCoverEntity(SwitcherBaseCoverEntity):
-    """Representation of a Switcher single cover entity."""
-
-    _attr_name = None
-
-    def __init__(
-        self,
-        coordinator: SwitcherDataUpdateCoordinator,
-        cover_id: int,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._cover_id = cover_id
-
-        self._attr_unique_id = f"{coordinator.device_id}-{coordinator.mac_address}"
-
-        self._update_data()
-
-
-class SwitcherMultiCoverEntity(SwitcherBaseCoverEntity):
-    """Representation of a Switcher multiple cover entity."""
-
-    _attr_translation_key = "cover"
-
-    def __init__(
-        self,
-        coordinator: SwitcherDataUpdateCoordinator,
-        cover_id: int,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._cover_id = cover_id
-
-        self._attr_translation_placeholders = {"cover_id": str(cover_id + 1)}
-        self._attr_unique_id = (
-            f"{coordinator.device_id}-{coordinator.mac_address}-{cover_id}"
-        )
-
-        self._update_data()
diff --git a/homeassistant/components/switcher_kis/light.py b/homeassistant/components/switcher_kis/light.py
index bd87176bcf0..d3e8d52bc00 100644
--- a/homeassistant/components/switcher_kis/light.py
+++ b/homeassistant/components/switcher_kis/light.py
@@ -6,7 +6,11 @@ import logging
 from typing import Any, cast
 
 from aioswitcher.api import SwitcherBaseResponse, SwitcherType2Api
-from aioswitcher.device import DeviceCategory, DeviceState, SwitcherLight
+from aioswitcher.device import (
+    DeviceCategory,
+    DeviceState,
+    SwitcherSingleShutterDualLight,
+)
 
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
@@ -34,35 +38,42 @@ async def async_setup_entry(
     @callback
     def async_add_light(coordinator: SwitcherDataUpdateCoordinator) -> None:
         """Add light from Switcher device."""
-        entities: list[LightEntity] = []
-
-        if coordinator.data.device_type.category in (
-            DeviceCategory.SINGLE_SHUTTER_DUAL_LIGHT,
-            DeviceCategory.DUAL_SHUTTER_SINGLE_LIGHT,
-            DeviceCategory.LIGHT,
+        if (
+            coordinator.data.device_type.category
+            == DeviceCategory.SINGLE_SHUTTER_DUAL_LIGHT
         ):
-            number_of_lights = len(cast(SwitcherLight, coordinator.data).light)
-            if number_of_lights == 1:
-                entities.append(SwitcherSingleLightEntity(coordinator, 0))
-            else:
-                entities.extend(
-                    SwitcherMultiLightEntity(coordinator, i)
-                    for i in range(number_of_lights)
-                )
-        async_add_entities(entities)
+            async_add_entities(
+                [
+                    SwitcherLightEntity(coordinator, 0),
+                    SwitcherLightEntity(coordinator, 1),
+                ]
+            )
 
     config_entry.async_on_unload(
         async_dispatcher_connect(hass, SIGNAL_DEVICE_ADD, async_add_light)
     )
 
 
-class SwitcherBaseLightEntity(SwitcherEntity, LightEntity):
+class SwitcherLightEntity(SwitcherEntity, LightEntity):
     """Representation of a Switcher light entity."""
 
     _attr_color_mode = ColorMode.ONOFF
     _attr_supported_color_modes = {ColorMode.ONOFF}
-    control_result: bool | None = None
-    _light_id: int
+    _attr_translation_key = "light"
+
+    def __init__(
+        self, coordinator: SwitcherDataUpdateCoordinator, light_id: int
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+        self._light_id = light_id
+        self.control_result: bool | None = None
+
+        # Entity class attributes
+        self._attr_translation_placeholders = {"light_id": str(light_id + 1)}
+        self._attr_unique_id = (
+            f"{coordinator.device_id}-{coordinator.mac_address}-{light_id}"
+        )
 
     @callback
     def _handle_coordinator_update(self) -> None:
@@ -76,8 +87,8 @@ class SwitcherBaseLightEntity(SwitcherEntity, LightEntity):
         if self.control_result is not None:
             return self.control_result
 
-        data = cast(SwitcherLight, self.coordinator.data)
-        return bool(data.light[self._light_id] == DeviceState.ON)
+        data = cast(SwitcherSingleShutterDualLight, self.coordinator.data)
+        return bool(data.lights[self._light_id] == DeviceState.ON)
 
     async def _async_call_api(self, api: str, *args: Any) -> None:
         """Call Switcher API."""
@@ -116,44 +127,3 @@ class SwitcherBaseLightEntity(SwitcherEntity, LightEntity):
         await self._async_call_api(API_SET_LIGHT, DeviceState.OFF, self._light_id)
         self.control_result = False
         self.async_write_ha_state()
-
-
-class SwitcherSingleLightEntity(SwitcherBaseLightEntity):
-    """Representation of a Switcher single light entity."""
-
-    _attr_name = None
-
-    def __init__(
-        self,
-        coordinator: SwitcherDataUpdateCoordinator,
-        light_id: int,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._light_id = light_id
-        self.control_result: bool | None = None
-
-        # Entity class attributes
-        self._attr_unique_id = f"{coordinator.device_id}-{coordinator.mac_address}"
-
-
-class SwitcherMultiLightEntity(SwitcherBaseLightEntity):
-    """Representation of a Switcher multiple light entity."""
-
-    _attr_translation_key = "light"
-
-    def __init__(
-        self,
-        coordinator: SwitcherDataUpdateCoordinator,
-        light_id: int,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._light_id = light_id
-        self.control_result: bool | None = None
-
-        # Entity class attributes
-        self._attr_translation_placeholders = {"light_id": str(light_id + 1)}
-        self._attr_unique_id = (
-            f"{coordinator.device_id}-{coordinator.mac_address}-{light_id}"
-        )
diff --git a/homeassistant/components/switcher_kis/manifest.json b/homeassistant/components/switcher_kis/manifest.json
index 4a50d992d6d..902316f374e 100644
--- a/homeassistant/components/switcher_kis/manifest.json
+++ b/homeassistant/components/switcher_kis/manifest.json
@@ -7,6 +7,6 @@
   "iot_class": "local_push",
   "loggers": ["aioswitcher"],
   "quality_scale": "platinum",
-  "requirements": ["aioswitcher==4.4.0"],
+  "requirements": ["aioswitcher==4.0.3"],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/switcher_kis/strings.json b/homeassistant/components/switcher_kis/strings.json
index 798a43c981c..68f9f9d590c 100644
--- a/homeassistant/components/switcher_kis/strings.json
+++ b/homeassistant/components/switcher_kis/strings.json
@@ -43,11 +43,6 @@
         "name": "Vertical swing off"
       }
     },
-    "cover": {
-      "cover": {
-        "name": "Cover {cover_id}"
-      }
-    },
     "light": {
       "light": {
         "name": "Light {light_id}"
diff --git a/homeassistant/components/syncthru/__init__.py b/homeassistant/components/syncthru/__init__.py
index 2817f4c21ce..b3d1230fdfe 100644
--- a/homeassistant/components/syncthru/__init__.py
+++ b/homeassistant/components/syncthru/__init__.py
@@ -52,7 +52,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator[SyncThru](
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=async_update_data,
         update_interval=timedelta(seconds=30),
diff --git a/homeassistant/components/synology_dsm/config_flow.py b/homeassistant/components/synology_dsm/config_flow.py
index 918a24035f8..70ab13c5c09 100644
--- a/homeassistant/components/synology_dsm/config_flow.py
+++ b/homeassistant/components/synology_dsm/config_flow.py
@@ -118,7 +118,7 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> SynologyDSMOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return SynologyDSMOptionsFlowHandler()
+        return SynologyDSMOptionsFlowHandler(config_entry)
 
     def __init__(self) -> None:
         """Initialize the synology_dsm config flow."""
@@ -376,6 +376,10 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
 class SynologyDSMOptionsFlowHandler(OptionsFlow):
     """Handle a option flow."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/systemmonitor/manifest.json b/homeassistant/components/systemmonitor/manifest.json
index 4c6ae0653d3..236f25bb1ed 100644
--- a/homeassistant/components/systemmonitor/manifest.json
+++ b/homeassistant/components/systemmonitor/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/systemmonitor",
   "iot_class": "local_push",
   "loggers": ["psutil"],
-  "requirements": ["psutil-home-assistant==0.0.1", "psutil==6.1.0"]
+  "requirements": ["psutil-home-assistant==0.0.1", "psutil==6.0.0"]
 }
diff --git a/homeassistant/components/tado/config_flow.py b/homeassistant/components/tado/config_flow.py
index c7bb7684901..2ab2a86f200 100644
--- a/homeassistant/components/tado/config_flow.py
+++ b/homeassistant/components/tado/config_flow.py
@@ -160,12 +160,16 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
 
 class OptionsFlowHandler(OptionsFlow):
     """Handle an option flow for Tado."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/tado/manifest.json b/homeassistant/components/tado/manifest.json
index 652d51f0261..b0c00c888b7 100644
--- a/homeassistant/components/tado/manifest.json
+++ b/homeassistant/components/tado/manifest.json
@@ -14,5 +14,5 @@
   },
   "iot_class": "cloud_polling",
   "loggers": ["PyTado"],
-  "requirements": ["python-tado==0.17.7"]
+  "requirements": ["python-tado==0.17.6"]
 }
diff --git a/homeassistant/components/tankerkoenig/config_flow.py b/homeassistant/components/tankerkoenig/config_flow.py
index 509f293665d..b13bfa1fa36 100644
--- a/homeassistant/components/tankerkoenig/config_flow.py
+++ b/homeassistant/components/tankerkoenig/config_flow.py
@@ -74,7 +74,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -236,8 +236,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Handle an options flow."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
         self._stations: dict[str, str] = {}
 
     async def async_step_init(
diff --git a/homeassistant/components/tedee/__init__.py b/homeassistant/components/tedee/__init__.py
index 528a5052678..a1b87cf13a4 100644
--- a/homeassistant/components/tedee/__init__.py
+++ b/homeassistant/components/tedee/__init__.py
@@ -7,7 +7,7 @@ from typing import Any
 
 from aiohttp.hdrs import METH_POST
 from aiohttp.web import Request, Response
-from aiotedee.exception import TedeeDataUpdateException, TedeeWebhookException
+from pytedee_async.exception import TedeeDataUpdateException, TedeeWebhookException
 
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.components.webhook import (
@@ -23,7 +23,7 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.network import get_url
 
 from .const import DOMAIN, NAME
-from .coordinator import TedeeApiCoordinator, TedeeConfigEntry
+from .coordinator import TedeeApiCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -33,11 +33,13 @@ PLATFORMS = [
 
 _LOGGER = logging.getLogger(__name__)
 
+type TedeeConfigEntry = ConfigEntry[TedeeApiCoordinator]
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: TedeeConfigEntry) -> bool:
     """Integration setup."""
 
-    coordinator = TedeeApiCoordinator(hass, entry)
+    coordinator = TedeeApiCoordinator(hass)
 
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/tedee/binary_sensor.py b/homeassistant/components/tedee/binary_sensor.py
index b586db7c2a7..3a7d1a12f2e 100644
--- a/homeassistant/components/tedee/binary_sensor.py
+++ b/homeassistant/components/tedee/binary_sensor.py
@@ -3,8 +3,8 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from aiotedee import TedeeLock
-from aiotedee.lock import TedeeLockState
+from pytedee_async import TedeeLock
+from pytedee_async.lock import TedeeLockState
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -15,7 +15,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .coordinator import TedeeConfigEntry
+from . import TedeeConfigEntry
 from .entity import TedeeDescriptionEntity
 
 
diff --git a/homeassistant/components/tedee/config_flow.py b/homeassistant/components/tedee/config_flow.py
index 422d818d1b5..65d4ec12e80 100644
--- a/homeassistant/components/tedee/config_flow.py
+++ b/homeassistant/components/tedee/config_flow.py
@@ -4,7 +4,7 @@ from collections.abc import Mapping
 import logging
 from typing import Any
 
-from aiotedee import (
+from pytedee_async import (
     TedeeAuthException,
     TedeeClient,
     TedeeClientException,
diff --git a/homeassistant/components/tedee/coordinator.py b/homeassistant/components/tedee/coordinator.py
index 445585a1a2c..1dab31b052b 100644
--- a/homeassistant/components/tedee/coordinator.py
+++ b/homeassistant/components/tedee/coordinator.py
@@ -1,14 +1,12 @@
 """Coordinator for Tedee locks."""
 
-from __future__ import annotations
-
 from collections.abc import Awaitable, Callable
 from datetime import timedelta
 import logging
 import time
 from typing import Any
 
-from aiotedee import (
+from pytedee_async import (
     TedeeClient,
     TedeeClientException,
     TedeeDataUpdateException,
@@ -16,7 +14,7 @@ from aiotedee import (
     TedeeLock,
     TedeeWebhookException,
 )
-from aiotedee.bridge import TedeeBridge
+from pytedee_async.bridge import TedeeBridge
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
@@ -33,21 +31,18 @@ GET_LOCKS_INTERVAL_SECONDS = 3600
 
 _LOGGER = logging.getLogger(__name__)
 
-type TedeeConfigEntry = ConfigEntry[TedeeApiCoordinator]
-
 
 class TedeeApiCoordinator(DataUpdateCoordinator[dict[int, TedeeLock]]):
     """Class to handle fetching data from the tedee API centrally."""
 
-    config_entry: TedeeConfigEntry
+    config_entry: ConfigEntry
     bridge: TedeeBridge
 
-    def __init__(self, hass: HomeAssistant, entry: TedeeConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize coordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/tedee/entity.py b/homeassistant/components/tedee/entity.py
index 96cc6f2b3f5..c72e293a292 100644
--- a/homeassistant/components/tedee/entity.py
+++ b/homeassistant/components/tedee/entity.py
@@ -1,6 +1,6 @@
 """Bases for Tedee entities."""
 
-from aiotedee.lock import TedeeLock
+from pytedee_async.lock import TedeeLock
 
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import DeviceInfo
diff --git a/homeassistant/components/tedee/lock.py b/homeassistant/components/tedee/lock.py
index 6e89a48f2a0..8f0587de8ae 100644
--- a/homeassistant/components/tedee/lock.py
+++ b/homeassistant/components/tedee/lock.py
@@ -2,15 +2,16 @@
 
 from typing import Any
 
-from aiotedee import TedeeClientException, TedeeLock, TedeeLockState
+from pytedee_async import TedeeClientException, TedeeLock, TedeeLockState
 
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import TedeeConfigEntry
 from .const import DOMAIN
-from .coordinator import TedeeApiCoordinator, TedeeConfigEntry
+from .coordinator import TedeeApiCoordinator
 from .entity import TedeeEntity
 
 
diff --git a/homeassistant/components/tedee/manifest.json b/homeassistant/components/tedee/manifest.json
index bca51f08f93..4f071267a25 100644
--- a/homeassistant/components/tedee/manifest.json
+++ b/homeassistant/components/tedee/manifest.json
@@ -6,7 +6,7 @@
   "dependencies": ["http", "webhook"],
   "documentation": "https://www.home-assistant.io/integrations/tedee",
   "iot_class": "local_push",
-  "loggers": ["aiotedee"],
+  "loggers": ["pytedee_async"],
   "quality_scale": "platinum",
-  "requirements": ["aiotedee==0.2.20"]
+  "requirements": ["pytedee-async==0.2.20"]
 }
diff --git a/homeassistant/components/tedee/sensor.py b/homeassistant/components/tedee/sensor.py
index 90f76317fff..c7d14af1f31 100644
--- a/homeassistant/components/tedee/sensor.py
+++ b/homeassistant/components/tedee/sensor.py
@@ -3,7 +3,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from aiotedee import TedeeLock
+from pytedee_async import TedeeLock
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -15,7 +15,7 @@ from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .coordinator import TedeeConfigEntry
+from . import TedeeConfigEntry
 from .entity import TedeeDescriptionEntity
 
 
diff --git a/homeassistant/components/tedee/strings.json b/homeassistant/components/tedee/strings.json
index b6966fa2933..2dc0e23968c 100644
--- a/homeassistant/components/tedee/strings.json
+++ b/homeassistant/components/tedee/strings.json
@@ -38,8 +38,7 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "You selected a different bridge than the one this config entry was configured with, this is not allowed."
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
     },
     "error": {
       "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py
index b9a032d7f28..64e2517a40b 100644
--- a/homeassistant/components/telegram_bot/__init__.py
+++ b/homeassistant/components/telegram_bot/__init__.py
@@ -37,6 +37,7 @@ from homeassistant.const import (
     HTTP_DIGEST_AUTHENTICATION,
 )
 from homeassistant.core import Context, HomeAssistant, ServiceCall
+from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import config_validation as cv, issue_registry as ir
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import async_get_loaded_integration
@@ -174,14 +175,14 @@ BASE_SERVICE_SCHEMA = vol.Schema(
 )
 
 SERVICE_SCHEMA_SEND_MESSAGE = BASE_SERVICE_SCHEMA.extend(
-    {vol.Required(ATTR_MESSAGE): cv.string, vol.Optional(ATTR_TITLE): cv.string}
+    {vol.Required(ATTR_MESSAGE): cv.template, vol.Optional(ATTR_TITLE): cv.template}
 )
 
 SERVICE_SCHEMA_SEND_FILE = BASE_SERVICE_SCHEMA.extend(
     {
-        vol.Optional(ATTR_URL): cv.string,
-        vol.Optional(ATTR_FILE): cv.string,
-        vol.Optional(ATTR_CAPTION): cv.string,
+        vol.Optional(ATTR_URL): cv.template,
+        vol.Optional(ATTR_FILE): cv.template,
+        vol.Optional(ATTR_CAPTION): cv.template,
         vol.Optional(ATTR_USERNAME): cv.string,
         vol.Optional(ATTR_PASSWORD): cv.string,
         vol.Optional(ATTR_AUTHENTICATION): cv.string,
@@ -195,8 +196,8 @@ SERVICE_SCHEMA_SEND_STICKER = SERVICE_SCHEMA_SEND_FILE.extend(
 
 SERVICE_SCHEMA_SEND_LOCATION = BASE_SERVICE_SCHEMA.extend(
     {
-        vol.Required(ATTR_LONGITUDE): cv.string,
-        vol.Required(ATTR_LATITUDE): cv.string,
+        vol.Required(ATTR_LONGITUDE): cv.template,
+        vol.Required(ATTR_LATITUDE): cv.template,
     }
 )
 
@@ -228,7 +229,7 @@ SERVICE_SCHEMA_EDIT_CAPTION = vol.Schema(
             cv.positive_int, vol.All(cv.string, "last")
         ),
         vol.Required(ATTR_CHAT_ID): vol.Coerce(int),
-        vol.Required(ATTR_CAPTION): cv.string,
+        vol.Required(ATTR_CAPTION): cv.template,
         vol.Optional(ATTR_KEYBOARD_INLINE): cv.ensure_list,
     },
     extra=vol.ALLOW_EXTRA,
@@ -247,7 +248,7 @@ SERVICE_SCHEMA_EDIT_REPLYMARKUP = vol.Schema(
 
 SERVICE_SCHEMA_ANSWER_CALLBACK_QUERY = vol.Schema(
     {
-        vol.Required(ATTR_MESSAGE): cv.string,
+        vol.Required(ATTR_MESSAGE): cv.template,
         vol.Required(ATTR_CALLBACK_QUERY_ID): vol.Coerce(int),
         vol.Optional(ATTR_SHOW_ALERT): cv.boolean,
     },
@@ -401,8 +402,38 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     async def async_send_telegram_message(service: ServiceCall) -> None:
         """Handle sending Telegram Bot message service calls."""
 
+        def _render_template_attr(data, attribute):
+            if attribute_templ := data.get(attribute):
+                if any(
+                    isinstance(attribute_templ, vtype) for vtype in (float, int, str)
+                ):
+                    data[attribute] = attribute_templ
+                else:
+                    try:
+                        data[attribute] = attribute_templ.async_render(
+                            parse_result=False
+                        )
+                    except TemplateError as exc:
+                        _LOGGER.error(
+                            "TemplateError in %s: %s -> %s",
+                            attribute,
+                            attribute_templ.template,
+                            exc,
+                        )
+                        data[attribute] = attribute_templ.template
+
         msgtype = service.service
         kwargs = dict(service.data)
+        for attribute in (
+            ATTR_MESSAGE,
+            ATTR_TITLE,
+            ATTR_URL,
+            ATTR_FILE,
+            ATTR_CAPTION,
+            ATTR_LONGITUDE,
+            ATTR_LATITUDE,
+        ):
+            _render_template_attr(kwargs, attribute)
         _LOGGER.debug("New telegram message %s: %s", msgtype, kwargs)
 
         if msgtype == SERVICE_SEND_MESSAGE:
diff --git a/homeassistant/components/template/alarm_control_panel.py b/homeassistant/components/template/alarm_control_panel.py
index aa1f99f0423..6c8a70b328e 100644
--- a/homeassistant/components/template/alarm_control_panel.py
+++ b/homeassistant/components/template/alarm_control_panel.py
@@ -13,7 +13,6 @@ from homeassistant.components.alarm_control_panel import (
     PLATFORM_SCHEMA as ALARM_CONTROL_PANEL_PLATFORM_SCHEMA,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.config_entries import ConfigEntry
@@ -23,6 +22,15 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
+    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_PENDING,
+    STATE_ALARM_TRIGGERED,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
@@ -43,15 +51,15 @@ from .template_entity import TemplateEntity, rewrite_common_legacy_to_modern_con
 
 _LOGGER = logging.getLogger(__name__)
 _VALID_STATES = [
-    AlarmControlPanelState.ARMED_AWAY,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-    AlarmControlPanelState.ARMED_HOME,
-    AlarmControlPanelState.ARMED_NIGHT,
-    AlarmControlPanelState.ARMED_VACATION,
-    AlarmControlPanelState.ARMING,
-    AlarmControlPanelState.DISARMED,
-    AlarmControlPanelState.PENDING,
-    AlarmControlPanelState.TRIGGERED,
+    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_PENDING,
+    STATE_ALARM_TRIGGERED,
     STATE_UNAVAILABLE,
 ]
 
@@ -225,7 +233,7 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
         if (trigger_action := config.get(CONF_TRIGGER_ACTION)) is not None:
             self._trigger_script = Script(hass, trigger_action, name, DOMAIN)
 
-        self._state: AlarmControlPanelState | None = None
+        self._state: str | None = None
         self._attr_device_info = async_device_info_to_link_from_device_id(
             hass,
             config.get(CONF_DEVICE_ID),
@@ -273,10 +281,10 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
             # then we should not restore state
             and self._state is None
         ):
-            self._state = AlarmControlPanelState(last_state.state)
+            self._state = last_state.state
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         return self._state
 
@@ -327,39 +335,31 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Arm the panel to Away."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.ARMED_AWAY,
-            script=self._arm_away_script,
-            code=code,
+            STATE_ALARM_ARMED_AWAY, script=self._arm_away_script, code=code
         )
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Arm the panel to Home."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.ARMED_HOME,
-            script=self._arm_home_script,
-            code=code,
+            STATE_ALARM_ARMED_HOME, script=self._arm_home_script, code=code
         )
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Arm the panel to Night."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.ARMED_NIGHT,
-            script=self._arm_night_script,
-            code=code,
+            STATE_ALARM_ARMED_NIGHT, script=self._arm_night_script, code=code
         )
 
     async def async_alarm_arm_vacation(self, code: str | None = None) -> None:
         """Arm the panel to Vacation."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.ARMED_VACATION,
-            script=self._arm_vacation_script,
-            code=code,
+            STATE_ALARM_ARMED_VACATION, script=self._arm_vacation_script, code=code
         )
 
     async def async_alarm_arm_custom_bypass(self, code: str | None = None) -> None:
         """Arm the panel to Custom Bypass."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
+            STATE_ALARM_ARMED_CUSTOM_BYPASS,
             script=self._arm_custom_bypass_script,
             code=code,
         )
@@ -367,13 +367,11 @@ class AlarmControlPanelTemplate(TemplateEntity, AlarmControlPanelEntity, Restore
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Disarm the panel."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.DISARMED, script=self._disarm_script, code=code
+            STATE_ALARM_DISARMED, script=self._disarm_script, code=code
         )
 
     async def async_alarm_trigger(self, code: str | None = None) -> None:
         """Trigger the panel."""
         await self._async_alarm_arm(
-            AlarmControlPanelState.TRIGGERED,
-            script=self._trigger_script,
-            code=code,
+            STATE_ALARM_TRIGGERED, script=self._trigger_script, code=code
         )
diff --git a/homeassistant/components/template/binary_sensor.py b/homeassistant/components/template/binary_sensor.py
index 922f1d88ffb..187c7079f59 100644
--- a/homeassistant/components/template/binary_sensor.py
+++ b/homeassistant/components/template/binary_sensor.py
@@ -250,6 +250,7 @@ class BinarySensorTemplate(TemplateEntity, BinarySensorEntity, RestoreEntity):
 
         self._attr_device_class = config.get(CONF_DEVICE_CLASS)
         self._template = config[CONF_STATE]
+        self._state: bool | None = None
         self._delay_cancel = None
         self._delay_on = None
         self._delay_on_raw = config.get(CONF_DELAY_ON)
@@ -267,7 +268,7 @@ class BinarySensorTemplate(TemplateEntity, BinarySensorEntity, RestoreEntity):
             and (last_state := await self.async_get_last_state()) is not None
             and last_state.state not in (STATE_UNKNOWN, STATE_UNAVAILABLE)
         ):
-            self._attr_is_on = last_state.state == STATE_ON
+            self._state = last_state.state == STATE_ON
         await super().async_added_to_hass()
 
     @callback
@@ -307,7 +308,7 @@ class BinarySensorTemplate(TemplateEntity, BinarySensorEntity, RestoreEntity):
             else template.result_as_boolean(result)
         )
 
-        if state == self._attr_is_on:
+        if state == self._state:
             return
 
         # state without delay
@@ -316,19 +317,24 @@ class BinarySensorTemplate(TemplateEntity, BinarySensorEntity, RestoreEntity):
             or (state and not self._delay_on)
             or (not state and not self._delay_off)
         ):
-            self._attr_is_on = state
+            self._state = state
             return
 
         @callback
         def _set_state(_):
             """Set state of template binary sensor."""
-            self._attr_is_on = state
+            self._state = state
             self.async_write_ha_state()
 
         delay = (self._delay_on if state else self._delay_off).total_seconds()
         # state with delay. Cancelled if template result changes.
         self._delay_cancel = async_call_later(self.hass, delay, _set_state)
 
+    @property
+    def is_on(self) -> bool | None:
+        """Return true if sensor is on."""
+        return self._state
+
 
 class TriggerBinarySensorEntity(TriggerEntity, BinarySensorEntity, RestoreEntity):
     """Sensor entity based on trigger data."""
@@ -353,6 +359,7 @@ class TriggerBinarySensorEntity(TriggerEntity, BinarySensorEntity, RestoreEntity
         self._delay_cancel: CALLBACK_TYPE | None = None
         self._auto_off_cancel: CALLBACK_TYPE | None = None
         self._auto_off_time: datetime | None = None
+        self._state: bool | None = None
 
     async def async_added_to_hass(self) -> None:
         """Restore last state."""
@@ -364,9 +371,9 @@ class TriggerBinarySensorEntity(TriggerEntity, BinarySensorEntity, RestoreEntity
             and last_state.state not in (STATE_UNKNOWN, STATE_UNAVAILABLE)
             # The trigger might have fired already while we waited for stored data,
             # then we should not restore state
-            and self._attr_is_on is None
+            and self._state is None
         ):
-            self._attr_is_on = last_state.state == STATE_ON
+            self._state = last_state.state == STATE_ON
             self.restore_attributes(last_state)
 
             if CONF_AUTO_OFF not in self._config:
@@ -376,11 +383,16 @@ class TriggerBinarySensorEntity(TriggerEntity, BinarySensorEntity, RestoreEntity
                 auto_off_time := extra_data.auto_off_time
             ) is not None and auto_off_time <= dt_util.utcnow():
                 # It's already past the saved auto off time
-                self._attr_is_on = False
+                self._state = False
 
-            if self._attr_is_on and auto_off_time is not None:
+            if self._state and auto_off_time is not None:
                 self._set_auto_off(auto_off_time)
 
+    @property
+    def is_on(self) -> bool | None:
+        """Return state of the sensor."""
+        return self._state
+
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle update of the data."""
@@ -406,7 +418,7 @@ class TriggerBinarySensorEntity(TriggerEntity, BinarySensorEntity, RestoreEntity
         delay = self._rendered.get(key) or self._config.get(key)
 
         # state without delay. None means rendering failed.
-        if self._attr_is_on == state or state is None or delay is None:
+        if self._state == state or state is None or delay is None:
             self._set_state(state)
             return
 
@@ -427,7 +439,7 @@ class TriggerBinarySensorEntity(TriggerEntity, BinarySensorEntity, RestoreEntity
     @callback
     def _set_state(self, state, _=None):
         """Set up auto off."""
-        self._attr_is_on = state
+        self._state = state
         self.async_set_context(self.coordinator.data["context"])
         self.async_write_ha_state()
 
@@ -457,7 +469,7 @@ class TriggerBinarySensorEntity(TriggerEntity, BinarySensorEntity, RestoreEntity
         @callback
         def _auto_off(_):
             """Reset state of template binary sensor."""
-            self._attr_is_on = False
+            self._state = False
             self.async_write_ha_state()
 
         self._auto_off_time = auto_off_time
diff --git a/homeassistant/components/template/coordinator.py b/homeassistant/components/template/coordinator.py
index 4d8fe78f2b5..b9bbd3625af 100644
--- a/homeassistant/components/template/coordinator.py
+++ b/homeassistant/components/template/coordinator.py
@@ -24,9 +24,7 @@ class TriggerUpdateCoordinator(DataUpdateCoordinator):
 
     def __init__(self, hass: HomeAssistant, config: dict[str, Any]) -> None:
         """Instantiate trigger data."""
-        super().__init__(
-            hass, _LOGGER, config_entry=None, name="Trigger Update Coordinator"
-        )
+        super().__init__(hass, _LOGGER, name="Trigger Update Coordinator")
         self.config = config
         self._cond_func: Callable[[Mapping[str, Any] | None], bool] | None = None
         self._unsub_start: Callable[[], None] | None = None
diff --git a/homeassistant/components/template/manifest.json b/homeassistant/components/template/manifest.json
index f1225f74f06..57188aebaa3 100644
--- a/homeassistant/components/template/manifest.json
+++ b/homeassistant/components/template/manifest.json
@@ -2,7 +2,7 @@
   "domain": "template",
   "name": "Template",
   "after_dependencies": ["group"],
-  "codeowners": ["@PhracturedBlue", "@home-assistant/core"],
+  "codeowners": ["@PhracturedBlue", "@tetienne", "@home-assistant/core"],
   "config_flow": true,
   "dependencies": ["blueprint"],
   "documentation": "https://www.home-assistant.io/integrations/template",
diff --git a/homeassistant/components/template/template_entity.py b/homeassistant/components/template/template_entity.py
index f5b84b1ad7a..3e70e1c3546 100644
--- a/homeassistant/components/template/template_entity.py
+++ b/homeassistant/components/template/template_entity.py
@@ -535,15 +535,13 @@ class TemplateEntity(Entity):  # pylint: disable=hass-enforce-class-module
             )
         if self._entity_picture_template is not None:
             self.add_template_attribute(
-                "_attr_entity_picture", self._entity_picture_template, cv.string
+                "_attr_entity_picture", self._entity_picture_template
             )
         if (
             self._friendly_name_template is not None
             and not self._friendly_name_template.is_static
         ):
-            self.add_template_attribute(
-                "_attr_name", self._friendly_name_template, cv.string
-            )
+            self.add_template_attribute("_attr_name", self._friendly_name_template)
 
     @callback
     def async_start_preview(
diff --git a/homeassistant/components/template/trigger_entity.py b/homeassistant/components/template/trigger_entity.py
index 5130f332d5b..df84ce057c3 100644
--- a/homeassistant/components/template/trigger_entity.py
+++ b/homeassistant/components/template/trigger_entity.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.template import TemplateStateFromEntityId
 from homeassistant.helpers.trigger_template_entity import TriggerBaseEntity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -42,11 +41,11 @@ class TriggerEntity(  # pylint: disable=hass-enforce-class-module
     def _process_data(self) -> None:
         """Process new data."""
 
+        this = None
+        if state := self.hass.states.get(self.entity_id):
+            this = state.as_dict()
         run_variables = self.coordinator.data["run_variables"]
-        variables = {
-            "this": TemplateStateFromEntityId(self.hass, self.entity_id),
-            **(run_variables or {}),
-        }
+        variables = {"this": this, **(run_variables or {})}
 
         self._render_templates(variables)
 
diff --git a/homeassistant/components/tensorflow/manifest.json b/homeassistant/components/tensorflow/manifest.json
index 86fd83ad088..4f2b6f19285 100644
--- a/homeassistant/components/tensorflow/manifest.json
+++ b/homeassistant/components/tensorflow/manifest.json
@@ -9,7 +9,7 @@
     "tensorflow==2.5.0",
     "tf-models-official==2.5.0",
     "pycocotools==2.0.6",
-    "numpy==2.1.3",
-    "Pillow==11.0.0"
+    "numpy==1.26.4",
+    "Pillow==10.4.0"
   ]
 }
diff --git a/homeassistant/components/tesla_fleet/__init__.py b/homeassistant/components/tesla_fleet/__init__.py
index e7030b568b3..4cd8c5c7142 100644
--- a/homeassistant/components/tesla_fleet/__init__.py
+++ b/homeassistant/components/tesla_fleet/__init__.py
@@ -5,12 +5,7 @@ from typing import Final
 
 from aiohttp.client_exceptions import ClientResponseError
 import jwt
-from tesla_fleet_api import (
-    EnergySpecific,
-    TeslaFleetApi,
-    VehicleSigned,
-    VehicleSpecific,
-)
+from tesla_fleet_api import EnergySpecific, TeslaFleetApi, VehicleSpecific
 from tesla_fleet_api.const import Scope
 from tesla_fleet_api.exceptions import (
     InvalidRegion,
@@ -131,13 +126,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
             # Remove the protobuff 'cached_data' that we do not use to save memory
             product.pop("cached_data", None)
             vin = product["vin"]
-            signing = product["command_signing"] == "required"
-            if signing:
-                if not tesla.private_key:
-                    await tesla.get_private_key(hass.config.path("tesla_fleet.key"))
-                api = VehicleSigned(tesla.vehicle, vin)
-            else:
-                api = VehicleSpecific(tesla.vehicle, vin)
+            api = VehicleSpecific(tesla.vehicle, vin)
             coordinator = TeslaFleetVehicleDataCoordinator(hass, api, product)
 
             await coordinator.async_config_entry_first_refresh()
@@ -156,7 +145,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
                     coordinator=coordinator,
                     vin=vin,
                     device=device,
-                    signing=signing,
+                    signing=product["command_signing"] == "required",
                 )
             )
         elif "energy_site_id" in product and hasattr(tesla, "energy"):
diff --git a/homeassistant/components/tesla_fleet/button.py b/homeassistant/components/tesla_fleet/button.py
index aea0f91a97c..87cd95576d2 100644
--- a/homeassistant/components/tesla_fleet/button.py
+++ b/homeassistant/components/tesla_fleet/button.py
@@ -70,6 +70,8 @@ async def async_setup_entry(
         for vehicle in entry.runtime_data.vehicles
         for description in DESCRIPTIONS
         if Scope.VEHICLE_CMDS in entry.runtime_data.scopes
+        and (not vehicle.signing or description.key == "wake")
+        # Wake doesn't need signing
     )
 
 
diff --git a/homeassistant/components/tesla_fleet/climate.py b/homeassistant/components/tesla_fleet/climate.py
index 9a1533a688f..6199ee112b5 100644
--- a/homeassistant/components/tesla_fleet/climate.py
+++ b/homeassistant/components/tesla_fleet/climate.py
@@ -84,7 +84,7 @@ class TeslaFleetClimateEntity(TeslaFleetVehicleEntity, ClimateEntity):
     ) -> None:
         """Initialize the climate."""
 
-        self.read_only = Scope.VEHICLE_CMDS not in scopes
+        self.read_only = Scope.VEHICLE_CMDS not in scopes or data.signing
 
         if self.read_only:
             self._attr_supported_features = ClimateEntityFeature(0)
@@ -231,7 +231,7 @@ class TeslaFleetCabinOverheatProtectionEntity(TeslaFleetVehicleEntity, ClimateEn
         """Initialize the cabin overheat climate entity."""
 
         # Scopes
-        self.read_only = Scope.VEHICLE_CMDS not in scopes
+        self.read_only = Scope.VEHICLE_CMDS not in scopes or data.signing
 
         # Supported Features
         if self.read_only:
diff --git a/homeassistant/components/tesla_fleet/cover.py b/homeassistant/components/tesla_fleet/cover.py
index f270734424f..4e49e24b689 100644
--- a/homeassistant/components/tesla_fleet/cover.py
+++ b/homeassistant/components/tesla_fleet/cover.py
@@ -57,7 +57,7 @@ class TeslaFleetWindowEntity(TeslaFleetVehicleEntity, CoverEntity):
         self._attr_supported_features = (
             CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
         )
-        if not self.scoped:
+        if not self.scoped or self.vehicle.signing:
             self._attr_supported_features = CoverEntityFeature(0)
 
     def _async_update_attrs(self) -> None:
@@ -111,7 +111,7 @@ class TeslaFleetChargePortEntity(TeslaFleetVehicleEntity, CoverEntity):
         self._attr_supported_features = (
             CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
         )
-        if not self.scoped:
+        if not self.scoped or self.vehicle.signing:
             self._attr_supported_features = CoverEntityFeature(0)
 
     def _async_update_attrs(self) -> None:
@@ -144,7 +144,7 @@ class TeslaFleetFrontTrunkEntity(TeslaFleetVehicleEntity, CoverEntity):
 
         self.scoped = Scope.VEHICLE_CMDS in scopes
         self._attr_supported_features = CoverEntityFeature.OPEN
-        if not self.scoped:
+        if not self.scoped or self.vehicle.signing:
             self._attr_supported_features = CoverEntityFeature(0)
 
     def _async_update_attrs(self) -> None:
@@ -172,12 +172,18 @@ class TeslaFleetRearTrunkEntity(TeslaFleetVehicleEntity, CoverEntity):
         self._attr_supported_features = (
             CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
         )
-        if not self.scoped:
+        if not self.scoped or self.vehicle.signing:
             self._attr_supported_features = CoverEntityFeature(0)
 
     def _async_update_attrs(self) -> None:
         """Update the entity attributes."""
-        self._attr_is_closed = self._value == CLOSED
+        value = self._value
+        if value == CLOSED:
+            self._attr_is_closed = True
+        elif value == OPEN:
+            self._attr_is_closed = False
+        else:
+            self._attr_is_closed = None
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open rear trunk."""
@@ -210,7 +216,7 @@ class TeslaFleetSunroofEntity(TeslaFleetVehicleEntity, CoverEntity):
         super().__init__(vehicle, "vehicle_state_sun_roof_state")
 
         self.scoped = Scope.VEHICLE_CMDS in scopes
-        if not self.scoped:
+        if not self.scoped or self.vehicle.signing:
             self._attr_supported_features = CoverEntityFeature(0)
 
     def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/tesla_fleet/device_tracker.py b/homeassistant/components/tesla_fleet/device_tracker.py
index d6dcef895a6..62c084c9fe5 100644
--- a/homeassistant/components/tesla_fleet/device_tracker.py
+++ b/homeassistant/components/tesla_fleet/device_tracker.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_HOME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -85,7 +84,4 @@ class TeslaFleetDeviceTrackerRouteEntity(TeslaFleetDeviceTrackerEntity):
     @property
     def location_name(self) -> str | None:
         """Return a location name for the current location of the device."""
-        location = self.get("drive_state_active_route_destination")
-        if location == "Home":
-            return STATE_HOME
-        return location
+        return self.get("drive_state_active_route_destination")
diff --git a/homeassistant/components/tesla_fleet/entity.py b/homeassistant/components/tesla_fleet/entity.py
index 0ee41b5e322..60230cd881d 100644
--- a/homeassistant/components/tesla_fleet/entity.py
+++ b/homeassistant/components/tesla_fleet/entity.py
@@ -123,6 +123,14 @@ class TeslaFleetVehicleEntity(TeslaFleetEntity):
         """Wake up the vehicle if its asleep."""
         await wake_up_vehicle(self.vehicle)
 
+    def raise_for_read_only(self, scope: Scope) -> None:
+        """Raise an error if no command signing or a scope is not available."""
+        if self.vehicle.signing:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN, translation_key="command_signing"
+            )
+        super().raise_for_read_only(scope)
+
 
 class TeslaFleetEnergyLiveEntity(TeslaFleetEntity):
     """Parent class for TeslaFleet Energy Site Live entities."""
diff --git a/homeassistant/components/tesla_fleet/media_player.py b/homeassistant/components/tesla_fleet/media_player.py
index 455c990077d..0a1d18c3407 100644
--- a/homeassistant/components/tesla_fleet/media_player.py
+++ b/homeassistant/components/tesla_fleet/media_player.py
@@ -64,7 +64,7 @@ class TeslaFleetMediaEntity(TeslaFleetVehicleEntity, MediaPlayerEntity):
         """Initialize the media player entity."""
         super().__init__(data, "media")
         self.scoped = scoped
-        if not scoped:
+        if not scoped and data.signing:
             self._attr_supported_features = MediaPlayerEntityFeature(0)
 
     def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/tesla_fleet/oauth.py b/homeassistant/components/tesla_fleet/oauth.py
index 8b43460436b..00976abf56f 100644
--- a/homeassistant/components/tesla_fleet/oauth.py
+++ b/homeassistant/components/tesla_fleet/oauth.py
@@ -49,7 +49,6 @@ class TeslaSystemImplementation(config_entry_oauth2_flow.LocalOAuth2Implementati
     def extra_authorize_data(self) -> dict[str, Any]:
         """Extra data that needs to be appended to the authorize url."""
         return {
-            "prompt": "login",
             "scope": " ".join(SCOPES),
             "code_challenge": self.code_challenge,  # PKCE
         }
@@ -84,4 +83,4 @@ class TeslaUserImplementation(AuthImplementation):
     @property
     def extra_authorize_data(self) -> dict[str, Any]:
         """Extra data that needs to be appended to the authorize url."""
-        return {"prompt": "login", "scope": " ".join(SCOPES)}
+        return {"scope": " ".join(SCOPES)}
diff --git a/homeassistant/components/tesla_fleet/sensor.py b/homeassistant/components/tesla_fleet/sensor.py
index b4e7b51faba..a4f86468f0a 100644
--- a/homeassistant/components/tesla_fleet/sensor.py
+++ b/homeassistant/components/tesla_fleet/sensor.py
@@ -486,7 +486,7 @@ class TeslaFleetVehicleSensorEntity(TeslaFleetVehicleEntity, RestoreSensor):
     async def async_added_to_hass(self) -> None:
         """Handle entity which will be added."""
         await super().async_added_to_hass()
-        if self.coordinator.data.get("state") != TeslaFleetState.ONLINE:
+        if self.coordinator.data.get("state") == TeslaFleetState.OFFLINE:
             if (sensor_data := await self.async_get_last_sensor_data()) is not None:
                 self._attr_native_value = sensor_data.native_value
 
@@ -524,7 +524,7 @@ class TeslaFleetVehicleTimeSensorEntity(TeslaFleetVehicleEntity, SensorEntity):
             self._attr_native_value = self._get_timestamp(self._value)
 
 
-class TeslaFleetEnergyLiveSensorEntity(TeslaFleetEnergyLiveEntity, SensorEntity):
+class TeslaFleetEnergyLiveSensorEntity(TeslaFleetEnergyLiveEntity, RestoreSensor):
     """Base class for Tesla Fleet energy site metric sensors."""
 
     entity_description: SensorEntityDescription
@@ -538,13 +538,20 @@ class TeslaFleetEnergyLiveSensorEntity(TeslaFleetEnergyLiveEntity, SensorEntity)
         self.entity_description = description
         super().__init__(data, description.key)
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        if not self.coordinator.updated_once:
+            if (sensor_data := await self.async_get_last_sensor_data()) is not None:
+                self._attr_native_value = sensor_data.native_value
+
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
         self._attr_available = not self.is_none
         self._attr_native_value = self._value
 
 
-class TeslaFleetWallConnectorSensorEntity(TeslaFleetWallConnectorEntity, SensorEntity):
+class TeslaFleetWallConnectorSensorEntity(TeslaFleetWallConnectorEntity, RestoreSensor):
     """Base class for Tesla Fleet energy site metric sensors."""
 
     entity_description: SensorEntityDescription
@@ -563,13 +570,20 @@ class TeslaFleetWallConnectorSensorEntity(TeslaFleetWallConnectorEntity, SensorE
             description.key,
         )
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        if not self.coordinator.updated_once:
+            if (sensor_data := await self.async_get_last_sensor_data()) is not None:
+                self._attr_native_value = sensor_data.native_value
+
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
         self._attr_available = not self.is_none
         self._attr_native_value = self._value
 
 
-class TeslaFleetEnergyInfoSensorEntity(TeslaFleetEnergyInfoEntity, SensorEntity):
+class TeslaFleetEnergyInfoSensorEntity(TeslaFleetEnergyInfoEntity, RestoreSensor):
     """Base class for Tesla Fleet energy site metric sensors."""
 
     entity_description: SensorEntityDescription
@@ -583,6 +597,13 @@ class TeslaFleetEnergyInfoSensorEntity(TeslaFleetEnergyInfoEntity, SensorEntity)
         self.entity_description = description
         super().__init__(data, description.key)
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        if not self.coordinator.updated_once:
+            if (sensor_data := await self.async_get_last_sensor_data()) is not None:
+                self._attr_native_value = sensor_data.native_value
+
     def _async_update_attrs(self) -> None:
         """Update the attributes of the sensor."""
         self._attr_available = not self.is_none
diff --git a/homeassistant/components/tesla_fleet/strings.json b/homeassistant/components/tesla_fleet/strings.json
index fe5cd06c1ef..942824c5043 100644
--- a/homeassistant/components/tesla_fleet/strings.json
+++ b/homeassistant/components/tesla_fleet/strings.json
@@ -504,6 +504,9 @@
     "command_no_reason": {
       "message": "Command was unsuccessful but did not return a reason why."
     },
+    "command_signing": {
+      "message": "Vehicle requires command signing. Please see documentation for more details."
+    },
     "invalid_cop_temp": {
       "message": "Cabin overheat protection does not support that temperature."
     },
diff --git a/homeassistant/components/tesla_wall_connector/__init__.py b/homeassistant/components/tesla_wall_connector/__init__.py
index 01c657fbcaa..f4d04ca8cc6 100644
--- a/homeassistant/components/tesla_wall_connector/__init__.py
+++ b/homeassistant/components/tesla_wall_connector/__init__.py
@@ -71,7 +71,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator: DataUpdateCoordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="tesla-wallconnector",
         update_interval=get_poll_interval(entry),
         update_method=async_update_data,
diff --git a/homeassistant/components/teslemetry/__init__.py b/homeassistant/components/teslemetry/__init__.py
index aa1d2b42660..ab2e4c04734 100644
--- a/homeassistant/components/teslemetry/__init__.py
+++ b/homeassistant/components/teslemetry/__init__.py
@@ -1,7 +1,6 @@
 """Teslemetry integration."""
 
 import asyncio
-from collections.abc import Callable
 from typing import Final
 
 from tesla_fleet_api import EnergySpecific, Teslemetry, VehicleSpecific
@@ -11,7 +10,6 @@ from tesla_fleet_api.exceptions import (
     SubscriptionRequired,
     TeslaFleetError,
 )
-from teslemetry_stream import TeslemetryStream
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, Platform
@@ -30,7 +28,6 @@ from .coordinator import (
     TeslemetryEnergySiteLiveCoordinator,
     TeslemetryVehicleDataCoordinator,
 )
-from .helpers import flatten
 from .models import TeslemetryData, TeslemetryEnergyData, TeslemetryVehicleData
 from .services import async_register_services
 
@@ -72,10 +69,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
         access_token=access_token,
     )
     try:
-        calls = await asyncio.gather(
-            teslemetry.metadata(),
-            teslemetry.products(),
-        )
+        scopes = (await teslemetry.metadata())["scopes"]
+        products = (await teslemetry.products())["response"]
     except InvalidToken as e:
         raise ConfigEntryAuthFailed from e
     except SubscriptionRequired as e:
@@ -83,24 +78,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
     except TeslaFleetError as e:
         raise ConfigEntryNotReady from e
 
-    scopes = calls[0]["scopes"]
-    region = calls[0]["region"]
-    products = calls[1]["response"]
-
     device_registry = dr.async_get(hass)
 
     # Create array of classes
     vehicles: list[TeslemetryVehicleData] = []
     energysites: list[TeslemetryEnergyData] = []
-
-    # Create the stream
-    stream = TeslemetryStream(
-        session,
-        access_token,
-        server=f"{region.lower()}.teslemetry.com",
-        parse_timestamp=True,
-    )
-
     for product in products:
         if "vin" in product and Scope.VEHICLE_DEVICE_DATA in scopes:
             # Remove the protobuff 'cached_data' that we do not use to save memory
@@ -117,29 +99,22 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
                 serial_number=vin,
             )
 
-            remove_listener = stream.async_add_listener(
-                create_handle_vehicle_stream(vin, coordinator),
-                {"vin": vin},
-            )
-
             vehicles.append(
                 TeslemetryVehicleData(
                     api=api,
                     coordinator=coordinator,
-                    stream=stream,
                     vin=vin,
                     device=device,
-                    remove_listener=remove_listener,
                 )
             )
 
         elif "energy_site_id" in product and Scope.ENERGY_DEVICE_DATA in scopes:
             site_id = product["energy_site_id"]
-            powerwall = (
-                product["components"]["battery"] or product["components"]["solar"]
-            )
-            wall_connector = "wall_connectors" in product["components"]
-            if not powerwall and not wall_connector:
+            if not (
+                product["components"]["battery"]
+                or product["components"]["solar"]
+                or "wall_connectors" in product["components"]
+            ):
                 LOGGER.debug(
                     "Skipping Energy Site %s as it has no components",
                     site_id,
@@ -162,11 +137,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
                     info_coordinator=TeslemetryEnergySiteInfoCoordinator(
                         hass, api, product
                     ),
-                    history_coordinator=(
-                        TeslemetryEnergyHistoryCoordinator(hass, api)
-                        if powerwall
-                        else None
-                    ),
+                    history_coordinator=TeslemetryEnergyHistoryCoordinator(hass, api),
                     id=site_id,
                     device=device,
                 )
@@ -189,7 +160,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
         *(
             energysite.history_coordinator.async_config_entry_first_refresh()
             for energysite in energysites
-            if energysite.history_coordinator
         ),
     )
 
@@ -244,20 +214,3 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
             config_entry, unique_id=metadata["uid"], version=1, minor_version=2
         )
     return True
-
-
-def create_handle_vehicle_stream(vin: str, coordinator) -> Callable[[dict], None]:
-    """Create a handle vehicle stream function."""
-
-    def handle_vehicle_stream(data: dict) -> None:
-        """Handle vehicle data from the stream."""
-        if "vehicle_data" in data:
-            LOGGER.debug("Streaming received vehicle data from %s", vin)
-            coordinator.updated_once = True
-            coordinator.async_set_updated_data(flatten(data["vehicle_data"]))
-        elif "state" in data:
-            LOGGER.debug("Streaming received state from %s", vin)
-            coordinator.data["state"] = data["state"]
-            coordinator.async_set_updated_data(coordinator.data)
-
-    return handle_vehicle_stream
diff --git a/homeassistant/components/teslemetry/coordinator.py b/homeassistant/components/teslemetry/coordinator.py
index f37d0613de9..4612408e14d 100644
--- a/homeassistant/components/teslemetry/coordinator.py
+++ b/homeassistant/components/teslemetry/coordinator.py
@@ -18,7 +18,6 @@ from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import ENERGY_HISTORY_FIELDS, LOGGER, TeslemetryState
-from .helpers import flatten
 
 VEHICLE_INTERVAL = timedelta(seconds=30)
 VEHICLE_WAIT = timedelta(minutes=15)
@@ -36,6 +35,19 @@ ENDPOINTS = [
 ]
 
 
+def flatten(data: dict[str, Any], parent: str | None = None) -> dict[str, Any]:
+    """Flatten the data structure."""
+    result = {}
+    for key, value in data.items():
+        if parent:
+            key = f"{parent}_{key}"
+        if isinstance(value, dict):
+            result.update(flatten(value, key))
+        else:
+            result[key] = value
+    return result
+
+
 class TeslemetryVehicleDataCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching data from the Teslemetry API."""
 
diff --git a/homeassistant/components/teslemetry/cover.py b/homeassistant/components/teslemetry/cover.py
index 8775da931d5..190f729d99f 100644
--- a/homeassistant/components/teslemetry/cover.py
+++ b/homeassistant/components/teslemetry/cover.py
@@ -182,7 +182,13 @@ class TeslemetryRearTrunkEntity(TeslemetryVehicleEntity, CoverEntity):
 
     def _async_update_attrs(self) -> None:
         """Update the entity attributes."""
-        self._attr_is_closed = self._value == CLOSED
+        value = self._value
+        if value == CLOSED:
+            self._attr_is_closed = True
+        elif value == OPEN:
+            self._attr_is_closed = False
+        else:
+            self._attr_is_closed = None
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open rear trunk."""
diff --git a/homeassistant/components/teslemetry/device_tracker.py b/homeassistant/components/teslemetry/device_tracker.py
index 2b0ffd88cc6..6577bcf88d6 100644
--- a/homeassistant/components/teslemetry/device_tracker.py
+++ b/homeassistant/components/teslemetry/device_tracker.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
-from homeassistant.const import STATE_HOME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -81,7 +80,4 @@ class TeslemetryDeviceTrackerRouteEntity(TeslemetryDeviceTrackerEntity):
     @property
     def location_name(self) -> str | None:
         """Return a location name for the current location of the device."""
-        location = self.get("drive_state_active_route_destination")
-        if location == "Home":
-            return STATE_HOME
-        return location
+        return self.get("drive_state_active_route_destination")
diff --git a/homeassistant/components/teslemetry/entity.py b/homeassistant/components/teslemetry/entity.py
index d14f3a42734..ca40d4d00ce 100644
--- a/homeassistant/components/teslemetry/entity.py
+++ b/homeassistant/components/teslemetry/entity.py
@@ -175,8 +175,6 @@ class TeslemetryEnergyHistoryEntity(TeslemetryEntity):
     ) -> None:
         """Initialize common aspects of a Teslemetry Energy Site Info entity."""
 
-        assert data.history_coordinator
-
         self.api = data.api
         self._attr_unique_id = f"{data.id}-{key}"
         self._attr_device_info = data.device
diff --git a/homeassistant/components/teslemetry/helpers.py b/homeassistant/components/teslemetry/helpers.py
index 30601feccbc..4e086008333 100644
--- a/homeassistant/components/teslemetry/helpers.py
+++ b/homeassistant/components/teslemetry/helpers.py
@@ -10,19 +10,6 @@ from homeassistant.exceptions import HomeAssistantError
 from .const import DOMAIN, LOGGER, TeslemetryState
 
 
-def flatten(data: dict[str, Any], parent: str | None = None) -> dict[str, Any]:
-    """Flatten the data structure."""
-    result = {}
-    for key, value in data.items():
-        if parent:
-            key = f"{parent}_{key}"
-        if isinstance(value, dict):
-            result.update(flatten(value, key))
-        else:
-            result[key] = value
-    return result
-
-
 async def wake_up_vehicle(vehicle) -> None:
     """Wake up a vehicle."""
     async with vehicle.wakelock:
diff --git a/homeassistant/components/teslemetry/manifest.json b/homeassistant/components/teslemetry/manifest.json
index 6b667094d62..4c05b8f8bae 100644
--- a/homeassistant/components/teslemetry/manifest.json
+++ b/homeassistant/components/teslemetry/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["tesla-fleet-api"],
   "quality_scale": "platinum",
-  "requirements": ["tesla-fleet-api==0.8.4", "teslemetry-stream==0.4.2"]
+  "requirements": ["tesla-fleet-api==0.8.4"]
 }
diff --git a/homeassistant/components/teslemetry/models.py b/homeassistant/components/teslemetry/models.py
index d3969b30a7c..a6d549b8937 100644
--- a/homeassistant/components/teslemetry/models.py
+++ b/homeassistant/components/teslemetry/models.py
@@ -3,12 +3,10 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Callable
 from dataclasses import dataclass
 
 from tesla_fleet_api import EnergySpecific, VehicleSpecific
 from tesla_fleet_api.const import Scope
-from teslemetry_stream import TeslemetryStream
 
 from homeassistant.helpers.device_registry import DeviceInfo
 
@@ -35,11 +33,9 @@ class TeslemetryVehicleData:
 
     api: VehicleSpecific
     coordinator: TeslemetryVehicleDataCoordinator
-    stream: TeslemetryStream
     vin: str
     wakelock = asyncio.Lock()
     device: DeviceInfo
-    remove_listener: Callable
 
 
 @dataclass
@@ -49,6 +45,6 @@ class TeslemetryEnergyData:
     api: EnergySpecific
     live_coordinator: TeslemetryEnergySiteLiveCoordinator
     info_coordinator: TeslemetryEnergySiteInfoCoordinator
-    history_coordinator: TeslemetryEnergyHistoryCoordinator | None
+    history_coordinator: TeslemetryEnergyHistoryCoordinator
     id: int
     device: DeviceInfo
diff --git a/homeassistant/components/teslemetry/sensor.py b/homeassistant/components/teslemetry/sensor.py
index 95876cc2cf9..ba7d930fcd0 100644
--- a/homeassistant/components/teslemetry/sensor.py
+++ b/homeassistant/components/teslemetry/sensor.py
@@ -482,7 +482,8 @@ async def async_setup_entry(
                 TeslemetryEnergyHistorySensorEntity(energysite, description)
                 for energysite in entry.runtime_data.energysites
                 for description in ENERGY_HISTORY_DESCRIPTIONS
-                if energysite.history_coordinator
+                if energysite.info_coordinator.data.get("components_battery")
+                or energysite.info_coordinator.data.get("components_solar")
             ),
         )
     )
diff --git a/homeassistant/components/teslemetry/update.py b/homeassistant/components/teslemetry/update.py
index 670cd0e0eda..1884689ae64 100644
--- a/homeassistant/components/teslemetry/update.py
+++ b/homeassistant/components/teslemetry/update.py
@@ -92,12 +92,12 @@ class TeslemetryUpdateEntity(TeslemetryVehicleEntity, UpdateEntity):
             SCHEDULED,
             INSTALLING,
         ):
-            self._attr_in_progress = True
-            if install_perc := self.get("vehicle_state_software_update_install_perc"):
-                self._attr_update_percentage = cast(int, install_perc)
+            self._attr_in_progress = (
+                cast(int, self.get("vehicle_state_software_update_install_perc"))
+                or True
+            )
         else:
             self._attr_in_progress = False
-            self._attr_update_percentage = None
 
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
@@ -107,5 +107,4 @@ class TeslemetryUpdateEntity(TeslemetryVehicleEntity, UpdateEntity):
         await self.wake_up_if_asleep()
         await handle_vehicle_command(self.api.schedule_software_update(offset_sec=60))
         self._attr_in_progress = True
-        self._attr_update_percentage = None
         self.async_write_ha_state()
diff --git a/homeassistant/components/tessie/update.py b/homeassistant/components/tessie/update.py
index f6198fa6c03..959a713047f 100644
--- a/homeassistant/components/tessie/update.py
+++ b/homeassistant/components/tessie/update.py
@@ -71,22 +71,14 @@ class TessieUpdateEntity(TessieEntity, UpdateEntity):
         return self.installed_version
 
     @property
-    def in_progress(self) -> bool:
-        """Update installation progress."""
-        return (
-            self.get("vehicle_state_software_update_status")
-            == TessieUpdateStatus.INSTALLING
-        )
-
-    @property
-    def update_percentage(self) -> int | None:
+    def in_progress(self) -> bool | int | None:
         """Update installation progress."""
         if (
             self.get("vehicle_state_software_update_status")
             == TessieUpdateStatus.INSTALLING
         ):
             return self.get("vehicle_state_software_update_install_perc")
-        return None
+        return False
 
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
diff --git a/homeassistant/components/thethingsnetwork/__init__.py b/homeassistant/components/thethingsnetwork/__init__.py
index d3c6c8356cb..253ce7a052e 100644
--- a/homeassistant/components/thethingsnetwork/__init__.py
+++ b/homeassistant/components/thethingsnetwork/__init__.py
@@ -2,15 +2,55 @@
 
 import logging
 
+import voluptuous as vol
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_HOST
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN, PLATFORMS, TTN_API_HOST
+from .const import CONF_APP_ID, DOMAIN, PLATFORMS, TTN_API_HOST
 from .coordinator import TTNCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = vol.Schema(
+    {
+        # Configuration via yaml not longer supported - keeping to warn about migration
+        DOMAIN: vol.Schema(
+            {
+                vol.Required(CONF_APP_ID): cv.string,
+                vol.Required("access_key"): cv.string,
+            }
+        )
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Initialize of The Things Network component."""
+
+    if DOMAIN in config:
+        ir.async_create_issue(
+            hass,
+            DOMAIN,
+            "manual_migration",
+            breaks_in_ha_version="2024.12.0",
+            is_fixable=False,
+            severity=ir.IssueSeverity.ERROR,
+            translation_key="manual_migration",
+            translation_placeholders={
+                "domain": DOMAIN,
+                "v2_v3_migration_url": "https://www.thethingsnetwork.org/forum/c/v2-to-v3-upgrade/102",
+                "v2_deprecation_url": "https://www.thethingsnetwork.org/forum/t/the-things-network-v2-is-permanently-shutting-down-completed/50710",
+            },
+        )
+
+    return True
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Establish connection with The Things Network."""
diff --git a/homeassistant/components/thethingsnetwork/strings.json b/homeassistant/components/thethingsnetwork/strings.json
index f5a4fcef8fd..98572cb318c 100644
--- a/homeassistant/components/thethingsnetwork/strings.json
+++ b/homeassistant/components/thethingsnetwork/strings.json
@@ -22,5 +22,11 @@
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "issues": {
+    "manual_migration": {
+      "description": "Configuring {domain} using YAML was removed as part of migrating to [The Things Network v3]({v2_v3_migration_url}). [The Things Network v2 has shutted down]({v2_deprecation_url}).\n\nPlease remove the {domain} entry from the configuration.yaml and add re-add the integration using the config_flow",
+      "title": "The {domain} YAML configuration is not supported"
+    }
   }
 }
diff --git a/homeassistant/components/threshold/binary_sensor.py b/homeassistant/components/threshold/binary_sensor.py
index 3d52d2225be..5f1639ff2e1 100644
--- a/homeassistant/components/threshold/binary_sensor.py
+++ b/homeassistant/components/threshold/binary_sensor.py
@@ -61,29 +61,15 @@ _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME: Final = "Threshold"
 
-
-def no_missing_threshold(value: dict) -> dict:
-    """Validate data point list is greater than polynomial degrees."""
-    if value.get(CONF_LOWER) is None and value.get(CONF_UPPER) is None:
-        raise vol.Invalid("Lower or Upper thresholds are not provided")
-
-    return value
-
-
-PLATFORM_SCHEMA = vol.All(
-    BINARY_SENSOR_PLATFORM_SCHEMA.extend(
-        {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
-            vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
-            vol.Optional(CONF_HYSTERESIS, default=DEFAULT_HYSTERESIS): vol.Coerce(
-                float
-            ),
-            vol.Optional(CONF_LOWER): vol.Coerce(float),
-            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-            vol.Optional(CONF_UPPER): vol.Coerce(float),
-        }
-    ),
-    no_missing_threshold,
+PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
+    {
+        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
+        vol.Optional(CONF_HYSTERESIS, default=DEFAULT_HYSTERESIS): vol.Coerce(float),
+        vol.Optional(CONF_LOWER): vol.Coerce(float),
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_UPPER): vol.Coerce(float),
+    }
 )
 
 
@@ -140,6 +126,9 @@ async def async_setup_platform(
     hysteresis: float = config[CONF_HYSTERESIS]
     device_class: BinarySensorDeviceClass | None = config.get(CONF_DEVICE_CLASS)
 
+    if lower is None and upper is None:
+        raise ValueError("Lower or Upper thresholds not provided")
+
     async_add_entities(
         [
             ThresholdSensor(
@@ -162,9 +151,6 @@ class ThresholdSensor(BinarySensorEntity):
     """Representation of a Threshold sensor."""
 
     _attr_should_poll = False
-    _unrecorded_attributes = frozenset(
-        {ATTR_ENTITY_ID, ATTR_HYSTERESIS, ATTR_LOWER, ATTR_TYPE, ATTR_UPPER}
-    )
 
     def __init__(
         self,
diff --git a/homeassistant/components/tibber/__init__.py b/homeassistant/components/tibber/__init__.py
index 9b5c7ee1168..ce05b8070f6 100644
--- a/homeassistant/components/tibber/__init__.py
+++ b/homeassistant/components/tibber/__init__.py
@@ -6,9 +6,15 @@ import aiohttp
 import tibber
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, EVENT_HOMEASSISTANT_STOP, Platform
+from homeassistant.const import (
+    CONF_ACCESS_TOKEN,
+    CONF_NAME,
+    EVENT_HOMEASSISTANT_STOP,
+    Platform,
+)
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import discovery
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
@@ -67,6 +73,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
+    # Use discovery to load platform legacy notify platform
+    # The use of the legacy notify service was deprecated with HA Core 2024.6
+    # Support will be removed with HA Core 2024.12
+    hass.async_create_task(
+        discovery.async_load_platform(
+            hass,
+            Platform.NOTIFY,
+            DOMAIN,
+            {CONF_NAME: DOMAIN},
+            hass.data[DATA_HASS_CONFIG],
+        )
+    )
+
     return True
 
 
diff --git a/homeassistant/components/tibber/manifest.json b/homeassistant/components/tibber/manifest.json
index bc9304ab59d..ac46141d974 100644
--- a/homeassistant/components/tibber/manifest.json
+++ b/homeassistant/components/tibber/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["tibber"],
   "quality_scale": "silver",
-  "requirements": ["pyTibber==0.30.8"]
+  "requirements": ["pyTibber==0.30.3"]
 }
diff --git a/homeassistant/components/tibber/notify.py b/homeassistant/components/tibber/notify.py
index fdeeeba68ef..1c9f86ed502 100644
--- a/homeassistant/components/tibber/notify.py
+++ b/homeassistant/components/tibber/notify.py
@@ -2,21 +2,38 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
+from typing import Any
+
 from tibber import Tibber
 
 from homeassistant.components.notify import (
+    ATTR_TITLE,
     ATTR_TITLE_DEFAULT,
+    BaseNotificationService,
     NotifyEntity,
     NotifyEntityFeature,
+    migrate_notify_issue,
 )
 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 . import DOMAIN as TIBBER_DOMAIN
 
 
+async def async_get_service(
+    hass: HomeAssistant,
+    config: ConfigType,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> TibberNotificationService:
+    """Get the Tibber notification service."""
+    tibber_connection: Tibber = hass.data[TIBBER_DOMAIN]
+    return TibberNotificationService(tibber_connection.send_notification)
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
@@ -24,6 +41,31 @@ async def async_setup_entry(
     async_add_entities([TibberNotificationEntity(entry.entry_id)])
 
 
+class TibberNotificationService(BaseNotificationService):
+    """Implement the notification service for Tibber."""
+
+    def __init__(self, notify: Callable) -> None:
+        """Initialize the service."""
+        self._notify = notify
+
+    async def async_send_message(self, message: str = "", **kwargs: Any) -> None:
+        """Send a message to Tibber devices."""
+        migrate_notify_issue(
+            self.hass,
+            TIBBER_DOMAIN,
+            "Tibber",
+            "2024.12.0",
+            service_name=self._service_name,
+        )
+        title = kwargs.get(ATTR_TITLE, ATTR_TITLE_DEFAULT)
+        try:
+            await self._notify(title=title, message=message)
+        except TimeoutError as exc:
+            raise HomeAssistantError(
+                translation_domain=TIBBER_DOMAIN, translation_key="send_message_timeout"
+            ) from exc
+
+
 class TibberNotificationEntity(NotifyEntity):
     """Implement the notification entity service for Tibber."""
 
diff --git a/homeassistant/components/tibber/sensor.py b/homeassistant/components/tibber/sensor.py
index 125dc8eae6f..adac836aca6 100644
--- a/homeassistant/components/tibber/sensor.py
+++ b/homeassistant/components/tibber/sensor.py
@@ -50,7 +50,7 @@ ICON = "mdi:currency-usd"
 SCAN_INTERVAL = timedelta(minutes=1)
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
 PARALLEL_UPDATES = 0
-TWENTY_MINUTES = 20 * 60
+
 
 RT_SENSORS_UNIQUE_ID_MIGRATION = {
     "accumulated_consumption_last_hour": "accumulated consumption current hour",
@@ -369,7 +369,7 @@ class TibberSensorElPrice(TibberSensor):
         """Initialize the sensor."""
         super().__init__(tibber_home=tibber_home)
         self._last_updated: datetime.datetime | None = None
-        self._spread_load_constant = randrange(TWENTY_MINUTES)
+        self._spread_load_constant = randrange(5000)
 
         self._attr_available = False
         self._attr_extra_state_attributes = {
@@ -397,7 +397,7 @@ class TibberSensorElPrice(TibberSensor):
         if (
             not self._tibber_home.last_data_timestamp
             or (self._tibber_home.last_data_timestamp - now).total_seconds()
-            < 11 * 3600 + self._spread_load_constant
+            < 5 * 3600 + self._spread_load_constant
             or not self.available
         ):
             _LOGGER.debug("Asking for new data")
diff --git a/homeassistant/components/tibber/services.py b/homeassistant/components/tibber/services.py
index 72943a0215a..35facbcd545 100644
--- a/homeassistant/components/tibber/services.py
+++ b/homeassistant/components/tibber/services.py
@@ -47,19 +47,21 @@ async def __get_prices(call: ServiceCall, *, hass: HomeAssistant) -> ServiceResp
     for tibber_home in tibber_connection.get_homes(only_active=True):
         home_nickname = tibber_home.name
 
+        price_info = tibber_home.info["viewer"]["home"]["currentSubscription"][
+            "priceInfo"
+        ]
         price_data = [
             {
-                "start_time": starts_at,
-                "price": price,
-                "level": tibber_home.price_level.get(starts_at),
+                "start_time": dt.datetime.fromisoformat(price["startsAt"]),
+                "price": price["total"],
+                "level": price["level"],
             }
-            for starts_at, price in tibber_home.price_total.items()
+            for key in ("today", "tomorrow")
+            for price in price_info[key]
         ]
 
         selected_data = [
-            price
-            for price in price_data
-            if start <= dt.datetime.fromisoformat(price["start_time"]) < end
+            price for price in price_data if start <= price["start_time"] < end
         ]
         tibber_prices[home_nickname] = selected_data
 
diff --git a/homeassistant/components/tile/__init__.py b/homeassistant/components/tile/__init__.py
index 594c4e7bdcb..7fd5afcea7d 100644
--- a/homeassistant/components/tile/__init__.py
+++ b/homeassistant/components/tile/__init__.py
@@ -101,7 +101,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         coordinator = coordinators[tile_uuid] = DataUpdateCoordinator(
             hass,
             LOGGER,
-            config_entry=entry,
             name=tile.name,
             update_interval=DEFAULT_UPDATE_INTERVAL,
             update_method=partial(async_update_tile, tile),
diff --git a/homeassistant/components/timer/strings.json b/homeassistant/components/timer/strings.json
index 064ec81df1d..1ebf0c6f50a 100644
--- a/homeassistant/components/timer/strings.json
+++ b/homeassistant/components/timer/strings.json
@@ -1,5 +1,4 @@
 {
-  "title": "Timer",
   "entity_component": {
     "_": {
       "name": "Timer",
diff --git a/homeassistant/components/tod/binary_sensor.py b/homeassistant/components/tod/binary_sensor.py
index 3ac90b5578c..907df849ea1 100644
--- a/homeassistant/components/tod/binary_sensor.py
+++ b/homeassistant/components/tod/binary_sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import datetime, time, timedelta
 import logging
-from typing import Any, Literal, TypeGuard
+from typing import TYPE_CHECKING, Any, Literal, TypeGuard
 
 import voluptuous as vol
 
@@ -109,9 +109,6 @@ class TodSensor(BinarySensorEntity):
     """Time of the Day Sensor."""
 
     _attr_should_poll = False
-    _time_before: datetime
-    _time_after: datetime
-    _next_update: datetime
 
     def __init__(
         self,
@@ -125,6 +122,9 @@ class TodSensor(BinarySensorEntity):
         """Init the ToD Sensor..."""
         self._attr_unique_id = unique_id
         self._attr_name = name
+        self._time_before: datetime | None = None
+        self._time_after: datetime | None = None
+        self._next_update: datetime | None = None
         self._after_offset = after_offset
         self._before_offset = before_offset
         self._before = before
@@ -134,6 +134,9 @@ class TodSensor(BinarySensorEntity):
     @property
     def is_on(self) -> bool:
         """Return True is sensor is on."""
+        if TYPE_CHECKING:
+            assert self._time_after is not None
+            assert self._time_before is not None
         if self._time_after < self._time_before:
             return self._time_after <= dt_util.utcnow() < self._time_before
         return False
@@ -141,6 +144,10 @@ class TodSensor(BinarySensorEntity):
     @property
     def extra_state_attributes(self) -> dict[str, Any] | None:
         """Return the state attributes of the sensor."""
+        if TYPE_CHECKING:
+            assert self._time_after is not None
+            assert self._time_before is not None
+            assert self._next_update is not None
         if time_zone := dt_util.get_default_time_zone():
             return {
                 ATTR_AFTER: self._time_after.astimezone(time_zone).isoformat(),
@@ -237,6 +244,9 @@ class TodSensor(BinarySensorEntity):
 
     def _turn_to_next_day(self) -> None:
         """Turn to to the next day."""
+        if TYPE_CHECKING:
+            assert self._time_after is not None
+            assert self._time_before is not None
         if _is_sun_event(self._after):
             self._time_after = get_astral_event_next(
                 self.hass, self._after, self._time_after - self._after_offset
@@ -272,12 +282,17 @@ class TodSensor(BinarySensorEntity):
 
         self.async_on_remove(_clean_up_listener)
 
+        if TYPE_CHECKING:
+            assert self._next_update is not None
         self._unsub_update = event.async_track_point_in_utc_time(
             self.hass, self._point_in_time_listener, self._next_update
         )
 
     def _calculate_next_update(self) -> None:
         """Datetime when the next update to the state."""
+        if TYPE_CHECKING:
+            assert self._time_after is not None
+            assert self._time_before is not None
         now = dt_util.utcnow()
         if now < self._time_after:
             self._next_update = self._time_after
@@ -294,6 +309,9 @@ class TodSensor(BinarySensorEntity):
         self._calculate_next_update()
         self.async_write_ha_state()
 
+        if TYPE_CHECKING:
+            assert self._next_update is not None
+
         self._unsub_update = event.async_track_point_in_utc_time(
             self.hass, self._point_in_time_listener, self._next_update
         )
diff --git a/homeassistant/components/todoist/__init__.py b/homeassistant/components/todoist/__init__.py
index 2e30856d0df..60c40b1c03c 100644
--- a/homeassistant/components/todoist/__init__.py
+++ b/homeassistant/components/todoist/__init__.py
@@ -25,7 +25,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     token = entry.data[CONF_TOKEN]
     api = TodoistAPIAsync(token)
-    coordinator = TodoistCoordinator(hass, _LOGGER, entry, SCAN_INTERVAL, api, token)
+    coordinator = TodoistCoordinator(hass, _LOGGER, SCAN_INTERVAL, api, token)
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})
diff --git a/homeassistant/components/todoist/calendar.py b/homeassistant/components/todoist/calendar.py
index 62f9fafc02a..31470633cc6 100644
--- a/homeassistant/components/todoist/calendar.py
+++ b/homeassistant/components/todoist/calendar.py
@@ -142,7 +142,7 @@ async def async_setup_platform(
     project_id_lookup = {}
 
     api = TodoistAPIAsync(token)
-    coordinator = TodoistCoordinator(hass, _LOGGER, None, SCAN_INTERVAL, api, token)
+    coordinator = TodoistCoordinator(hass, _LOGGER, SCAN_INTERVAL, api, token)
     await coordinator.async_refresh()
 
     async def _shutdown_coordinator(_: Event) -> None:
diff --git a/homeassistant/components/todoist/coordinator.py b/homeassistant/components/todoist/coordinator.py
index 2f35741c5ab..b55680907ac 100644
--- a/homeassistant/components/todoist/coordinator.py
+++ b/homeassistant/components/todoist/coordinator.py
@@ -6,7 +6,6 @@ import logging
 from todoist_api_python.api_async import TodoistAPIAsync
 from todoist_api_python.models import Label, Project, Section, Task
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -18,19 +17,12 @@ class TodoistCoordinator(DataUpdateCoordinator[list[Task]]):
         self,
         hass: HomeAssistant,
         logger: logging.Logger,
-        entry: ConfigEntry | None,
         update_interval: timedelta,
         api: TodoistAPIAsync,
         token: str,
     ) -> None:
         """Initialize the Todoist coordinator."""
-        super().__init__(
-            hass,
-            logger,
-            config_entry=entry,
-            name="Todoist",
-            update_interval=update_interval,
-        )
+        super().__init__(hass, logger, name="Todoist", update_interval=update_interval)
         self.api = api
         self._projects: list[Project] | None = None
         self._labels: list[Label] | None = None
diff --git a/homeassistant/components/todoist/strings.json b/homeassistant/components/todoist/strings.json
index 721b491bbf5..5b083ac58bf 100644
--- a/homeassistant/components/todoist/strings.json
+++ b/homeassistant/components/todoist/strings.json
@@ -78,7 +78,7 @@
           "description": "When should user be reminded of this task, in natural language."
         },
         "reminder_date_lang": {
-          "name": "Reminder date language",
+          "name": "Reminder data language",
           "description": "The language of reminder_date_string."
         },
         "reminder_date": {
diff --git a/homeassistant/components/tomorrowio/config_flow.py b/homeassistant/components/tomorrowio/config_flow.py
index cce41b17498..90bb488a7c2 100644
--- a/homeassistant/components/tomorrowio/config_flow.py
+++ b/homeassistant/components/tomorrowio/config_flow.py
@@ -91,6 +91,10 @@ def _get_unique_id(hass: HomeAssistant, input_dict: dict[str, Any]):
 class TomorrowioOptionsConfigFlow(OptionsFlow):
     """Handle Tomorrow.io options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize Tomorrow.io options flow."""
+        self._config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -101,7 +105,7 @@ class TomorrowioOptionsConfigFlow(OptionsFlow):
         options_schema = {
             vol.Required(
                 CONF_TIMESTEP,
-                default=self.config_entry.options[CONF_TIMESTEP],
+                default=self._config_entry.options[CONF_TIMESTEP],
             ): vol.In([1, 5, 15, 30, 60]),
         }
 
@@ -121,7 +125,7 @@ class TomorrowioConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> TomorrowioOptionsConfigFlow:
         """Get the options flow for this handler."""
-        return TomorrowioOptionsConfigFlow()
+        return TomorrowioOptionsConfigFlow(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/totalconnect/alarm_control_panel.py b/homeassistant/components/totalconnect/alarm_control_panel.py
index bc33129a741..fb13c630e3e 100644
--- a/homeassistant/components/totalconnect/alarm_control_panel.py
+++ b/homeassistant/components/totalconnect/alarm_control_panel.py
@@ -9,10 +9,19 @@ from total_connect_client.location import TotalConnectLocation
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     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_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_DISARMING,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import entity_platform
@@ -94,7 +103,7 @@ class TotalConnectAlarm(TotalConnectLocationEntity, AlarmControlPanelEntity):
             self._attr_code_format = CodeFormat.NUMBER
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         # State attributes can be removed in 2025.3
         attr = {
@@ -112,29 +121,29 @@ class TotalConnectAlarm(TotalConnectLocationEntity, AlarmControlPanelEntity):
         else:
             attr["location_name"] = f"{self.device.name} partition {self._partition_id}"
 
-        state: AlarmControlPanelState | None = None
+        state: str | None = None
         if self._partition.arming_state.is_disarmed():
-            state = AlarmControlPanelState.DISARMED
+            state = STATE_ALARM_DISARMED
         elif self._partition.arming_state.is_armed_night():
-            state = AlarmControlPanelState.ARMED_NIGHT
+            state = STATE_ALARM_ARMED_NIGHT
         elif self._partition.arming_state.is_armed_home():
-            state = AlarmControlPanelState.ARMED_HOME
+            state = STATE_ALARM_ARMED_HOME
         elif self._partition.arming_state.is_armed_away():
-            state = AlarmControlPanelState.ARMED_AWAY
+            state = STATE_ALARM_ARMED_AWAY
         elif self._partition.arming_state.is_armed_custom_bypass():
-            state = AlarmControlPanelState.ARMED_CUSTOM_BYPASS
+            state = STATE_ALARM_ARMED_CUSTOM_BYPASS
         elif self._partition.arming_state.is_arming():
-            state = AlarmControlPanelState.ARMING
+            state = STATE_ALARM_ARMING
         elif self._partition.arming_state.is_disarming():
-            state = AlarmControlPanelState.DISARMING
+            state = STATE_ALARM_DISARMING
         elif self._partition.arming_state.is_triggered_police():
-            state = AlarmControlPanelState.TRIGGERED
+            state = STATE_ALARM_TRIGGERED
             attr["triggered_source"] = "Police/Medical"
         elif self._partition.arming_state.is_triggered_fire():
-            state = AlarmControlPanelState.TRIGGERED
+            state = STATE_ALARM_TRIGGERED
             attr["triggered_source"] = "Fire/Smoke"
         elif self._partition.arming_state.is_triggered_gas():
-            state = AlarmControlPanelState.TRIGGERED
+            state = STATE_ALARM_TRIGGERED
             attr["triggered_source"] = "Carbon Monoxide"
 
         self._attr_extra_state_attributes = attr
diff --git a/homeassistant/components/totalconnect/config_flow.py b/homeassistant/components/totalconnect/config_flow.py
index 3f5d05fda13..c64dd5c6120 100644
--- a/homeassistant/components/totalconnect/config_flow.py
+++ b/homeassistant/components/totalconnect/config_flow.py
@@ -193,12 +193,16 @@ class TotalConnectConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> TotalConnectOptionsFlowHandler:
         """Get options flow."""
-        return TotalConnectOptionsFlowHandler()
+        return TotalConnectOptionsFlowHandler(config_entry)
 
 
 class TotalConnectOptionsFlowHandler(OptionsFlow):
     """TotalConnect options flow handler."""
 
+    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, bool] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/tplink/__init__.py b/homeassistant/components/tplink/__init__.py
index ee1d90e70b4..ceeb1120ed8 100644
--- a/homeassistant/components/tplink/__init__.py
+++ b/homeassistant/components/tplink/__init__.py
@@ -31,7 +31,6 @@ from homeassistant.const import (
     CONF_MAC,
     CONF_MODEL,
     CONF_PASSWORD,
-    CONF_PORT,
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -142,7 +141,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TPLinkConfigEntry) -> bo
     entry_credentials_hash = entry.data.get(CONF_CREDENTIALS_HASH)
     entry_use_http = entry.data.get(CONF_USES_HTTP, False)
     entry_aes_keys = entry.data.get(CONF_AES_KEYS)
-    port_override = entry.data.get(CONF_PORT)
 
     conn_params: Device.ConnectionParameters | None = None
     if conn_params_dict := entry.data.get(CONF_CONNECTION_PARAMETERS):
@@ -159,7 +157,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TPLinkConfigEntry) -> bo
         timeout=CONNECT_TIMEOUT,
         http_client=client,
         aes_keys=entry_aes_keys,
-        port_override=port_override,
     )
     if conn_params:
         config.connection_type = conn_params
diff --git a/homeassistant/components/tplink/binary_sensor.py b/homeassistant/components/tplink/binary_sensor.py
index 34375bccf4f..0e426161a0c 100644
--- a/homeassistant/components/tplink/binary_sensor.py
+++ b/homeassistant/components/tplink/binary_sensor.py
@@ -58,10 +58,6 @@ BINARY_SENSOR_DESCRIPTIONS: Final = (
         key="water_alert",
         device_class=BinarySensorDeviceClass.MOISTURE,
     ),
-    TPLinkBinarySensorEntityDescription(
-        key="motion_detected",
-        device_class=BinarySensorDeviceClass.MOTION,
-    ),
 )
 
 BINARYSENSOR_DESCRIPTIONS_MAP = {desc.key: desc for desc in BINARY_SENSOR_DESCRIPTIONS}
diff --git a/homeassistant/components/tplink/config_flow.py b/homeassistant/components/tplink/config_flow.py
index 63f1b4e125b..bcd7436c173 100644
--- a/homeassistant/components/tplink/config_flow.py
+++ b/homeassistant/components/tplink/config_flow.py
@@ -32,7 +32,6 @@ from homeassistant.const import (
     CONF_MAC,
     CONF_MODEL,
     CONF_PASSWORD,
-    CONF_PORT,
     CONF_USERNAME,
 )
 from homeassistant.core import callback
@@ -70,7 +69,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
     MINOR_VERSION = CONF_CONFIG_ENTRY_MINOR_VERSION
 
     host: str | None = None
-    port: int | None = None
 
     def __init__(self) -> None:
         """Initialize the config flow."""
@@ -164,16 +162,12 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
             return self.async_abort(reason="already_in_progress")
         credentials = await get_credentials(self.hass)
         try:
-            # If integration discovery there will be a device or None for dhcp
             if device:
                 self._discovered_device = device
                 await self._async_try_connect(device, credentials)
             else:
                 await self._async_try_discover_and_update(
-                    host,
-                    credentials,
-                    raise_on_progress=True,
-                    raise_on_timeout=True,
+                    host, credentials, raise_on_progress=True
                 )
         except AuthenticationError:
             return await self.async_step_discovery_auth_confirm()
@@ -262,26 +256,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
             step_id="discovery_confirm", description_placeholders=placeholders
         )
 
-    @staticmethod
-    def _async_get_host_port(host_str: str) -> tuple[str, int | None]:
-        """Parse the host string for host and port."""
-        if "[" in host_str:
-            _, _, bracketed = host_str.partition("[")
-            host, _, port_str = bracketed.partition("]")
-            _, _, port_str = port_str.partition(":")
-        else:
-            host, _, port_str = host_str.partition(":")
-
-        if not port_str:
-            return host, None
-
-        try:
-            port = int(port_str)
-        except ValueError:
-            return host, None
-
-        return host, port
-
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -292,29 +266,12 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
         if user_input is not None:
             if not (host := user_input[CONF_HOST]):
                 return await self.async_step_pick_device()
-
-            host, port = self._async_get_host_port(host)
-
-            match_dict = {CONF_HOST: host}
-            if port:
-                self.port = port
-                match_dict[CONF_PORT] = port
-            self._async_abort_entries_match(match_dict)
-
+            self._async_abort_entries_match({CONF_HOST: host})
             self.host = host
             credentials = await get_credentials(self.hass)
             try:
                 device = await self._async_try_discover_and_update(
-                    host,
-                    credentials,
-                    raise_on_progress=False,
-                    raise_on_timeout=False,
-                    port=port,
-                ) or await self._async_try_connect_all(
-                    host,
-                    credentials=credentials,
-                    raise_on_progress=False,
-                    port=port,
+                    host, credentials, raise_on_progress=False
                 )
             except AuthenticationError:
                 return await self.async_step_user_auth_confirm()
@@ -322,8 +279,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
                 placeholders["error"] = str(ex)
             else:
-                if not device:
-                    return await self.async_step_user_auth_confirm()
                 return self._async_create_entry_from_device(device)
 
         return self.async_show_form(
@@ -343,23 +298,15 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
             assert self.host is not None
         placeholders: dict[str, str] = {CONF_HOST: self.host}
 
+        assert self._discovered_device is not None
         if user_input:
             username = user_input[CONF_USERNAME]
             password = user_input[CONF_PASSWORD]
             credentials = Credentials(username, password)
-            device: Device | None
             try:
-                if self._discovered_device:
-                    device = await self._async_try_connect(
-                        self._discovered_device, credentials
-                    )
-                else:
-                    device = await self._async_try_connect_all(
-                        self.host,
-                        credentials=credentials,
-                        raise_on_progress=False,
-                        port=self.port,
-                    )
+                device = await self._async_try_connect(
+                    self._discovered_device, credentials
+                )
             except AuthenticationError as ex:
                 errors[CONF_PASSWORD] = "invalid_auth"
                 placeholders["error"] = str(ex)
@@ -367,15 +314,11 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
                 placeholders["error"] = str(ex)
             else:
-                if not device:
-                    errors["base"] = "cannot_connect"
-                    placeholders["error"] = "try_connect_all failed"
-                else:
-                    await set_credentials(self.hass, username, password)
-                    self.hass.async_create_task(
-                        self._async_reload_requires_auth_entries(), eager_start=False
-                    )
-                    return self._async_create_entry_from_device(device)
+                await set_credentials(self.hass, username, password)
+                self.hass.async_create_task(
+                    self._async_reload_requires_auth_entries(), eager_start=False
+                )
+                return self._async_create_entry_from_device(device)
 
         return self.async_show_form(
             step_id="user_auth_confirm",
@@ -460,84 +403,47 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
             data[CONF_AES_KEYS] = device.config.aes_keys
         if device.credentials_hash:
             data[CONF_CREDENTIALS_HASH] = device.credentials_hash
-        if port := device.config.port_override:
-            data[CONF_PORT] = port
         return self.async_create_entry(
             title=f"{device.alias} {device.model}",
             data=data,
         )
 
-    async def _async_try_connect_all(
-        self,
-        host: str,
-        credentials: Credentials | None,
-        raise_on_progress: bool,
-        *,
-        port: int | None = None,
-    ) -> Device | None:
-        """Try to connect to the device speculatively.
-
-        The connection parameters aren't known but discovery has failed so try
-        to connect with tcp.
-        """
-        if credentials:
-            device = await Discover.try_connect_all(
-                host,
-                credentials=credentials,
-                http_client=create_async_tplink_clientsession(self.hass),
-                port=port,
-            )
-        else:
-            # This will just try the legacy protocol that doesn't require auth
-            # and doesn't use http
-            try:
-                device = await Device.connect(
-                    config=DeviceConfig(host, port_override=port)
-                )
-            except Exception:  # noqa: BLE001
-                return None
-        if device:
-            await self.async_set_unique_id(
-                dr.format_mac(device.mac),
-                raise_on_progress=raise_on_progress,
-            )
-        return device
-
     async def _async_try_discover_and_update(
         self,
         host: str,
         credentials: Credentials | None,
         raise_on_progress: bool,
-        raise_on_timeout: bool,
-        *,
-        port: int | None = None,
-    ) -> Device | None:
+    ) -> Device:
         """Try to discover the device and call update.
 
-        Will try to connect directly if discovery fails.
+        Will try to connect to legacy devices if discovery fails.
         """
-        self._discovered_device = None
         try:
             self._discovered_device = await Discover.discover_single(
-                host,
-                credentials=credentials,
-                port=port,
+                host, credentials=credentials
             )
         except TimeoutError as ex:
-            if raise_on_timeout:
+            # Try connect() to legacy devices if discovery fails. This is a
+            # fallback mechanism for legacy that can handle connections without
+            # discovery info but if it fails raise the original error which is
+            # applicable for newer devices.
+            try:
+                self._discovered_device = await Device.connect(
+                    config=DeviceConfig(host)
+                )
+            except Exception:  # noqa: BLE001
+                # Raise the original error instead of the fallback error
                 raise ex from ex
-            return None
-        if TYPE_CHECKING:
-            assert self._discovered_device
+        else:
+            if self._discovered_device.config.uses_http:
+                self._discovered_device.config.http_client = (
+                    create_async_tplink_clientsession(self.hass)
+                )
+            await self._discovered_device.update()
         await self.async_set_unique_id(
             dr.format_mac(self._discovered_device.mac),
             raise_on_progress=raise_on_progress,
         )
-        if self._discovered_device.config.uses_http:
-            self._discovered_device.config.http_client = (
-                create_async_tplink_clientsession(self.hass)
-            )
-        await self._discovered_device.update()
         return self._discovered_device
 
     async def _async_try_connect(
@@ -577,7 +483,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
         reauth_entry = self._get_reauth_entry()
         entry_data = reauth_entry.data
         host = entry_data[CONF_HOST]
-        port = entry_data.get(CONF_PORT)
 
         if user_input:
             username = user_input[CONF_USERNAME]
@@ -587,14 +492,7 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
                 device = await self._async_try_discover_and_update(
                     host,
                     credentials=credentials,
-                    raise_on_progress=False,
-                    raise_on_timeout=False,
-                    port=port,
-                ) or await self._async_try_connect_all(
-                    host,
-                    credentials=credentials,
-                    raise_on_progress=False,
-                    port=port,
+                    raise_on_progress=True,
                 )
             except AuthenticationError as ex:
                 errors[CONF_PASSWORD] = "invalid_auth"
@@ -603,23 +501,15 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
                 placeholders["error"] = str(ex)
             else:
-                if not device:
-                    errors["base"] = "cannot_connect"
-                    placeholders["error"] = "try_connect_all failed"
-                else:
-                    await self.async_set_unique_id(
-                        dr.format_mac(device.mac),
-                        raise_on_progress=False,
+                await set_credentials(self.hass, username, password)
+                if updates := self._get_config_updates(reauth_entry, host, device):
+                    self.hass.config_entries.async_update_entry(
+                        reauth_entry, data=updates
                     )
-                    await set_credentials(self.hass, username, password)
-                    if updates := self._get_config_updates(reauth_entry, host, device):
-                        self.hass.config_entries.async_update_entry(
-                            reauth_entry, data=updates
-                        )
-                    self.hass.async_create_task(
-                        self._async_reload_requires_auth_entries(), eager_start=False
-                    )
-                    return self.async_abort(reason="reauth_successful")
+                self.hass.async_create_task(
+                    self._async_reload_requires_auth_entries(), eager_start=False
+                )
+                return self.async_abort(reason="reauth_successful")
 
         # Old config entries will not have these values.
         alias = entry_data.get(CONF_ALIAS) or "unknown"
diff --git a/homeassistant/components/tplink/icons.json b/homeassistant/components/tplink/icons.json
index 0abd68543c5..96ea8f41bb7 100644
--- a/homeassistant/components/tplink/icons.json
+++ b/homeassistant/components/tplink/icons.json
@@ -68,15 +68,6 @@
         "state": {
           "on": "mdi:sleep"
         }
-      },
-      "child_lock": {
-        "default": "mdi:account-lock"
-      },
-      "pir_enabled": {
-        "default": "mdi:motion-sensor-off",
-        "state": {
-          "on": "mdi:motion-sensor"
-        }
       }
     },
     "sensor": {
@@ -97,9 +88,6 @@
       },
       "alarm_source": {
         "default": "mdi:bell"
-      },
-      "water_alert_timestamp": {
-        "default": "mdi:clock-alert-outline"
       }
     },
     "number": {
diff --git a/homeassistant/components/tplink/manifest.json b/homeassistant/components/tplink/manifest.json
index cb8a55b3db2..ab1eac7d0c0 100644
--- a/homeassistant/components/tplink/manifest.json
+++ b/homeassistant/components/tplink/manifest.json
@@ -301,5 +301,5 @@
   "iot_class": "local_polling",
   "loggers": ["kasa"],
   "quality_scale": "platinum",
-  "requirements": ["python-kasa[speedups]==0.7.7"]
+  "requirements": ["python-kasa[speedups]==0.7.5"]
 }
diff --git a/homeassistant/components/tplink/sensor.py b/homeassistant/components/tplink/sensor.py
index 809d9002768..276334dc8a1 100644
--- a/homeassistant/components/tplink/sensor.py
+++ b/homeassistant/components/tplink/sensor.py
@@ -97,10 +97,6 @@ SENSOR_DESCRIPTIONS: tuple[TPLinkSensorEntityDescription, ...] = (
         key="device_time",
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
-    TPLinkSensorEntityDescription(
-        key="water_alert_timestamp",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
     TPLinkSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
@@ -116,7 +112,6 @@ SENSOR_DESCRIPTIONS: tuple[TPLinkSensorEntityDescription, ...] = (
     TPLinkSensorEntityDescription(
         key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 
diff --git a/homeassistant/components/tplink/strings.json b/homeassistant/components/tplink/strings.json
index 8e5118c2720..be87141aaed 100644
--- a/homeassistant/components/tplink/strings.json
+++ b/homeassistant/components/tplink/strings.json
@@ -35,6 +35,10 @@
           "password": "[%key:common::config_flow::data::password%]"
         }
       },
+      "reauth": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "[%key:component::tplink::config::step::user_auth_confirm::description%]"
+      },
       "reauth_confirm": {
         "title": "[%key:common::config_flow::title::reauth%]",
         "description": "[%key:component::tplink::config::step::user_auth_confirm::description%]",
@@ -159,9 +163,6 @@
       "device_time": {
         "name": "Device time"
       },
-      "water_alert_timestamp": {
-        "name": "Last water leak alert"
-      },
       "auto_off_at": {
         "name": "Auto off at"
       },
@@ -190,12 +191,6 @@
       },
       "fan_sleep_mode": {
         "name": "Fan sleep mode"
-      },
-      "child_lock": {
-        "name": "Child lock"
-      },
-      "pir_enabled": {
-        "name": "Motion sensor"
       }
     },
     "number": {
diff --git a/homeassistant/components/tplink/switch.py b/homeassistant/components/tplink/switch.py
index c9285d86ba6..6d3e21d88c5 100644
--- a/homeassistant/components/tplink/switch.py
+++ b/homeassistant/components/tplink/switch.py
@@ -48,12 +48,6 @@ SWITCH_DESCRIPTIONS: tuple[TPLinkSwitchEntityDescription, ...] = (
     TPLinkSwitchEntityDescription(
         key="fan_sleep_mode",
     ),
-    TPLinkSwitchEntityDescription(
-        key="child_lock",
-    ),
-    TPLinkSwitchEntityDescription(
-        key="pir_enabled",
-    ),
 )
 
 SWITCH_DESCRIPTIONS_MAP = {desc.key: desc for desc in SWITCH_DESCRIPTIONS}
diff --git a/homeassistant/components/tplink_omada/manifest.json b/homeassistant/components/tplink_omada/manifest.json
index af20b54675b..6bde656dc30 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.4.3"]
+  "requirements": ["tplink-omada-client==1.4.2"]
 }
diff --git a/homeassistant/components/trafikverket_train/config_flow.py b/homeassistant/components/trafikverket_train/config_flow.py
index f498a7b0d0e..a9eefd09b9b 100644
--- a/homeassistant/components/trafikverket_train/config_flow.py
+++ b/homeassistant/components/trafikverket_train/config_flow.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_API_KEY, CONF_NAME, CONF_WEEKDAY, WEEKDAYS
 from homeassistant.core import HomeAssistant, callback
@@ -132,7 +132,7 @@ class TVTrainConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> TVTrainOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return TVTrainOptionsFlowHandler()
+        return TVTrainOptionsFlowHandler(config_entry)
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
@@ -229,7 +229,7 @@ class TVTrainConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class TVTrainOptionsFlowHandler(OptionsFlow):
+class TVTrainOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle Trafikverket Train options."""
 
     async def async_step_init(
@@ -247,7 +247,7 @@ class TVTrainOptionsFlowHandler(OptionsFlow):
             step_id="init",
             data_schema=self.add_suggested_values_to_schema(
                 vol.Schema(OPTION_SCHEMA),
-                user_input or self.config_entry.options,
+                user_input or self.options,
             ),
             errors=errors,
         )
diff --git a/homeassistant/components/transmission/config_flow.py b/homeassistant/components/transmission/config_flow.py
index 30e9f5a146b..731c3da532a 100644
--- a/homeassistant/components/transmission/config_flow.py
+++ b/homeassistant/components/transmission/config_flow.py
@@ -15,7 +15,6 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import (
     CONF_HOST,
-    CONF_NAME,
     CONF_PASSWORD,
     CONF_PATH,
     CONF_PORT,
@@ -63,7 +62,7 @@ class TransmissionFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> TransmissionOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return TransmissionOptionsFlowHandler()
+        return TransmissionOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -121,10 +120,7 @@ class TransmissionFlowHandler(ConfigFlow, domain=DOMAIN):
                 return self.async_update_reload_and_abort(reauth_entry, data=user_input)
 
         return self.async_show_form(
-            description_placeholders={
-                CONF_USERNAME: reauth_entry.data[CONF_USERNAME],
-                CONF_NAME: reauth_entry.title,
-            },
+            description_placeholders={CONF_USERNAME: reauth_entry.data[CONF_USERNAME]},
             step_id="reauth_confirm",
             data_schema=vol.Schema(
                 {
@@ -138,6 +134,10 @@ class TransmissionFlowHandler(ConfigFlow, domain=DOMAIN):
 class TransmissionOptionsFlowHandler(OptionsFlow):
     """Handle Transmission client options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize Transmission options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/trend/manifest.json b/homeassistant/components/trend/manifest.json
index d7981105fd2..56b4b811171 100644
--- a/homeassistant/components/trend/manifest.json
+++ b/homeassistant/components/trend/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "helper",
   "iot_class": "calculated",
   "quality_scale": "internal",
-  "requirements": ["numpy==2.1.3"]
+  "requirements": ["numpy==1.26.4"]
 }
diff --git a/homeassistant/components/trend/strings.json b/homeassistant/components/trend/strings.json
index fb70a6e7032..2fe0b35ee3c 100644
--- a/homeassistant/components/trend/strings.json
+++ b/homeassistant/components/trend/strings.json
@@ -1,5 +1,4 @@
 {
-  "title": "Trend",
   "services": {
     "reload": {
       "name": "[%key:common::action::reload%]",
diff --git a/homeassistant/components/tuya/__init__.py b/homeassistant/components/tuya/__init__.py
index c8a639cd239..47143f3595c 100644
--- a/homeassistant/components/tuya/__init__.py
+++ b/homeassistant/components/tuya/__init__.py
@@ -146,21 +146,14 @@ class DeviceListener(SharingDeviceListener):
         self.hass = hass
         self.manager = manager
 
-    def update_device(
-        self, device: CustomerDevice, updated_status_properties: list[str] | None
-    ) -> None:
+    def update_device(self, device: CustomerDevice) -> None:
         """Update device status."""
         LOGGER.debug(
-            "Received update for device %s: %s (updated properties: %s)",
+            "Received update for device %s: %s",
             device.id,
             self.manager.device_map[device.id].status,
-            updated_status_properties,
-        )
-        dispatcher_send(
-            self.hass,
-            f"{TUYA_HA_SIGNAL_UPDATE_ENTITY}_{device.id}",
-            updated_status_properties,
         )
+        dispatcher_send(self.hass, f"{TUYA_HA_SIGNAL_UPDATE_ENTITY}_{device.id}")
 
     def add_device(self, device: CustomerDevice) -> None:
         """Add device added listener."""
diff --git a/homeassistant/components/tuya/alarm_control_panel.py b/homeassistant/components/tuya/alarm_control_panel.py
index 56bccc73581..fbea8d352a0 100644
--- a/homeassistant/components/tuya/alarm_control_panel.py
+++ b/homeassistant/components/tuya/alarm_control_panel.py
@@ -10,7 +10,12 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityDescription,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
+)
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -30,11 +35,11 @@ class Mode(StrEnum):
     SOS = "sos"
 
 
-STATE_MAPPING: dict[str, AlarmControlPanelState] = {
-    Mode.DISARMED: AlarmControlPanelState.DISARMED,
-    Mode.ARM: AlarmControlPanelState.ARMED_AWAY,
-    Mode.HOME: AlarmControlPanelState.ARMED_HOME,
-    Mode.SOS: AlarmControlPanelState.TRIGGERED,
+STATE_MAPPING: dict[str, str] = {
+    Mode.DISARMED: STATE_ALARM_DISARMED,
+    Mode.ARM: STATE_ALARM_ARMED_AWAY,
+    Mode.HOME: STATE_ALARM_ARMED_HOME,
+    Mode.SOS: STATE_ALARM_TRIGGERED,
 }
 
 
@@ -110,7 +115,7 @@ class TuyaAlarmEntity(TuyaEntity, AlarmControlPanelEntity):
                 self._attr_supported_features |= AlarmControlPanelEntityFeature.TRIGGER
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         if not (status := self.device.status.get(self.entity_description.key)):
             return None
diff --git a/homeassistant/components/tuya/binary_sensor.py b/homeassistant/components/tuya/binary_sensor.py
index 12661a26fd1..a8c9157caa7 100644
--- a/homeassistant/components/tuya/binary_sensor.py
+++ b/homeassistant/components/tuya/binary_sensor.py
@@ -151,7 +151,7 @@ BINARY_SENSORS: dict[str, tuple[TuyaBinarySensorEntityDescription, ...]] = {
         TuyaBinarySensorEntityDescription(
             key=DPCode.PRESENCE_STATE,
             device_class=BinarySensorDeviceClass.OCCUPANCY,
-            on_value={"presence", "small_move", "large_move", "peaceful"},
+            on_value="presence",
         ),
     ),
     # Formaldehyde Detector
diff --git a/homeassistant/components/tuya/entity.py b/homeassistant/components/tuya/entity.py
index cc258560067..4d3710f7570 100644
--- a/homeassistant/components/tuya/entity.py
+++ b/homeassistant/components/tuya/entity.py
@@ -283,15 +283,10 @@ class TuyaEntity(Entity):
             async_dispatcher_connect(
                 self.hass,
                 f"{TUYA_HA_SIGNAL_UPDATE_ENTITY}_{self.device.id}",
-                self._handle_state_update,
+                self.async_write_ha_state,
             )
         )
 
-    async def _handle_state_update(
-        self, updated_status_properties: list[str] | None
-    ) -> None:
-        self.async_write_ha_state()
-
     def _send_command(self, commands: list[dict[str, Any]]) -> None:
         """Send command to the device."""
         LOGGER.debug("Sending commands for device %s: %s", self.device.id, commands)
diff --git a/homeassistant/components/tuya/manifest.json b/homeassistant/components/tuya/manifest.json
index b53e6fa27d8..305a74160de 100644
--- a/homeassistant/components/tuya/manifest.json
+++ b/homeassistant/components/tuya/manifest.json
@@ -43,5 +43,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["tuya_iot"],
-  "requirements": ["tuya-device-sharing-sdk==0.2.1"]
+  "requirements": ["tuya-device-sharing-sdk==0.1.9"]
 }
diff --git a/homeassistant/components/tuya/sensor.py b/homeassistant/components/tuya/sensor.py
index b9677037b7e..fd8efcac95d 100644
--- a/homeassistant/components/tuya/sensor.py
+++ b/homeassistant/components/tuya/sensor.py
@@ -203,17 +203,6 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.CO2,
             state_class=SensorStateClass.MEASUREMENT,
         ),
-        TuyaSensorEntityDescription(
-            key=DPCode.CH2O_VALUE,
-            translation_key="formaldehyde",
-            state_class=SensorStateClass.MEASUREMENT,
-        ),
-        TuyaSensorEntityDescription(
-            key=DPCode.VOC_VALUE,
-            translation_key="voc",
-            device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
-            state_class=SensorStateClass.MEASUREMENT,
-        ),
         *BATTERY_SENSORS,
     ),
     # Two-way temperature and humidity switch
diff --git a/homeassistant/components/twentemilieu/__init__.py b/homeassistant/components/twentemilieu/__init__.py
index b6728b96536..f447ef6257d 100644
--- a/homeassistant/components/twentemilieu/__init__.py
+++ b/homeassistant/components/twentemilieu/__init__.py
@@ -42,7 +42,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator: TwenteMilieuDataUpdateCoordinator = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_interval=SCAN_INTERVAL,
         update_method=twentemilieu.update,
diff --git a/homeassistant/components/twitch/config_flow.py b/homeassistant/components/twitch/config_flow.py
index ed196897c11..dbaef59c236 100644
--- a/homeassistant/components/twitch/config_flow.py
+++ b/homeassistant/components/twitch/config_flow.py
@@ -78,10 +78,7 @@ class OAuth2FlowHandler(
         reauth_entry = self._get_reauth_entry()
         self._abort_if_unique_id_mismatch(
             reason="wrong_account",
-            description_placeholders={
-                "title": reauth_entry.title,
-                "username": str(reauth_entry.unique_id),
-            },
+            description_placeholders={"title": reauth_entry.title},
         )
 
         new_channels = reauth_entry.options[CONF_CHANNELS]
diff --git a/homeassistant/components/twitch/coordinator.py b/homeassistant/components/twitch/coordinator.py
index c34eeaa5325..b8d19750778 100644
--- a/homeassistant/components/twitch/coordinator.py
+++ b/homeassistant/components/twitch/coordinator.py
@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 
 from twitchAPI.helper import first
-from twitchAPI.object.api import FollowedChannel, Stream, TwitchUser, UserSubscription
+from twitchAPI.object.api import FollowedChannelsResult, TwitchUser, UserSubscription
 from twitchAPI.twitch import Twitch
 from twitchAPI.type import TwitchAPIException, TwitchResourceNotFound
 
@@ -27,6 +27,7 @@ class TwitchUpdate:
 
     name: str
     followers: int
+    views: int
     is_streaming: bool
     game: str | None
     title: str | None
@@ -35,7 +36,6 @@ class TwitchUpdate:
     picture: str
     subscribed: bool | None
     subscription_gifted: bool | None
-    subscription_tier: int | None
     follows: bool
     following_since: datetime | None
     viewers: int | None
@@ -81,24 +81,12 @@ class TwitchCoordinator(DataUpdateCoordinator[dict[str, TwitchUpdate]]):
             self.session.token["refresh_token"],
             False,
         )
-        data: dict[str, TwitchUpdate] = {}
-        streams: dict[str, Stream] = {
-            s.user_id: s
-            async for s in self.twitch.get_followed_streams(
-                user_id=self.current_user.id, first=100
-            )
-        }
-        follows: dict[str, FollowedChannel] = {
-            f.broadcaster_id: f
-            async for f in await self.twitch.get_followed_channels(
-                user_id=self.current_user.id, first=100
-            )
-        }
+        data = {}
         for channel in self.users:
             followers = await self.twitch.get_channel_followers(channel.id)
-            stream = streams.get(channel.id)
-            follow = follows.get(channel.id)
+            stream = await first(self.twitch.get_streams(user_id=[channel.id], first=1))
             sub: UserSubscription | None = None
+            follows: FollowedChannelsResult | None = None
             try:
                 sub = await self.twitch.check_user_subscription(
                     user_id=self.current_user.id, broadcaster_id=channel.id
@@ -107,21 +95,24 @@ class TwitchCoordinator(DataUpdateCoordinator[dict[str, TwitchUpdate]]):
                 LOGGER.debug("User is not subscribed to %s", channel.display_name)
             except TwitchAPIException as exc:
                 LOGGER.error("Error response on check_user_subscription: %s", exc)
-
+            else:
+                follows = await self.twitch.get_followed_channels(
+                    self.current_user.id, broadcaster_id=channel.id
+                )
             data[channel.id] = TwitchUpdate(
                 channel.display_name,
                 followers.total,
+                channel.view_count,
                 bool(stream),
                 stream.game_name if stream else None,
                 stream.title if stream else None,
                 stream.started_at if stream else None,
                 stream.thumbnail_url if stream else None,
                 channel.profile_image_url,
-                bool(sub),
+                sub is not None if sub else None,
                 sub.is_gift if sub else None,
-                {"1000": 1, "2000": 2, "3000": 3}.get(sub.tier) if sub else None,
-                bool(follow),
-                follow.followed_at if follow else None,
+                follows is not None and follows.total > 0,
+                follows.data[0].followed_at if follows and follows.total else None,
                 stream.viewer_count if stream else None,
             )
         return data
diff --git a/homeassistant/components/twitch/sensor.py b/homeassistant/components/twitch/sensor.py
index bd5fc509989..66ca7a4445d 100644
--- a/homeassistant/components/twitch/sensor.py
+++ b/homeassistant/components/twitch/sensor.py
@@ -18,11 +18,12 @@ from .coordinator import TwitchUpdate
 ATTR_GAME = "game"
 ATTR_TITLE = "title"
 ATTR_SUBSCRIPTION = "subscribed"
+ATTR_SUBSCRIPTION_SINCE = "subscribed_since"
 ATTR_SUBSCRIPTION_GIFTED = "subscription_is_gifted"
-ATTR_SUBSCRIPTION_TIER = "subscription_tier"
 ATTR_FOLLOW = "following"
 ATTR_FOLLOW_SINCE = "following_since"
 ATTR_FOLLOWING = "followers"
+ATTR_VIEWS = "views"
 ATTR_VIEWERS = "viewers"
 ATTR_STARTED_AT = "started_at"
 
@@ -78,6 +79,7 @@ class TwitchSensor(CoordinatorEntity[TwitchCoordinator], SensorEntity):
         channel = self.channel
         resp = {
             ATTR_FOLLOWING: channel.followers,
+            ATTR_VIEWS: channel.views,
             ATTR_GAME: channel.game,
             ATTR_TITLE: channel.title,
             ATTR_STARTED_AT: channel.started_at,
@@ -87,7 +89,6 @@ class TwitchSensor(CoordinatorEntity[TwitchCoordinator], SensorEntity):
         if channel.subscribed is not None:
             resp[ATTR_SUBSCRIPTION] = channel.subscribed
             resp[ATTR_SUBSCRIPTION_GIFTED] = channel.subscription_gifted
-            resp[ATTR_SUBSCRIPTION_TIER] = channel.subscription_tier
         resp[ATTR_FOLLOW] = channel.follows
         if channel.follows:
             resp[ATTR_FOLLOW_SINCE] = channel.following_since
diff --git a/homeassistant/components/unifi/config_flow.py b/homeassistant/components/unifi/config_flow.py
index 63c8533aa2e..b5ad1ea2ff0 100644
--- a/homeassistant/components/unifi/config_flow.py
+++ b/homeassistant/components/unifi/config_flow.py
@@ -20,7 +20,7 @@ import voluptuous as vol
 
 from homeassistant.components import ssdp
 from homeassistant.config_entries import (
-    SOURCE_REAUTH,
+    ConfigEntry,
     ConfigEntryState,
     ConfigFlow,
     ConfigFlowResult,
@@ -78,7 +78,7 @@ class UnifiFlowHandler(ConfigFlow, domain=UNIFI_DOMAIN):
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: UnifiConfigEntry,
+        config_entry: ConfigEntry,
     ) -> UnifiOptionsFlowHandler:
         """Get the options flow for this handler."""
         return UnifiOptionsFlowHandler(config_entry)
@@ -86,6 +86,7 @@ class UnifiFlowHandler(ConfigFlow, domain=UNIFI_DOMAIN):
     def __init__(self) -> None:
         """Initialize the UniFi Network flow."""
         self.config: dict[str, Any] = {}
+        self.reauth_config_entry: ConfigEntry | None = None
         self.reauth_schema: dict[vol.Marker, Any] = {}
 
     async def async_step_user(
@@ -117,14 +118,13 @@ class UnifiFlowHandler(ConfigFlow, domain=UNIFI_DOMAIN):
 
             else:
                 if (
-                    self.source == SOURCE_REAUTH
-                    and (
-                        (reauth_unique_id := self._get_reauth_entry().unique_id)
-                        is not None
-                    )
-                    and reauth_unique_id in self.sites
+                    self.reauth_config_entry
+                    and self.reauth_config_entry.unique_id is not None
+                    and self.reauth_config_entry.unique_id in self.sites
                 ):
-                    return await self.async_step_site({CONF_SITE_ID: reauth_unique_id})
+                    return await self.async_step_site(
+                        {CONF_SITE_ID: self.reauth_config_entry.unique_id}
+                    )
 
                 return await self.async_step_site()
 
@@ -160,8 +160,8 @@ class UnifiFlowHandler(ConfigFlow, domain=UNIFI_DOMAIN):
             config_entry = await self.async_set_unique_id(unique_id)
             abort_reason = "configuration_updated"
 
-            if self.source == SOURCE_REAUTH:
-                config_entry = self._get_reauth_entry()
+            if self.reauth_config_entry:
+                config_entry = self.reauth_config_entry
                 abort_reason = "reauth_successful"
 
             if config_entry:
@@ -192,20 +192,24 @@ class UnifiFlowHandler(ConfigFlow, domain=UNIFI_DOMAIN):
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Trigger a reauthentication flow."""
-        reauth_entry = self._get_reauth_entry()
+        config_entry = self.hass.config_entries.async_get_entry(
+            self.context["entry_id"]
+        )
+        assert config_entry
+        self.reauth_config_entry = config_entry
 
         self.context["title_placeholders"] = {
-            CONF_HOST: reauth_entry.data[CONF_HOST],
-            CONF_SITE_ID: reauth_entry.title,
+            CONF_HOST: config_entry.data[CONF_HOST],
+            CONF_SITE_ID: config_entry.title,
         }
 
         self.reauth_schema = {
-            vol.Required(CONF_HOST, default=reauth_entry.data[CONF_HOST]): str,
-            vol.Required(CONF_USERNAME, default=reauth_entry.data[CONF_USERNAME]): str,
+            vol.Required(CONF_HOST, default=config_entry.data[CONF_HOST]): str,
+            vol.Required(CONF_USERNAME, default=config_entry.data[CONF_USERNAME]): str,
             vol.Required(CONF_PASSWORD): str,
-            vol.Required(CONF_PORT, default=reauth_entry.data[CONF_PORT]): int,
+            vol.Required(CONF_PORT, default=config_entry.data[CONF_PORT]): int,
             vol.Required(
-                CONF_VERIFY_SSL, default=reauth_entry.data[CONF_VERIFY_SSL]
+                CONF_VERIFY_SSL, default=config_entry.data[CONF_VERIFY_SSL]
             ): bool,
         }
 
@@ -249,6 +253,7 @@ class UnifiOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: UnifiConfigEntry) -> None:
         """Initialize UniFi Network options flow."""
+        self.config_entry = config_entry
         self.options = dict(config_entry.options)
 
     async def async_step_init(
diff --git a/homeassistant/components/unifiprotect/camera.py b/homeassistant/components/unifiprotect/camera.py
index a40939be917..62c35d00171 100644
--- a/homeassistant/components/unifiprotect/camera.py
+++ b/homeassistant/components/unifiprotect/camera.py
@@ -156,8 +156,7 @@ async def async_setup_entry(
     async_add_entities(_async_camera_entities(hass, entry, data))
 
 
-_DISABLE_FEATURE = CameraEntityFeature(0)
-_ENABLE_FEATURE = CameraEntityFeature.STREAM
+_EMPTY_CAMERA_FEATURES = CameraEntityFeature(0)
 
 
 class ProtectCamera(ProtectDeviceEntity, Camera):
@@ -196,22 +195,24 @@ class ProtectCamera(ProtectDeviceEntity, Camera):
             self._attr_name = f"{camera_name} (insecure)"
         # only the default (first) channel is enabled by default
         self._attr_entity_registry_enabled_default = is_default and secure
-        # Set the stream source before finishing the init
-        # because async_added_to_hass is too late and camera
-        # integration uses async_internal_added_to_hass to access
-        # the stream source which is called before async_added_to_hass
-        self._async_set_stream_source()
 
     @callback
     def _async_set_stream_source(self) -> None:
+        disable_stream = self._disable_stream
         channel = self.channel
-        enable_stream = not self._disable_stream and channel.is_rtsp_enabled
-        # SRTP disabled because go2rtc does not support it
-        # https://github.com/AlexxIT/go2rtc/#source-rtsp
-        rtsp_url = channel.rtsps_no_srtp_url if self._secure else channel.rtsp_url
-        source = rtsp_url if enable_stream else None
-        self._attr_supported_features = _ENABLE_FEATURE if source else _DISABLE_FEATURE
-        self._stream_source = source
+
+        if not channel.is_rtsp_enabled:
+            disable_stream = False
+
+        rtsp_url = channel.rtsps_url if self._secure else channel.rtsp_url
+
+        # _async_set_stream_source called by __init__
+        # pylint: disable-next=attribute-defined-outside-init
+        self._stream_source = None if disable_stream else rtsp_url
+        if self._stream_source:
+            self._attr_supported_features = CameraEntityFeature.STREAM
+        else:
+            self._attr_supported_features = _EMPTY_CAMERA_FEATURES
 
     @callback
     def _async_update_device_from_protect(self, device: ProtectDeviceType) -> None:
diff --git a/homeassistant/components/unifiprotect/config_flow.py b/homeassistant/components/unifiprotect/config_flow.py
index 31950f8f7e4..6a9dc1210c0 100644
--- a/homeassistant/components/unifiprotect/config_flow.py
+++ b/homeassistant/components/unifiprotect/config_flow.py
@@ -225,7 +225,7 @@ class ProtectFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     @callback
     def _async_create_entry(self, title: str, data: dict[str, Any]) -> ConfigFlowResult:
@@ -376,6 +376,10 @@ class ProtectFlowHandler(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Handle options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/unifiprotect/manifest.json b/homeassistant/components/unifiprotect/manifest.json
index 85867b5c87c..ae7b2d94f21 100644
--- a/homeassistant/components/unifiprotect/manifest.json
+++ b/homeassistant/components/unifiprotect/manifest.json
@@ -40,7 +40,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["uiprotect", "unifi_discovery"],
-  "requirements": ["uiprotect==6.4.0", "unifi-discovery==1.2.0"],
+  "requirements": ["uiprotect==6.3.1", "unifi-discovery==1.2.0"],
   "ssdp": [
     {
       "manufacturer": "Ubiquiti Networks",
diff --git a/homeassistant/components/upcloud/config_flow.py b/homeassistant/components/upcloud/config_flow.py
index bb988726ba5..20860df5553 100644
--- a/homeassistant/components/upcloud/config_flow.py
+++ b/homeassistant/components/upcloud/config_flow.py
@@ -95,12 +95,16 @@ class UpCloudConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> UpCloudOptionsFlow:
         """Get options flow."""
-        return UpCloudOptionsFlow()
+        return UpCloudOptionsFlow(config_entry)
 
 
 class UpCloudOptionsFlow(OptionsFlow):
     """UpCloud options flow."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/update/__init__.py b/homeassistant/components/update/__init__.py
index 6f0b56b14e8..8d4a5614f94 100644
--- a/homeassistant/components/update/__init__.py
+++ b/homeassistant/components/update/__init__.py
@@ -27,7 +27,6 @@ from homeassistant.util.hass_dict import HassKey
 from .const import (
     ATTR_AUTO_UPDATE,
     ATTR_BACKUP,
-    ATTR_DISPLAY_PRECISION,
     ATTR_IN_PROGRESS,
     ATTR_INSTALLED_VERSION,
     ATTR_LATEST_VERSION,
@@ -179,7 +178,6 @@ class UpdateEntityDescription(EntityDescription, frozen_or_thawed=True):
     """A class that describes update entities."""
 
     device_class: UpdateDeviceClass | None = None
-    display_precision: int = 0
     entity_category: EntityCategory | None = EntityCategory.CONFIG
 
 
@@ -193,14 +191,12 @@ CACHED_PROPERTIES_WITH_ATTR_ = {
     "auto_update",
     "installed_version",
     "device_class",
-    "display_precision",
     "in_progress",
     "latest_version",
     "release_summary",
     "release_url",
     "supported_features",
     "title",
-    "update_percentage",
 }
 
 
@@ -213,7 +209,6 @@ class UpdateEntity(
 
     _entity_component_unrecorded_attributes = frozenset(
         {
-            ATTR_DISPLAY_PRECISION,
             ATTR_ENTITY_PICTURE,
             ATTR_IN_PROGRESS,
             ATTR_RELEASE_SUMMARY,
@@ -225,7 +220,6 @@ class UpdateEntity(
     _attr_auto_update: bool = False
     _attr_installed_version: str | None = None
     _attr_device_class: UpdateDeviceClass | None
-    _attr_display_precision: int
     _attr_in_progress: bool | int = False
     _attr_latest_version: str | None = None
     _attr_release_summary: str | None = None
@@ -233,7 +227,6 @@ class UpdateEntity(
     _attr_state: None = None
     _attr_supported_features: UpdateEntityFeature = UpdateEntityFeature(0)
     _attr_title: str | None = None
-    _attr_update_percentage: int | float | None = None
     __skipped_version: str | None = None
     __in_progress: bool = False
 
@@ -263,15 +256,6 @@ class UpdateEntity(
             return self.entity_description.device_class
         return None
 
-    @cached_property
-    def display_precision(self) -> int:
-        """Return number of decimal digits for display of update progress."""
-        if hasattr(self, "_attr_display_precision"):
-            return self._attr_display_precision
-        if hasattr(self, "entity_description"):
-            return self.entity_description.display_precision
-        return 0
-
     @property
     def entity_category(self) -> EntityCategory | None:
         """Return the category of the entity, if any."""
@@ -300,7 +284,8 @@ class UpdateEntity(
 
         Needs UpdateEntityFeature.PROGRESS flag to be set for it to be used.
 
-        Should return a boolean (True if in progress, False if not).
+        Can either return a boolean (True if in progress, False if not)
+        or an integer to indicate the progress in from 0 to 100%.
         """
         return self._attr_in_progress
 
@@ -350,16 +335,6 @@ class UpdateEntity(
             return new_features
         return features
 
-    @cached_property
-    def update_percentage(self) -> int | float | None:
-        """Update installation progress.
-
-        Needs UpdateEntityFeature.PROGRESS flag to be set for it to be used.
-
-        Can either return a number to indicate the progress from 0 to 100% or None.
-        """
-        return self._attr_update_percentage
-
     @final
     async def async_skip(self) -> None:
         """Skip the current offered version to update."""
@@ -449,17 +424,17 @@ class UpdateEntity(
         if (release_summary := self.release_summary) is not None:
             release_summary = release_summary[:255]
 
+        update_percentage = None
+
         # If entity supports progress, return the in_progress value.
         # Otherwise, we use the internal progress value.
         if UpdateEntityFeature.PROGRESS in self.supported_features_compat:
             in_progress = self.in_progress
-            update_percentage = self.update_percentage if in_progress else None
-            if type(in_progress) is not bool and isinstance(in_progress, int):
-                update_percentage = in_progress
-                in_progress = True
         else:
             in_progress = self.__in_progress
-            update_percentage = None
+        if type(in_progress) is not bool and isinstance(in_progress, int):
+            update_percentage = in_progress
+            in_progress = True
 
         installed_version = self.installed_version
         latest_version = self.latest_version
@@ -474,7 +449,6 @@ class UpdateEntity(
 
         return {
             ATTR_AUTO_UPDATE: self.auto_update,
-            ATTR_DISPLAY_PRECISION: self.display_precision,
             ATTR_INSTALLED_VERSION: installed_version,
             ATTR_IN_PROGRESS: in_progress,
             ATTR_LATEST_VERSION: latest_version,
diff --git a/homeassistant/components/update/const.py b/homeassistant/components/update/const.py
index 83a74ef6789..00b8cfa76b2 100644
--- a/homeassistant/components/update/const.py
+++ b/homeassistant/components/update/const.py
@@ -23,7 +23,6 @@ SERVICE_SKIP: Final = "skip"
 
 ATTR_AUTO_UPDATE: Final = "auto_update"
 ATTR_BACKUP: Final = "backup"
-ATTR_DISPLAY_PRECISION: Final = "display_precision"
 ATTR_INSTALLED_VERSION: Final = "installed_version"
 ATTR_IN_PROGRESS: Final = "in_progress"
 ATTR_LATEST_VERSION: Final = "latest_version"
diff --git a/homeassistant/components/upnp/config_flow.py b/homeassistant/components/upnp/config_flow.py
index 41e481fa58c..1a40d4b3442 100644
--- a/homeassistant/components/upnp/config_flow.py
+++ b/homeassistant/components/upnp/config_flow.py
@@ -16,6 +16,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.core import HomeAssistant, callback
 
@@ -93,11 +94,9 @@ class UpnpFlowHandler(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> UpnpOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return UpnpOptionsFlowHandler()
+        return UpnpOptionsFlowHandler(config_entry)
 
     @property
     def _discoveries(self) -> dict[str, SsdpServiceInfo]:
@@ -300,7 +299,7 @@ class UpnpFlowHandler(ConfigFlow, domain=DOMAIN):
         return self.async_create_entry(title=title, data=data, options=options)
 
 
-class UpnpOptionsFlowHandler(OptionsFlow):
+class UpnpOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle an options flow."""
 
     async def async_step_init(
@@ -314,7 +313,7 @@ class UpnpOptionsFlowHandler(OptionsFlow):
             {
                 vol.Optional(
                     CONFIG_ENTRY_FORCE_POLL,
-                    default=self.config_entry.options.get(
+                    default=self.options.get(
                         CONFIG_ENTRY_FORCE_POLL, DEFAULT_CONFIG_ENTRY_FORCE_POLL
                     ),
                 ): bool,
diff --git a/homeassistant/components/utility_meter/manifest.json b/homeassistant/components/utility_meter/manifest.json
index 31a2d4e9584..25e803e6a2d 100644
--- a/homeassistant/components/utility_meter/manifest.json
+++ b/homeassistant/components/utility_meter/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["croniter"],
   "quality_scale": "internal",
-  "requirements": ["cronsim==2.6"]
+  "requirements": ["croniter==2.0.2"]
 }
diff --git a/homeassistant/components/utility_meter/select.py b/homeassistant/components/utility_meter/select.py
index 5815ce7ec95..d5b1206d046 100644
--- a/homeassistant/components/utility_meter/select.py
+++ b/homeassistant/components/utility_meter/select.py
@@ -6,7 +6,7 @@ import logging
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_NAME, CONF_UNIQUE_ID
+from homeassistant.const import CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device import async_device_info_to_link_from_entity
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -36,9 +36,9 @@ async def async_setup_entry(
     )
 
     tariff_select = TariffSelect(
-        name=name,
-        tariffs=tariffs,
-        unique_id=unique_id,
+        name,
+        tariffs,
+        unique_id,
         device_info=device_info,
     )
     async_add_entities([tariff_select])
@@ -62,15 +62,13 @@ async def async_setup_platform(
     conf_meter_unique_id: str | None = hass.data[DATA_UTILITY][meter].get(
         CONF_UNIQUE_ID
     )
-    conf_meter_name = hass.data[DATA_UTILITY][meter].get(CONF_NAME, meter)
 
     async_add_entities(
         [
             TariffSelect(
-                name=conf_meter_name,
-                tariffs=discovery_info[CONF_TARIFFS],
-                yaml_slug=meter,
-                unique_id=conf_meter_unique_id,
+                meter,
+                discovery_info[CONF_TARIFFS],
+                conf_meter_unique_id,
             )
         ]
     )
@@ -84,16 +82,12 @@ class TariffSelect(SelectEntity, RestoreEntity):
     def __init__(
         self,
         name,
-        tariffs: list[str],
-        *,
-        yaml_slug: str | None = None,
-        unique_id: str | None = None,
+        tariffs,
+        unique_id,
         device_info: DeviceInfo | None = None,
     ) -> None:
         """Initialize a tariff selector."""
         self._attr_name = name
-        if yaml_slug:  # Backwards compatibility with YAML configuration entries
-            self.entity_id = f"select.{yaml_slug}"
         self._attr_unique_id = unique_id
         self._attr_device_info = device_info
         self._current_tariff: str | None = None
diff --git a/homeassistant/components/utility_meter/sensor.py b/homeassistant/components/utility_meter/sensor.py
index 19ef3c1f3a8..6b8c07c7ef7 100644
--- a/homeassistant/components/utility_meter/sensor.py
+++ b/homeassistant/components/utility_meter/sensor.py
@@ -9,7 +9,7 @@ from decimal import Decimal, DecimalException, InvalidOperation
 import logging
 from typing import Any, Self
 
-from cronsim import CronSim
+from croniter import croniter
 import voluptuous as vol
 
 from homeassistant.components.sensor import (
@@ -379,13 +379,14 @@ class UtilityMeterSensor(RestoreSensor):
         self.entity_id = suggested_entity_id
         self._parent_meter = parent_meter
         self._sensor_source_id = source_entity
+        self._state = None
         self._last_period = Decimal(0)
         self._last_reset = dt_util.utcnow()
         self._last_valid_state = None
         self._collecting = None
-        self._attr_name = name
+        self._name = name
         self._input_device_class = None
-        self._attr_native_unit_of_measurement = None
+        self._unit_of_measurement = None
         self._period = meter_type
         if meter_type is not None:
             # For backwards compatibility reasons we convert the period and offset into a cron pattern
@@ -404,22 +405,12 @@ class UtilityMeterSensor(RestoreSensor):
         self._tariff = tariff
         self._tariff_entity = tariff_entity
         self._next_reset = None
-        self.scheduler = (
-            CronSim(
-                self._cron_pattern,
-                dt_util.now(
-                    dt_util.get_default_time_zone()
-                ),  # we need timezone for DST purposes (see issue #102984)
-            )
-            if self._cron_pattern
-            else None
-        )
 
     def start(self, attributes: Mapping[str, Any]) -> None:
         """Initialize unit and state upon source initial update."""
         self._input_device_class = attributes.get(ATTR_DEVICE_CLASS)
-        self._attr_native_unit_of_measurement = attributes.get(ATTR_UNIT_OF_MEASUREMENT)
-        self._attr_native_value = 0
+        self._unit_of_measurement = attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        self._state = 0
         self.async_write_ha_state()
 
     @staticmethod
@@ -494,13 +485,13 @@ class UtilityMeterSensor(RestoreSensor):
             )
             return
 
-        if self.native_value is None:
+        if self._state is None:
             # First state update initializes the utility_meter sensors
             for sensor in self.hass.data[DATA_UTILITY][self._parent_meter][
                 DATA_TARIFF_SENSORS
             ]:
                 sensor.start(new_state_attributes)
-                if self.native_unit_of_measurement is None:
+                if self._unit_of_measurement is None:
                     _LOGGER.warning(
                         "Source sensor %s has no unit of measurement. Please %s",
                         self._sensor_source_id,
@@ -511,12 +502,10 @@ class UtilityMeterSensor(RestoreSensor):
             adjustment := self.calculate_adjustment(old_state, new_state)
         ) is not None and (self._sensor_net_consumption or adjustment >= 0):
             # If net_consumption is off, the adjustment must be non-negative
-            self._attr_native_value += adjustment  # type: ignore[operator] # self._attr_native_value will be set to by the start function if it is None, therefore it always has a valid Decimal value at this line
+            self._state += adjustment  # type: ignore[operator] # self._state will be set to by the start function if it is None, therefore it always has a valid Decimal value at this line
 
         self._input_device_class = new_state_attributes.get(ATTR_DEVICE_CLASS)
-        self._attr_native_unit_of_measurement = new_state_attributes.get(
-            ATTR_UNIT_OF_MEASUREMENT
-        )
+        self._unit_of_measurement = new_state_attributes.get(ATTR_UNIT_OF_MEASUREMENT)
         self._last_valid_state = new_state_val
         self.async_write_ha_state()
 
@@ -545,7 +534,7 @@ class UtilityMeterSensor(RestoreSensor):
 
         _LOGGER.debug(
             "%s - %s - source <%s>",
-            self.name,
+            self._name,
             COLLECTING if self._collecting is not None else PAUSED,
             self._sensor_source_id,
         )
@@ -554,10 +543,11 @@ class UtilityMeterSensor(RestoreSensor):
 
     async def _program_reset(self):
         """Program the reset of the utility meter."""
-        if self.scheduler:
-            self._next_reset = next(self.scheduler)
-
-            _LOGGER.debug("Next reset of %s is %s", self.entity_id, self._next_reset)
+        if self._cron_pattern is not None:
+            tz = dt_util.get_default_time_zone()
+            self._next_reset = croniter(self._cron_pattern, dt_util.now(tz)).get_next(
+                datetime
+            )  # we need timezone for DST purposes (see issue #102984)
             self.async_on_remove(
                 async_track_point_in_time(
                     self.hass,
@@ -585,16 +575,14 @@ class UtilityMeterSensor(RestoreSensor):
             return
         _LOGGER.debug("Reset utility meter <%s>", self.entity_id)
         self._last_reset = dt_util.utcnow()
-        self._last_period = (
-            Decimal(self.native_value) if self.native_value else Decimal(0)
-        )
-        self._attr_native_value = 0
+        self._last_period = Decimal(self._state) if self._state else Decimal(0)
+        self._state = 0
         self.async_write_ha_state()
 
     async def async_calibrate(self, value):
         """Calibrate the Utility Meter with a given value."""
-        _LOGGER.debug("Calibrate %s = %s type(%s)", self.name, value, type(value))
-        self._attr_native_value = Decimal(str(value))
+        _LOGGER.debug("Calibrate %s = %s type(%s)", self._name, value, type(value))
+        self._state = Decimal(str(value))
         self.async_write_ha_state()
 
     async def async_added_to_hass(self):
@@ -610,11 +598,10 @@ class UtilityMeterSensor(RestoreSensor):
         )
 
         if (last_sensor_data := await self.async_get_last_sensor_data()) is not None:
-            self._attr_native_value = last_sensor_data.native_value
+            # new introduced in 2022.04
+            self._state = last_sensor_data.native_value
             self._input_device_class = last_sensor_data.input_device_class
-            self._attr_native_unit_of_measurement = (
-                last_sensor_data.native_unit_of_measurement
-            )
+            self._unit_of_measurement = last_sensor_data.native_unit_of_measurement
             self._last_period = last_sensor_data.last_period
             self._last_reset = last_sensor_data.last_reset
             self._last_valid_state = last_sensor_data.last_valid_state
@@ -622,6 +609,39 @@ class UtilityMeterSensor(RestoreSensor):
                 # Null lambda to allow cancelling the collection on tariff change
                 self._collecting = lambda: None
 
+        elif state := await self.async_get_last_state():
+            # legacy to be removed on 2022.10 (we are keeping this to avoid utility_meter counter losses)
+            try:
+                self._state = Decimal(state.state)
+            except InvalidOperation:
+                _LOGGER.error(
+                    "Could not restore state <%s>. Resetting utility_meter.%s",
+                    state.state,
+                    self.name,
+                )
+            else:
+                self._unit_of_measurement = state.attributes.get(
+                    ATTR_UNIT_OF_MEASUREMENT
+                )
+                self._last_period = (
+                    Decimal(state.attributes[ATTR_LAST_PERIOD])
+                    if state.attributes.get(ATTR_LAST_PERIOD)
+                    and is_number(state.attributes[ATTR_LAST_PERIOD])
+                    else Decimal(0)
+                )
+                self._last_valid_state = (
+                    Decimal(state.attributes[ATTR_LAST_VALID_STATE])
+                    if state.attributes.get(ATTR_LAST_VALID_STATE)
+                    and is_number(state.attributes[ATTR_LAST_VALID_STATE])
+                    else None
+                )
+                self._last_reset = dt_util.as_utc(
+                    dt_util.parse_datetime(state.attributes.get(ATTR_LAST_RESET))
+                )
+                if state.attributes.get(ATTR_STATUS) == COLLECTING:
+                    # Null lambda to allow cancelling the collection on tariff change
+                    self._collecting = lambda: None
+
         @callback
         def async_source_tracking(event):
             """Wait for source to be ready, then start meter."""
@@ -646,7 +666,7 @@ class UtilityMeterSensor(RestoreSensor):
             _LOGGER.debug(
                 "<%s> collecting %s from %s",
                 self.name,
-                self.native_unit_of_measurement,
+                self._unit_of_measurement,
                 self._sensor_source_id,
             )
             self._collecting = async_track_state_change_event(
@@ -661,15 +681,22 @@ class UtilityMeterSensor(RestoreSensor):
             self._collecting()
         self._collecting = None
 
+    @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 device_class(self):
         """Return the device class of the sensor."""
         if self._input_device_class is not None:
             return self._input_device_class
-        if (
-            self.native_unit_of_measurement
-            in DEVICE_CLASS_UNITS[SensorDeviceClass.ENERGY]
-        ):
+        if self._unit_of_measurement in DEVICE_CLASS_UNITS[SensorDeviceClass.ENERGY]:
             return SensorDeviceClass.ENERGY
         return None
 
@@ -682,6 +709,11 @@ class UtilityMeterSensor(RestoreSensor):
             else SensorStateClass.TOTAL_INCREASING
         )
 
+    @property
+    def native_unit_of_measurement(self):
+        """Return the unit the value is expressed in."""
+        return self._unit_of_measurement
+
     @property
     def extra_state_attributes(self):
         """Return the state attributes of the sensor."""
diff --git a/homeassistant/components/velbus/__init__.py b/homeassistant/components/velbus/__init__.py
index ca8cfb0f2a7..685f8b49500 100644
--- a/homeassistant/components/velbus/__init__.py
+++ b/homeassistant/components/velbus/__init__.py
@@ -122,7 +122,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         await (
             hass.data[DOMAIN][call.data[CONF_INTERFACE]]["cntrl"]
             .get_module(call.data[CONF_ADDRESS])
-            .set_memo_text(memo_text)
+            .set_memo_text(memo_text.async_render())
         )
 
     hass.services.async_register(
@@ -135,7 +135,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                 vol.Required(CONF_ADDRESS): vol.All(
                     vol.Coerce(int), vol.Range(min=0, max=255)
                 ),
-                vol.Optional(CONF_MEMO_TEXT, default=""): cv.string,
+                vol.Optional(CONF_MEMO_TEXT, default=""): cv.template,
             }
         ),
     )
diff --git a/homeassistant/components/velbus/manifest.json b/homeassistant/components/velbus/manifest.json
index 5443afeef77..c1cf2951bbd 100644
--- a/homeassistant/components/velbus/manifest.json
+++ b/homeassistant/components/velbus/manifest.json
@@ -13,7 +13,7 @@
     "velbus-packet",
     "velbus-protocol"
   ],
-  "requirements": ["velbus-aio==2024.10.0"],
+  "requirements": ["velbus-aio==2024.7.6"],
   "usb": [
     {
       "vid": "10CF",
diff --git a/homeassistant/components/vera/config_flow.py b/homeassistant/components/vera/config_flow.py
index f2b182cc270..08e7640773b 100644
--- a/homeassistant/components/vera/config_flow.py
+++ b/homeassistant/components/vera/config_flow.py
@@ -76,6 +76,10 @@ def options_data(user_input: dict[str, str]) -> dict[str, list[int]]:
 class OptionsFlowHandler(OptionsFlow):
     """Options for the component."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Init object."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self,
         user_input: dict[str, str] | None = None,
@@ -100,7 +104,7 @@ class VeraFlowHandler(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
         """Get the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/verisure/alarm_control_panel.py b/homeassistant/components/verisure/alarm_control_panel.py
index 5f34b587163..fc7e7551145 100644
--- a/homeassistant/components/verisure/alarm_control_panel.py
+++ b/homeassistant/components/verisure/alarm_control_panel.py
@@ -7,10 +7,10 @@ import asyncio
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import STATE_ALARM_ARMING, STATE_ALARM_DISARMING
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -86,7 +86,7 @@ class VerisureAlarm(
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
-        self._attr_alarm_state = AlarmControlPanelState.DISARMING
+        self._attr_state = STATE_ALARM_DISARMING
         self.async_write_ha_state()
         await self._async_set_arm_state(
             "DISARMED", self.coordinator.verisure.disarm(code)
@@ -94,7 +94,7 @@ class VerisureAlarm(
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
-        self._attr_alarm_state = AlarmControlPanelState.ARMING
+        self._attr_state = STATE_ALARM_ARMING
         self.async_write_ha_state()
         await self._async_set_arm_state(
             "ARMED_HOME", self.coordinator.verisure.arm_home(code)
@@ -102,7 +102,7 @@ class VerisureAlarm(
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
-        self._attr_alarm_state = AlarmControlPanelState.ARMING
+        self._attr_state = STATE_ALARM_ARMING
         self.async_write_ha_state()
         await self._async_set_arm_state(
             "ARMED_AWAY", self.coordinator.verisure.arm_away(code)
@@ -111,7 +111,7 @@ class VerisureAlarm(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        self._attr_alarm_state = ALARM_STATE_TO_HA.get(
+        self._attr_state = ALARM_STATE_TO_HA.get(
             self.coordinator.data["alarm"]["statusType"]
         )
         self._attr_changed_by = self.coordinator.data["alarm"].get("name")
diff --git a/homeassistant/components/verisure/config_flow.py b/homeassistant/components/verisure/config_flow.py
index 0f1088ccb80..42ce7f9e9fe 100644
--- a/homeassistant/components/verisure/config_flow.py
+++ b/homeassistant/components/verisure/config_flow.py
@@ -43,11 +43,9 @@ class VerisureConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> VerisureOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> VerisureOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return VerisureOptionsFlowHandler()
+        return VerisureOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -292,6 +290,10 @@ class VerisureConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 class VerisureOptionsFlowHandler(OptionsFlow):
     """Handle Verisure options."""
 
+    def __init__(self, entry: ConfigEntry) -> None:
+        """Initialize Verisure options flow."""
+        self.entry = entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -308,7 +310,7 @@ class VerisureOptionsFlowHandler(OptionsFlow):
                     vol.Optional(
                         CONF_LOCK_CODE_DIGITS,
                         description={
-                            "suggested_value": self.config_entry.options.get(
+                            "suggested_value": self.entry.options.get(
                                 CONF_LOCK_CODE_DIGITS, DEFAULT_LOCK_CODE_DIGITS
                             )
                         },
diff --git a/homeassistant/components/verisure/const.py b/homeassistant/components/verisure/const.py
index 4afb93d957f..5b1aa1a0740 100644
--- a/homeassistant/components/verisure/const.py
+++ b/homeassistant/components/verisure/const.py
@@ -3,7 +3,12 @@
 from datetime import timedelta
 import logging
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+)
 
 DOMAIN = "verisure"
 
@@ -38,8 +43,8 @@ DEVICE_TYPE_NAME = {
 }
 
 ALARM_STATE_TO_HA = {
-    "DISARMED": AlarmControlPanelState.DISARMED,
-    "ARMED_HOME": AlarmControlPanelState.ARMED_HOME,
-    "ARMED_AWAY": AlarmControlPanelState.ARMED_AWAY,
-    "PENDING": AlarmControlPanelState.PENDING,
+    "DISARMED": STATE_ALARM_DISARMED,
+    "ARMED_HOME": STATE_ALARM_ARMED_HOME,
+    "ARMED_AWAY": STATE_ALARM_ARMED_AWAY,
+    "PENDING": STATE_ALARM_PENDING,
 }
diff --git a/homeassistant/components/vesync/const.py b/homeassistant/components/vesync/const.py
index 48215819ce5..50dce95e42a 100644
--- a/homeassistant/components/vesync/const.py
+++ b/homeassistant/components/vesync/const.py
@@ -56,7 +56,6 @@ SKU_TO_BASE_DEVICE = {
     "LAP-V201S-WEU": "Vital200S",  # Alt ID Model Vital200S
     "LAP-V201S-WUS": "Vital200S",  # Alt ID Model Vital200S
     "LAP-V201-AUSR": "Vital200S",  # Alt ID Model Vital200S
-    "LAP-V201S-AUSR": "Vital200S",  # Alt ID Model Vital200S
     "Vital100S": "Vital100S",
     "LAP-V102S-WUS": "Vital100S",  # Alt ID Model Vital100S
     "LAP-V102S-AASR": "Vital100S",  # Alt ID Model Vital100S
diff --git a/homeassistant/components/vesync/fan.py b/homeassistant/components/vesync/fan.py
index 098a17e90f0..58a262e769f 100644
--- a/homeassistant/components/vesync/fan.py
+++ b/homeassistant/components/vesync/fan.py
@@ -94,7 +94,6 @@ class VeSyncFanHA(VeSyncDevice, FanEntity):
         | FanEntityFeature.TURN_ON
     )
     _attr_name = None
-    _attr_translation_key = "vesync"
     _enable_turn_on_off_backwards_compatibility = False
 
     def __init__(self, fan) -> None:
diff --git a/homeassistant/components/vesync/icons.json b/homeassistant/components/vesync/icons.json
index e4769acc9a5..cfdefb2ed09 100644
--- a/homeassistant/components/vesync/icons.json
+++ b/homeassistant/components/vesync/icons.json
@@ -1,20 +1,4 @@
 {
-  "entity": {
-    "fan": {
-      "vesync": {
-        "state_attributes": {
-          "preset_mode": {
-            "state": {
-              "auto": "mdi:fan-auto",
-              "sleep": "mdi:sleep",
-              "pet": "mdi:paw",
-              "turbo": "mdi:weather-tornado"
-            }
-          }
-        }
-      }
-    }
-  },
   "services": {
     "update_devices": {
       "service": "mdi:update"
diff --git a/homeassistant/components/vesync/strings.json b/homeassistant/components/vesync/strings.json
index b6e4e2fd957..5ff0aa58722 100644
--- a/homeassistant/components/vesync/strings.json
+++ b/homeassistant/components/vesync/strings.json
@@ -42,20 +42,6 @@
       "current_voltage": {
         "name": "Current voltage"
       }
-    },
-    "fan": {
-      "vesync": {
-        "state_attributes": {
-          "preset_mode": {
-            "state": {
-              "auto": "Auto",
-              "sleep": "Sleep",
-              "pet": "Pet",
-              "turbo": "Turbo"
-            }
-          }
-        }
-      }
     }
   },
   "services": {
diff --git a/homeassistant/components/vicare/manifest.json b/homeassistant/components/vicare/manifest.json
index 8ce996ab81d..869a1ef80d8 100644
--- a/homeassistant/components/vicare/manifest.json
+++ b/homeassistant/components/vicare/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/vicare",
   "iot_class": "cloud_polling",
   "loggers": ["PyViCare"],
-  "requirements": ["PyViCare==2.35.0"]
+  "requirements": ["PyViCare==2.34.0"]
 }
diff --git a/homeassistant/components/vicare/number.py b/homeassistant/components/vicare/number.py
index f9af9636941..529caca6a87 100644
--- a/homeassistant/components/vicare/number.py
+++ b/homeassistant/components/vicare/number.py
@@ -265,72 +265,6 @@ CIRCUIT_ENTITY_DESCRIPTIONS: tuple[ViCareNumberEntityDescription, ...] = (
             HeatingProgram.COMFORT_HEATING
         ),
     ),
-    ViCareNumberEntityDescription(
-        key="normal_cooling_temperature",
-        translation_key="normal_cooling_temperature",
-        entity_category=EntityCategory.CONFIG,
-        device_class=NumberDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.NORMAL_COOLING
-        ),
-        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.NORMAL_COOLING, value
-        ),
-        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.NORMAL_COOLING
-        ),
-        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.NORMAL_COOLING
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(
-            HeatingProgram.NORMAL_COOLING
-        ),
-    ),
-    ViCareNumberEntityDescription(
-        key="reduced_cooling_temperature",
-        translation_key="reduced_cooling_temperature",
-        entity_category=EntityCategory.CONFIG,
-        device_class=NumberDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.REDUCED_COOLING
-        ),
-        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.REDUCED_COOLING, value
-        ),
-        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.REDUCED_COOLING
-        ),
-        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.REDUCED_COOLING
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(
-            HeatingProgram.REDUCED_COOLING
-        ),
-    ),
-    ViCareNumberEntityDescription(
-        key="comfort_cooling_temperature",
-        translation_key="comfort_cooling_temperature",
-        entity_category=EntityCategory.CONFIG,
-        device_class=NumberDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.COMFORT_COOLING
-        ),
-        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.COMFORT_COOLING, value
-        ),
-        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.COMFORT_COOLING
-        ),
-        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.COMFORT_COOLING
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(
-            HeatingProgram.COMFORT_COOLING
-        ),
-    ),
 )
 
 
diff --git a/homeassistant/components/vicare/sensor.py b/homeassistant/components/vicare/sensor.py
index 57b7c0bec9a..bedb161edcb 100644
--- a/homeassistant/components/vicare/sensor.py
+++ b/homeassistant/components/vicare/sensor.py
@@ -430,32 +430,6 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
     ),
-    ViCareSensorEntityDescription(
-        key="energy_consumption_cooling_today",
-        translation_key="energy_consumption_cooling_today",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        value_getter=lambda api: api.getPowerConsumptionCoolingToday(),
-        unit_getter=lambda api: api.getPowerConsumptionCoolingUnit(),
-        state_class=SensorStateClass.TOTAL_INCREASING,
-    ),
-    ViCareSensorEntityDescription(
-        key="energy_consumption_cooling_this_month",
-        translation_key="energy_consumption_cooling_this_month",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        value_getter=lambda api: api.getPowerConsumptionCoolingThisMonth(),
-        unit_getter=lambda api: api.getPowerConsumptionCoolingUnit(),
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        entity_registry_enabled_default=False,
-    ),
-    ViCareSensorEntityDescription(
-        key="energy_consumption_cooling_this_year",
-        translation_key="energy_consumption_cooling_this_year",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        value_getter=lambda api: api.getPowerConsumptionCoolingThisYear(),
-        unit_getter=lambda api: api.getPowerConsumptionCoolingUnit(),
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        entity_registry_enabled_default=False,
-    ),
     ViCareSensorEntityDescription(
         key="energy_dhw_summary_consumption_heating_currentday",
         translation_key="energy_dhw_summary_consumption_heating_currentday",
diff --git a/homeassistant/components/vicare/strings.json b/homeassistant/components/vicare/strings.json
index 77e570da779..8c8ee43e898 100644
--- a/homeassistant/components/vicare/strings.json
+++ b/homeassistant/components/vicare/strings.json
@@ -97,22 +97,13 @@
         "name": "Comfort temperature"
       },
       "normal_heating_temperature": {
-        "name": "Normal heating temperature"
+        "name": "[%key:component::vicare::entity::number::normal_temperature::name%]"
       },
       "reduced_heating_temperature": {
-        "name": "Reduced heating temperature"
+        "name": "[%key:component::vicare::entity::number::reduced_temperature::name%]"
       },
       "comfort_heating_temperature": {
-        "name": "Comfort heating temperature"
-      },
-      "normal_cooling_temperature": {
-        "name": "Normal cooling temperature"
-      },
-      "reduced_cooling_temperature": {
-        "name": "Reduced cooling temperature"
-      },
-      "comfort_cooling_temperature": {
-        "name": "Comfort cooling temperature"
+        "name": "[%key:component::vicare::entity::number::comfort_temperature::name%]"
       },
       "dhw_temperature": {
         "name": "DHW temperature"
@@ -254,15 +245,6 @@
       "energy_summary_consumption_heating_lastsevendays": {
         "name": "Heating electricity consumption last seven days"
       },
-      "energy_consumption_cooling_today": {
-        "name": "Cooling electricity consumption today"
-      },
-      "energy_consumption_cooling_this_month": {
-        "name": "Cooling electricity consumption this month"
-      },
-      "energy_consumption_cooling_this_year": {
-        "name": "Cooling electricity consumption this year"
-      },
       "energy_dhw_summary_consumption_heating_currentday": {
         "name": "DHW electricity consumption today"
       },
diff --git a/homeassistant/components/vicare/types.py b/homeassistant/components/vicare/types.py
index 98d1c0566ce..dc105a86aa9 100644
--- a/homeassistant/components/vicare/types.py
+++ b/homeassistant/components/vicare/types.py
@@ -25,14 +25,11 @@ class HeatingProgram(enum.StrEnum):
 
     COMFORT = "comfort"
     COMFORT_HEATING = "comfortHeating"
-    COMFORT_COOLING = "comfortCooling"
     ECO = "eco"
     NORMAL = "normal"
     NORMAL_HEATING = "normalHeating"
-    NORMAL_COOLING = "normalCooling"
     REDUCED = "reduced"
     REDUCED_HEATING = "reducedHeating"
-    REDUCED_COOLING = "reducedCooling"
     STANDBY = "standby"
 
     @staticmethod
diff --git a/homeassistant/components/vizio/config_flow.py b/homeassistant/components/vizio/config_flow.py
index 49f6a709565..c8f1aaa21cb 100644
--- a/homeassistant/components/vizio/config_flow.py
+++ b/homeassistant/components/vizio/config_flow.py
@@ -108,6 +108,10 @@ def _host_is_same(host1: str, host2: str) -> bool:
 class VizioOptionsConfigFlow(OptionsFlow):
     """Handle Vizio options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize vizio options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -180,7 +184,7 @@ class VizioConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> VizioOptionsConfigFlow:
         """Get the options flow for this handler."""
-        return VizioOptionsConfigFlow()
+        return VizioOptionsConfigFlow(config_entry)
 
     def __init__(self) -> None:
         """Initialize config flow."""
diff --git a/homeassistant/components/vizio/coordinator.py b/homeassistant/components/vizio/coordinator.py
index a7ca7d7f9ed..1930828b595 100644
--- a/homeassistant/components/vizio/coordinator.py
+++ b/homeassistant/components/vizio/coordinator.py
@@ -34,9 +34,10 @@ class VizioAppsDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]
         self.fail_threshold = 10
         self.store = store
 
-    async def _async_setup(self) -> None:
+    async def async_config_entry_first_refresh(self) -> None:
         """Refresh data for the first time when a config entry is setup."""
         self.data = await self.store.async_load() or APPS
+        await super().async_config_entry_first_refresh()
 
     async def _async_update_data(self) -> list[dict[str, Any]]:
         """Update data via library."""
diff --git a/homeassistant/components/vlc_telnet/config_flow.py b/homeassistant/components/vlc_telnet/config_flow.py
index 08564937959..f434024b189 100644
--- a/homeassistant/components/vlc_telnet/config_flow.py
+++ b/homeassistant/components/vlc_telnet/config_flow.py
@@ -10,11 +10,11 @@ from aiovlc.client import Client
 from aiovlc.exceptions import AuthError, ConnectError
 import voluptuous as vol
 
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .const import DEFAULT_PORT, DOMAIN
 
diff --git a/homeassistant/components/vodafone_station/config_flow.py b/homeassistant/components/vodafone_station/config_flow.py
index 7a80244f8d6..c373520bc58 100644
--- a/homeassistant/components/vodafone_station/config_flow.py
+++ b/homeassistant/components/vodafone_station/config_flow.py
@@ -17,6 +17,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant, callback
@@ -62,11 +63,9 @@ class VodafoneStationConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> VodafoneStationOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return VodafoneStationOptionsFlowHandler()
+        return VodafoneStationOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -144,7 +143,7 @@ class VodafoneStationConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class VodafoneStationOptionsFlowHandler(OptionsFlow):
+class VodafoneStationOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle a option flow."""
 
     async def async_step_init(
@@ -159,7 +158,7 @@ class VodafoneStationOptionsFlowHandler(OptionsFlow):
             {
                 vol.Optional(
                     CONF_CONSIDER_HOME,
-                    default=self.config_entry.options.get(
+                    default=self.options.get(
                         CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME.total_seconds()
                     ),
                 ): vol.All(vol.Coerce(int), vol.Clamp(min=0, max=900))
diff --git a/homeassistant/components/vodafone_station/manifest.json b/homeassistant/components/vodafone_station/manifest.json
index 29cb3c070ab..47137fff26c 100644
--- a/homeassistant/components/vodafone_station/manifest.json
+++ b/homeassistant/components/vodafone_station/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["aiovodafone"],
   "quality_scale": "silver",
-  "requirements": ["aiovodafone==0.6.1"]
+  "requirements": ["aiovodafone==0.6.0"]
 }
diff --git a/homeassistant/components/vodafone_station/sensor.py b/homeassistant/components/vodafone_station/sensor.py
index 307fcaf0ea8..2a08a9b2ebe 100644
--- a/homeassistant/components/vodafone_station/sensor.py
+++ b/homeassistant/components/vodafone_station/sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Final
+from typing import Any, Final
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -16,49 +16,32 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfDataRate
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import _LOGGER, DOMAIN, LINE_TYPES
 from .coordinator import VodafoneStationRouter
 
 NOT_AVAILABLE: list = ["", "N/A", "0.0.0.0"]
-UPTIME_DEVIATION = 60
 
 
 @dataclass(frozen=True, kw_only=True)
 class VodafoneStationEntityDescription(SensorEntityDescription):
     """Vodafone Station entity description."""
 
-    value: Callable[
-        [VodafoneStationRouter, str | datetime | float | None, str],
-        str | datetime | float | None,
-    ] = lambda coordinator, last_value, key: coordinator.data.sensors[key]
+    value: Callable[[Any, Any], Any] = (
+        lambda coordinator, key: coordinator.data.sensors[key]
+    )
     is_suitable: Callable[[dict], bool] = lambda val: True
 
 
-def _calculate_uptime(
-    coordinator: VodafoneStationRouter,
-    last_value: str | datetime | float | None,
-    key: str,
-) -> datetime:
+def _calculate_uptime(coordinator: VodafoneStationRouter, key: str) -> datetime:
     """Calculate device uptime."""
 
-    delta_uptime = coordinator.api.convert_uptime(coordinator.data.sensors[key])
-
-    if (
-        not isinstance(last_value, datetime)
-        or abs((delta_uptime - last_value).total_seconds()) > UPTIME_DEVIATION
-    ):
-        return delta_uptime
-
-    return last_value
+    return coordinator.api.convert_uptime(coordinator.data.sensors[key])
 
 
-def _line_connection(
-    coordinator: VodafoneStationRouter,
-    last_value: str | datetime | float | None,
-    key: str,
-) -> str | None:
+def _line_connection(coordinator: VodafoneStationRouter, key: str) -> str | None:
     """Identify line type."""
 
     value = coordinator.data.sensors
@@ -143,18 +126,14 @@ SENSOR_TYPES: Final = (
         translation_key="sys_cpu_usage",
         native_unit_of_measurement=PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
-        value=lambda coordinator, last_value, key: float(
-            coordinator.data.sensors[key][:-1]
-        ),
+        value=lambda coordinator, key: float(coordinator.data.sensors[key][:-1]),
     ),
     VodafoneStationEntityDescription(
         key="sys_memory_usage",
         translation_key="sys_memory_usage",
         native_unit_of_measurement=PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
-        value=lambda coordinator, last_value, key: float(
-            coordinator.data.sensors[key][:-1]
-        ),
+        value=lambda coordinator, key: float(coordinator.data.sensors[key][:-1]),
     ),
     VodafoneStationEntityDescription(
         key="sys_reboot_cause",
@@ -199,12 +178,10 @@ class VodafoneStationSensorEntity(
         self.entity_description = description
         self._attr_device_info = coordinator.device_info
         self._attr_unique_id = f"{coordinator.serial_number}_{description.key}"
-        self._old_state: str | datetime | float | None = None
 
     @property
-    def native_value(self) -> str | datetime | float | None:
+    def native_value(self) -> StateType:
         """Sensor value."""
-        self._old_state = self.entity_description.value(
-            self.coordinator, self._old_state, self.entity_description.key
+        return self.entity_description.value(
+            self.coordinator, self.entity_description.key
         )
-        return self._old_state
diff --git a/homeassistant/components/voip/assist_satellite.py b/homeassistant/components/voip/assist_satellite.py
index 0100435d6dc..5e32585775c 100644
--- a/homeassistant/components/voip/assist_satellite.py
+++ b/homeassistant/components/voip/assist_satellite.py
@@ -21,6 +21,7 @@ from homeassistant.components.assist_satellite import (
     AssistSatelliteEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -79,6 +80,7 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
 
     entity_description = AssistSatelliteEntityDescription(key="assist_satellite")
     _attr_translation_key = "assist_satellite"
+    _attr_entity_category = EntityCategory.CONFIG
     _attr_name = None
 
     def __init__(
diff --git a/homeassistant/components/voip/config_flow.py b/homeassistant/components/voip/config_flow.py
index 63dcb8f86ee..821c7f29a1e 100644
--- a/homeassistant/components/voip/config_flow.py
+++ b/homeassistant/components/voip/config_flow.py
@@ -47,12 +47,16 @@ class VoIPConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Create the options flow."""
-        return VoipOptionsFlowHandler()
+        return VoipOptionsFlowHandler(config_entry)
 
 
 class VoipOptionsFlowHandler(OptionsFlow):
     """Handle VoIP options."""
 
+    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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/wallbox/__init__.py b/homeassistant/components/wallbox/__init__.py
index b2f8ac7fd5d..4ea2cf98be1 100644
--- a/homeassistant/components/wallbox/__init__.py
+++ b/homeassistant/components/wallbox/__init__.py
@@ -10,7 +10,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 
 from .const import CONF_STATION, DOMAIN, UPDATE_INTERVAL
-from .coordinator import InvalidAuth, WallboxCoordinator, async_validate_input
+from .coordinator import InvalidAuth, WallboxCoordinator
 
 PLATFORMS = [Platform.LOCK, Platform.NUMBER, Platform.SENSOR, Platform.SWITCH]
 
@@ -22,16 +22,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         entry.data[CONF_PASSWORD],
         jwtTokenDrift=UPDATE_INTERVAL,
     )
-    try:
-        await async_validate_input(hass, wallbox)
-    except InvalidAuth as ex:
-        raise ConfigEntryAuthFailed from ex
-
     wallbox_coordinator = WallboxCoordinator(
         entry.data[CONF_STATION],
         wallbox,
         hass,
     )
+
+    try:
+        await wallbox_coordinator.async_validate_input()
+
+    except InvalidAuth as ex:
+        raise ConfigEntryAuthFailed from ex
+
     await wallbox_coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = wallbox_coordinator
diff --git a/homeassistant/components/wallbox/config_flow.py b/homeassistant/components/wallbox/config_flow.py
index bdc51eef963..0969de432f0 100644
--- a/homeassistant/components/wallbox/config_flow.py
+++ b/homeassistant/components/wallbox/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_STATION, DOMAIN
-from .coordinator import InvalidAuth, async_validate_input
+from .coordinator import InvalidAuth, WallboxCoordinator
 
 COMPONENT_DOMAIN = DOMAIN
 
@@ -32,8 +32,9 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
     wallbox = Wallbox(data["username"], data["password"])
+    wallbox_coordinator = WallboxCoordinator(data["station"], wallbox, hass)
 
-    await async_validate_input(hass, wallbox)
+    await wallbox_coordinator.async_validate_input()
 
     # Return info that you want to store in the config entry.
     return {"title": "Wallbox Portal"}
diff --git a/homeassistant/components/wallbox/coordinator.py b/homeassistant/components/wallbox/coordinator.py
index 99c565d9c0c..f3679551bc4 100644
--- a/homeassistant/components/wallbox/coordinator.py
+++ b/homeassistant/components/wallbox/coordinator.py
@@ -89,21 +89,6 @@ def _require_authentication[_WallboxCoordinatorT: WallboxCoordinator, **_P](
     return require_authentication
 
 
-def _validate(wallbox: Wallbox) -> None:
-    """Authenticate using Wallbox API."""
-    try:
-        wallbox.authenticate()
-    except requests.exceptions.HTTPError as wallbox_connection_error:
-        if wallbox_connection_error.response.status_code == 403:
-            raise InvalidAuth from wallbox_connection_error
-        raise ConnectionError from wallbox_connection_error
-
-
-async def async_validate_input(hass: HomeAssistant, wallbox: Wallbox) -> None:
-    """Get new sensor data for Wallbox component."""
-    await hass.async_add_executor_job(_validate, wallbox)
-
-
 class WallboxCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Wallbox Coordinator class."""
 
@@ -123,6 +108,19 @@ class WallboxCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         """Authenticate using Wallbox API."""
         self._wallbox.authenticate()
 
+    def _validate(self) -> None:
+        """Authenticate using Wallbox API."""
+        try:
+            self._wallbox.authenticate()
+        except requests.exceptions.HTTPError as wallbox_connection_error:
+            if wallbox_connection_error.response.status_code == 403:
+                raise InvalidAuth from wallbox_connection_error
+            raise ConnectionError from wallbox_connection_error
+
+    async def async_validate_input(self) -> None:
+        """Get new sensor data for Wallbox component."""
+        await self.hass.async_add_executor_job(self._validate)
+
     @_require_authentication
     def _get_data(self) -> dict[str, Any]:
         """Get new sensor data for Wallbox component."""
diff --git a/homeassistant/components/water_heater/strings.json b/homeassistant/components/water_heater/strings.json
index 07e132a0b5b..741b277d84d 100644
--- a/homeassistant/components/water_heater/strings.json
+++ b/homeassistant/components/water_heater/strings.json
@@ -1,5 +1,4 @@
 {
-  "title": "Water heater",
   "device_automation": {
     "action_type": {
       "turn_on": "[%key:common::device_automation::action_type::turn_on%]",
@@ -8,7 +7,7 @@
   },
   "entity_component": {
     "_": {
-      "name": "[%key:component::water_heater::title%]",
+      "name": "Water heater",
       "state": {
         "off": "[%key:common::state::off%]",
         "eco": "Eco",
diff --git a/homeassistant/components/watttime/__init__.py b/homeassistant/components/watttime/__init__.py
index ed2bdd4ebac..6b32cf723a3 100644
--- a/homeassistant/components/watttime/__init__.py
+++ b/homeassistant/components/watttime/__init__.py
@@ -58,7 +58,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name=entry.title,
         update_interval=DEFAULT_UPDATE_INTERVAL,
         update_method=async_update_data,
diff --git a/homeassistant/components/watttime/config_flow.py b/homeassistant/components/watttime/config_flow.py
index ad676e166c5..db68738b302 100644
--- a/homeassistant/components/watttime/config_flow.py
+++ b/homeassistant/components/watttime/config_flow.py
@@ -126,11 +126,9 @@ class WattTimeConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> WattTimeOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Define the config flow to handle options."""
-        return WattTimeOptionsFlowHandler()
+        return WattTimeOptionsFlowHandler(config_entry)
 
     async def async_step_coordinates(
         self, user_input: dict[str, Any] | None = None
@@ -243,6 +241,10 @@ class WattTimeConfigFlow(ConfigFlow, domain=DOMAIN):
 class WattTimeOptionsFlowHandler(OptionsFlow):
     """Handle a WattTime options flow."""
 
+    def __init__(self, entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.entry = entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -256,7 +258,7 @@ class WattTimeOptionsFlowHandler(OptionsFlow):
                 {
                     vol.Required(
                         CONF_SHOW_ON_MAP,
-                        default=self.config_entry.options.get(CONF_SHOW_ON_MAP, True),
+                        default=self.entry.options.get(CONF_SHOW_ON_MAP, True),
                     ): bool
                 }
             ),
diff --git a/homeassistant/components/waze_travel_time/config_flow.py b/homeassistant/components/waze_travel_time/config_flow.py
index 6ab6a4b121c..1d75adc6c29 100644
--- a/homeassistant/components/waze_travel_time/config_flow.py
+++ b/homeassistant/components/waze_travel_time/config_flow.py
@@ -113,6 +113,10 @@ def default_options(hass: HomeAssistant) -> dict[str, str | bool | list[str]]:
 class WazeOptionsFlow(OptionsFlow):
     """Handle an options flow for Waze Travel Time."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize waze options flow."""
+        self.config_entry = config_entry
+
     async def async_step_init(self, user_input=None) -> ConfigFlowResult:
         """Handle the initial step."""
         if user_input is not None:
@@ -144,7 +148,7 @@ class WazeConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> WazeOptionsFlow:
         """Get the options flow for this handler."""
-        return WazeOptionsFlow()
+        return WazeOptionsFlow(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/weatherkit/manifest.json b/homeassistant/components/weatherkit/manifest.json
index f86745f330f..a6dd40d5993 100644
--- a/homeassistant/components/weatherkit/manifest.json
+++ b/homeassistant/components/weatherkit/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/weatherkit",
   "iot_class": "cloud_polling",
-  "requirements": ["apple_weatherkit==1.1.3"]
+  "requirements": ["apple_weatherkit==1.1.2"]
 }
diff --git a/homeassistant/components/webostv/config_flow.py b/homeassistant/components/webostv/config_flow.py
index 45395bd282a..24bf89b24a6 100644
--- a/homeassistant/components/webostv/config_flow.py
+++ b/homeassistant/components/webostv/config_flow.py
@@ -170,6 +170,8 @@ class OptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
+        self.config_entry = config_entry
+        self.options = config_entry.options
         self.host = config_entry.data[CONF_HOST]
         self.key = config_entry.data[CONF_CLIENT_SECRET]
 
@@ -186,8 +188,7 @@ class OptionsFlowHandler(OptionsFlow):
         if not sources_list:
             errors["base"] = "cannot_retrieve"
 
-        option_sources = self.config_entry.options.get(CONF_SOURCES, [])
-        sources = [s for s in option_sources if s in sources_list]
+        sources = [s for s in self.options.get(CONF_SOURCES, []) if s in sources_list]
         if not sources:
             sources = sources_list
 
diff --git a/homeassistant/components/websocket_api/connection.py b/homeassistant/components/websocket_api/connection.py
index 62f1adc39b9..6c0c6f0c587 100644
--- a/homeassistant/components/websocket_api/connection.py
+++ b/homeassistant/components/websocket_api/connection.py
@@ -16,12 +16,6 @@ from homeassistant.helpers.http import current_request
 from homeassistant.util.json import JsonValueType
 
 from . import const, messages
-from .messages import (
-    error_message,
-    event_message,
-    message_to_json_bytes,
-    result_message,
-)
 from .util import describe_request
 
 if TYPE_CHECKING:
@@ -132,12 +126,12 @@ class ActiveConnection:
     @callback
     def send_result(self, msg_id: int, result: Any | None = None) -> None:
         """Send a result message."""
-        self.send_message(message_to_json_bytes(result_message(msg_id, result)))
+        self.send_message(messages.result_message(msg_id, result))
 
     @callback
     def send_event(self, msg_id: int, event: Any | None = None) -> None:
         """Send a event message."""
-        self.send_message(message_to_json_bytes(event_message(msg_id, event)))
+        self.send_message(messages.event_message(msg_id, event))
 
     @callback
     def send_error(
@@ -151,15 +145,13 @@ class ActiveConnection:
     ) -> None:
         """Send an error message."""
         self.send_message(
-            message_to_json_bytes(
-                error_message(
-                    msg_id,
-                    code,
-                    message,
-                    translation_key=translation_key,
-                    translation_domain=translation_domain,
-                    translation_placeholders=translation_placeholders,
-                )
+            messages.error_message(
+                msg_id,
+                code,
+                message,
+                translation_key=translation_key,
+                translation_domain=translation_domain,
+                translation_placeholders=translation_placeholders,
             )
         )
 
diff --git a/homeassistant/components/websocket_api/http.py b/homeassistant/components/websocket_api/http.py
index e7d57aebab6..29dc6113350 100644
--- a/homeassistant/components/websocket_api/http.py
+++ b/homeassistant/components/websocket_api/http.py
@@ -36,8 +36,6 @@ from .error import Disconnect
 from .messages import message_to_json_bytes
 from .util import describe_request
 
-CLOSE_MSG_TYPES = {WSMsgType.CLOSE, WSMsgType.CLOSED, WSMsgType.CLOSING}
-
 if TYPE_CHECKING:
     from .connection import ActiveConnection
 
@@ -330,7 +328,13 @@ class WebSocketHandler:
         if TYPE_CHECKING:
             assert writer is not None
 
-        send_bytes_text = partial(writer.send_frame, opcode=WSMsgType.TEXT)
+        # aiohttp 3.11.0 changed the method name from _send_frame to send_frame
+        if hasattr(writer, "send_frame"):
+            send_frame = writer.send_frame  # pragma: no cover
+        else:
+            send_frame = writer._send_frame  # noqa: SLF001
+
+        send_bytes_text = partial(send_frame, opcode=WSMsgType.TEXT)
         auth = AuthPhase(
             logger, hass, self._send_message, self._cancel, request, send_bytes_text
         )
@@ -340,7 +344,7 @@ class WebSocketHandler:
         try:
             connection = await self._async_handle_auth_phase(auth, send_bytes_text)
             self._async_increase_writer_limit(writer)
-            await self._async_websocket_command_phase(connection)
+            await self._async_websocket_command_phase(connection, send_bytes_text)
         except asyncio.CancelledError:
             logger.debug("%s: Connection cancelled", self.description)
             raise
@@ -450,7 +454,9 @@ class WebSocketHandler:
         writer._limit = 2**20  # noqa: SLF001
 
     async def _async_websocket_command_phase(
-        self, connection: ActiveConnection
+        self,
+        connection: ActiveConnection,
+        send_bytes_text: Callable[[bytes], Coroutine[Any, Any, None]],
     ) -> None:
         """Handle the command phase of the websocket connection."""
         wsock = self._wsock
@@ -461,26 +467,24 @@ class WebSocketHandler:
         # Command phase
         while not wsock.closed:
             msg = await wsock.receive()
-            msg_type = msg.type
-            msg_data = msg.data
 
-            if msg_type in CLOSE_MSG_TYPES:
+            if msg.type in (WSMsgType.CLOSE, WSMsgType.CLOSED, WSMsgType.CLOSING):
                 break
 
-            if msg_type is WSMsgType.BINARY:
-                if len(msg_data) < 1:
+            if msg.type is WSMsgType.BINARY:
+                if len(msg.data) < 1:
                     raise Disconnect("Received invalid binary message.")
 
-                handler = msg_data[0]
-                payload = msg_data[1:]
+                handler = msg.data[0]
+                payload = msg.data[1:]
                 async_handle_binary(handler, payload)
                 continue
 
-            if msg_type is not WSMsgType.TEXT:
+            if msg.type is not WSMsgType.TEXT:
                 raise Disconnect("Received non-Text message.")
 
             try:
-                command_msg_data = json_loads(msg_data)
+                command_msg_data = json_loads(msg.data)
             except ValueError as ex:
                 raise Disconnect("Received invalid JSON.") from ex
 
diff --git a/homeassistant/components/weheat/manifest.json b/homeassistant/components/weheat/manifest.json
index ef89a2f1acb..d32e0ce4047 100644
--- a/homeassistant/components/weheat/manifest.json
+++ b/homeassistant/components/weheat/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/weheat",
   "iot_class": "cloud_polling",
-  "requirements": ["weheat==2024.11.02"]
+  "requirements": ["weheat==2024.09.23"]
 }
diff --git a/homeassistant/components/wemo/config_flow.py b/homeassistant/components/wemo/config_flow.py
index 361c58953c5..10a9bf5604b 100644
--- a/homeassistant/components/wemo/config_flow.py
+++ b/homeassistant/components/wemo/config_flow.py
@@ -32,12 +32,16 @@ class WemoFlow(DiscoveryFlowHandler, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return WemoOptionsFlow()
+        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
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/whois/__init__.py b/homeassistant/components/whois/__init__.py
index 07116825f29..b9f5938d93b 100644
--- a/homeassistant/components/whois/__init__.py
+++ b/homeassistant/components/whois/__init__.py
@@ -35,7 +35,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator: DataUpdateCoordinator[Domain | None] = DataUpdateCoordinator(
         hass,
         LOGGER,
-        config_entry=entry,
         name=f"{DOMAIN}_APK",
         update_interval=SCAN_INTERVAL,
         update_method=_async_query_domain,
diff --git a/homeassistant/components/wiffi/config_flow.py b/homeassistant/components/wiffi/config_flow.py
index 308923597cd..3fcbef395e6 100644
--- a/homeassistant/components/wiffi/config_flow.py
+++ b/homeassistant/components/wiffi/config_flow.py
@@ -34,7 +34,7 @@ class WiffiFlowHandler(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Create Wiffi server setup option flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -79,6 +79,10 @@ class WiffiFlowHandler(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Wiffi server setup option flow."""
 
+    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, int] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/withings/manifest.json b/homeassistant/components/withings/manifest.json
index f9e8328ae53..e0d85f207a3 100644
--- a/homeassistant/components/withings/manifest.json
+++ b/homeassistant/components/withings/manifest.json
@@ -9,5 +9,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aiowithings"],
   "quality_scale": "platinum",
-  "requirements": ["aiowithings==3.1.3"]
+  "requirements": ["aiowithings==3.1.0"]
 }
diff --git a/homeassistant/components/wiz/__init__.py b/homeassistant/components/wiz/__init__.py
index 0e986aaefa2..1bf3188e9e9 100644
--- a/homeassistant/components/wiz/__init__.py
+++ b/homeassistant/components/wiz/__init__.py
@@ -103,7 +103,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass=hass,
         logger=_LOGGER,
-        config_entry=entry,
         name=entry.title,
         update_interval=timedelta(seconds=15),
         update_method=_async_update,
diff --git a/homeassistant/components/wled/config_flow.py b/homeassistant/components/wled/config_flow.py
index 812a0500d1a..2798e0d46d1 100644
--- a/homeassistant/components/wled/config_flow.py
+++ b/homeassistant/components/wled/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_HOST, CONF_MAC
 from homeassistant.core import callback
@@ -30,11 +30,9 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> WLEDOptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> WLEDOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return WLEDOptionsFlowHandler()
+        return WLEDOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -119,7 +117,7 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
         return await wled.update()
 
 
-class WLEDOptionsFlowHandler(OptionsFlow):
+class WLEDOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle WLED options."""
 
     async def async_step_init(
@@ -135,7 +133,7 @@ class WLEDOptionsFlowHandler(OptionsFlow):
                 {
                     vol.Optional(
                         CONF_KEEP_MAIN_LIGHT,
-                        default=self.config_entry.options.get(
+                        default=self.options.get(
                             CONF_KEEP_MAIN_LIGHT, DEFAULT_KEEP_MAIN_LIGHT
                         ),
                     ): bool,
diff --git a/homeassistant/components/wled/coordinator.py b/homeassistant/components/wled/coordinator.py
index 8e2855e9f05..cb39fde5e5a 100644
--- a/homeassistant/components/wled/coordinator.py
+++ b/homeassistant/components/wled/coordinator.py
@@ -49,7 +49,6 @@ class WLEDDataUpdateCoordinator(DataUpdateCoordinator[WLEDDevice]):
         super().__init__(
             hass,
             LOGGER,
-            config_entry=entry,
             name=DOMAIN,
             update_interval=SCAN_INTERVAL,
         )
@@ -134,7 +133,6 @@ class WLEDReleasesDataUpdateCoordinator(DataUpdateCoordinator[Releases]):
         super().__init__(
             hass,
             LOGGER,
-            config_entry=None,
             name=DOMAIN,
             update_interval=RELEASES_SCAN_INTERVAL,
         )
diff --git a/homeassistant/components/wmspro/__init__.py b/homeassistant/components/wmspro/__init__.py
index 37bf1495a56..7d2cbf8a3a1 100644
--- a/homeassistant/components/wmspro/__init__.py
+++ b/homeassistant/components/wmspro/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.helpers.typing import UNDEFINED
 
 from .const import DOMAIN, MANUFACTURER
 
-PLATFORMS: list[Platform] = [Platform.COVER, Platform.LIGHT, Platform.SCENE]
+PLATFORMS: list[Platform] = [Platform.COVER, Platform.SCENE]
 
 type WebControlProConfigEntry = ConfigEntry[WebControlPro]
 
diff --git a/homeassistant/components/wmspro/config_flow.py b/homeassistant/components/wmspro/config_flow.py
index 2ce58ec9eca..c28cf5efce3 100644
--- a/homeassistant/components/wmspro/config_flow.py
+++ b/homeassistant/components/wmspro/config_flow.py
@@ -84,15 +84,6 @@ class WebControlProConfigFlow(ConfigFlow, domain=DOMAIN):
                 if not pong:
                     errors["base"] = "cannot_connect"
                 else:
-                    await hub.refresh()
-                    rooms = set(hub.rooms.keys())
-                    for entry in self.hass.config_entries.async_loaded_entries(DOMAIN):
-                        if (
-                            entry.runtime_data
-                            and entry.runtime_data.rooms
-                            and set(entry.runtime_data.rooms.keys()) == rooms
-                        ):
-                            return self.async_abort(reason="already_configured")
                     return self.async_create_entry(title=host, data=user_input)
 
         if self.source == dhcp.DOMAIN:
diff --git a/homeassistant/components/wmspro/const.py b/homeassistant/components/wmspro/const.py
index d92534d9e46..0a1036cf632 100644
--- a/homeassistant/components/wmspro/const.py
+++ b/homeassistant/components/wmspro/const.py
@@ -5,5 +5,3 @@ SUGGESTED_HOST = "webcontrol"
 
 ATTRIBUTION = "Data provided by WMS WebControl pro API"
 MANUFACTURER = "WAREMA Renkhoff SE"
-
-BRIGHTNESS_SCALE = (1, 100)
diff --git a/homeassistant/components/wmspro/cover.py b/homeassistant/components/wmspro/cover.py
index a36b34642b7..b8540a5bf08 100644
--- a/homeassistant/components/wmspro/cover.py
+++ b/homeassistant/components/wmspro/cover.py
@@ -46,12 +46,12 @@ class WebControlProAwning(WebControlProGenericEntity, CoverEntity):
     def current_cover_position(self) -> int | None:
         """Return current position of cover."""
         action = self._dest.action(WMS_WebControl_pro_API_actionDescription.AwningDrive)
-        return 100 - action["percentage"]
+        return action["percentage"]
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
         action = self._dest.action(WMS_WebControl_pro_API_actionDescription.AwningDrive)
-        await action(percentage=100 - kwargs[ATTR_POSITION])
+        await action(percentage=kwargs[ATTR_POSITION])
 
     @property
     def is_closed(self) -> bool | None:
@@ -61,12 +61,12 @@ class WebControlProAwning(WebControlProGenericEntity, CoverEntity):
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
         action = self._dest.action(WMS_WebControl_pro_API_actionDescription.AwningDrive)
-        await action(percentage=0)
+        await action(percentage=100)
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close the cover."""
         action = self._dest.action(WMS_WebControl_pro_API_actionDescription.AwningDrive)
-        await action(percentage=100)
+        await action(percentage=0)
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the device if in motion."""
diff --git a/homeassistant/components/wmspro/light.py b/homeassistant/components/wmspro/light.py
deleted file mode 100644
index 9242982bcf9..00000000000
--- a/homeassistant/components/wmspro/light.py
+++ /dev/null
@@ -1,89 +0,0 @@
-"""Support for lights connected with WMS WebControl pro."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-from typing import Any
-
-from wmspro.const import WMS_WebControl_pro_API_actionDescription
-
-from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.color import brightness_to_value, value_to_brightness
-
-from . import WebControlProConfigEntry
-from .const import BRIGHTNESS_SCALE
-from .entity import WebControlProGenericEntity
-
-SCAN_INTERVAL = timedelta(seconds=5)
-PARALLEL_UPDATES = 1
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: WebControlProConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the WMS based lights from a config entry."""
-    hub = config_entry.runtime_data
-
-    entities: list[WebControlProGenericEntity] = []
-    for dest in hub.dests.values():
-        if dest.action(WMS_WebControl_pro_API_actionDescription.LightDimming):
-            entities.append(WebControlProDimmer(config_entry.entry_id, dest))
-        elif dest.action(WMS_WebControl_pro_API_actionDescription.LightSwitch):
-            entities.append(WebControlProLight(config_entry.entry_id, dest))
-
-    async_add_entities(entities)
-
-
-class WebControlProLight(WebControlProGenericEntity, LightEntity):
-    """Representation of a WMS based light."""
-
-    _attr_color_mode = ColorMode.ONOFF
-    _attr_supported_color_modes = {ColorMode.ONOFF}
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if light is on."""
-        action = self._dest.action(WMS_WebControl_pro_API_actionDescription.LightSwitch)
-        return action["onOffState"]
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the light on."""
-        action = self._dest.action(WMS_WebControl_pro_API_actionDescription.LightSwitch)
-        await action(onOffState=True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the light off."""
-        action = self._dest.action(WMS_WebControl_pro_API_actionDescription.LightSwitch)
-        await action(onOffState=False)
-
-
-class WebControlProDimmer(WebControlProLight):
-    """Representation of a WMS-based dimmable light."""
-
-    _attr_color_mode = ColorMode.BRIGHTNESS
-    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
-
-    @property
-    def brightness(self) -> int:
-        """Return the brightness of this light between 1..255."""
-        action = self._dest.action(
-            WMS_WebControl_pro_API_actionDescription.LightDimming
-        )
-        return value_to_brightness(BRIGHTNESS_SCALE, action["percentage"])
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the dimmer on."""
-        if ATTR_BRIGHTNESS not in kwargs:
-            await super().async_turn_on(**kwargs)
-            return
-
-        action = self._dest.action(
-            WMS_WebControl_pro_API_actionDescription.LightDimming
-        )
-        await action(
-            percentage=brightness_to_value(BRIGHTNESS_SCALE, kwargs[ATTR_BRIGHTNESS])
-        )
diff --git a/homeassistant/components/wolflink/__init__.py b/homeassistant/components/wolflink/__init__.py
index 49197ed7d26..b897debfede 100644
--- a/homeassistant/components/wolflink/__init__.py
+++ b/homeassistant/components/wolflink/__init__.py
@@ -100,7 +100,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=DOMAIN,
         update_method=async_update_data,
         update_interval=timedelta(seconds=60),
diff --git a/homeassistant/components/workday/config_flow.py b/homeassistant/components/workday/config_flow.py
index 4d93fccb1a7..2552fe849e2 100644
--- a/homeassistant/components/workday/config_flow.py
+++ b/homeassistant/components/workday/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_COUNTRY, CONF_LANGUAGE, CONF_NAME
 from homeassistant.core import callback
@@ -219,7 +219,7 @@ class WorkdayConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> WorkdayOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return WorkdayOptionsFlowHandler()
+        return WorkdayOptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -310,7 +310,7 @@ class WorkdayConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class WorkdayOptionsFlowHandler(OptionsFlow):
+class WorkdayOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle Workday options."""
 
     async def async_step_init(
@@ -320,7 +320,7 @@ class WorkdayOptionsFlowHandler(OptionsFlow):
         errors: dict[str, str] = {}
 
         if user_input is not None:
-            combined_input: dict[str, Any] = {**self.config_entry.options, **user_input}
+            combined_input: dict[str, Any] = {**self.options, **user_input}
             if CONF_PROVINCE not in user_input:
                 # Province not present, delete old value (if present) too
                 combined_input.pop(CONF_PROVINCE, None)
@@ -340,7 +340,7 @@ class WorkdayOptionsFlowHandler(OptionsFlow):
             else:
                 LOGGER.debug("abort_check in options with %s", combined_input)
                 abort_match = {
-                    CONF_COUNTRY: self.config_entry.options.get(CONF_COUNTRY),
+                    CONF_COUNTRY: self._config_entry.options.get(CONF_COUNTRY),
                     CONF_EXCLUDES: combined_input[CONF_EXCLUDES],
                     CONF_OFFSET: combined_input[CONF_OFFSET],
                     CONF_WORKDAYS: combined_input[CONF_WORKDAYS],
@@ -357,22 +357,23 @@ class WorkdayOptionsFlowHandler(OptionsFlow):
                 else:
                     return self.async_create_entry(data=combined_input)
 
-        options = self.config_entry.options
         schema: vol.Schema = await self.hass.async_add_executor_job(
             add_province_and_language_to_schema,
             DATA_SCHEMA_OPT,
-            options.get(CONF_COUNTRY),
+            self.options.get(CONF_COUNTRY),
         )
 
-        new_schema = self.add_suggested_values_to_schema(schema, user_input or options)
+        new_schema = self.add_suggested_values_to_schema(
+            schema, user_input or self.options
+        )
         LOGGER.debug("Errors have occurred in options %s", errors)
         return self.async_show_form(
             step_id="init",
             data_schema=new_schema,
             errors=errors,
             description_placeholders={
-                "name": options[CONF_NAME],
-                "country": options.get(CONF_COUNTRY),
+                "name": self.options[CONF_NAME],
+                "country": self.options.get(CONF_COUNTRY),
             },
         )
 
diff --git a/homeassistant/components/workday/manifest.json b/homeassistant/components/workday/manifest.json
index b02db734729..cf3afb5fc37 100644
--- a/homeassistant/components/workday/manifest.json
+++ b/homeassistant/components/workday/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["holidays"],
   "quality_scale": "internal",
-  "requirements": ["holidays==0.60"]
+  "requirements": ["holidays==0.58"]
 }
diff --git a/homeassistant/components/ws66i/config_flow.py b/homeassistant/components/ws66i/config_flow.py
index 120b7738d2e..9f6f4ca59c2 100644
--- a/homeassistant/components/ws66i/config_flow.py
+++ b/homeassistant/components/ws66i/config_flow.py
@@ -130,7 +130,7 @@ class WS66iConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> Ws66iOptionsFlowHandler:
         """Define the config flow to handle options."""
-        return Ws66iOptionsFlowHandler()
+        return Ws66iOptionsFlowHandler(config_entry)
 
 
 @callback
@@ -145,6 +145,10 @@ def _key_for_source(
 class Ws66iOptionsFlowHandler(OptionsFlow):
     """Handle a WS66i options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, str] | None = None
     ) -> ConfigFlowResult:
diff --git a/homeassistant/components/wyoming/assist_satellite.py b/homeassistant/components/wyoming/assist_satellite.py
index 615084bcbf3..83422bd686a 100644
--- a/homeassistant/components/wyoming/assist_satellite.py
+++ b/homeassistant/components/wyoming/assist_satellite.py
@@ -32,6 +32,7 @@ from homeassistant.components.assist_satellite import (
     AssistSatelliteEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -82,6 +83,7 @@ class WyomingAssistSatellite(WyomingSatelliteEntity, AssistSatelliteEntity):
 
     entity_description = AssistSatelliteEntityDescription(key="assist_satellite")
     _attr_translation_key = "assist_satellite"
+    _attr_entity_category = EntityCategory.CONFIG
     _attr_name = None
 
     def __init__(
diff --git a/homeassistant/components/wyoming/config_flow.py b/homeassistant/components/wyoming/config_flow.py
index 5fdcb1a5484..4ed2d458ad5 100644
--- a/homeassistant/components/wyoming/config_flow.py
+++ b/homeassistant/components/wyoming/config_flow.py
@@ -8,10 +8,9 @@ from urllib.parse import urlparse
 
 import voluptuous as vol
 
-from homeassistant.components import zeroconf
+from homeassistant.components import hassio, zeroconf
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .const import DOMAIN
 from .data import WyomingService
@@ -31,7 +30,7 @@ class WyomingConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    _hassio_discovery: HassioServiceInfo
+    _hassio_discovery: hassio.HassioServiceInfo
     _service: WyomingService | None = None
     _name: str | None = None
 
@@ -62,7 +61,7 @@ class WyomingConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_abort(reason="no_services")
 
     async def async_step_hassio(
-        self, discovery_info: HassioServiceInfo
+        self, discovery_info: hassio.HassioServiceInfo
     ) -> ConfigFlowResult:
         """Handle Supervisor add-on discovery."""
         _LOGGER.debug("Supervisor discovery info: %s", discovery_info)
diff --git a/homeassistant/components/xeoma/manifest.json b/homeassistant/components/xeoma/manifest.json
index d66177ca214..a73b4bb8671 100644
--- a/homeassistant/components/xeoma/manifest.json
+++ b/homeassistant/components/xeoma/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/xeoma",
   "iot_class": "local_polling",
   "loggers": ["pyxeoma"],
-  "requirements": ["pyxeoma==1.4.2"]
+  "requirements": ["pyxeoma==1.4.1"]
 }
diff --git a/homeassistant/components/xiaomi_ble/config_flow.py b/homeassistant/components/xiaomi_ble/config_flow.py
index df2de381d39..7a24763c011 100644
--- a/homeassistant/components/xiaomi_ble/config_flow.py
+++ b/homeassistant/components/xiaomi_ble/config_flow.py
@@ -4,16 +4,10 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 import dataclasses
-import logging
 from typing import Any
 
 import voluptuous as vol
-from xiaomi_ble import (
-    XiaomiBluetoothDeviceData as DeviceData,
-    XiaomiCloudException,
-    XiaomiCloudInvalidAuthenticationException,
-    XiaomiCloudTokenFetch,
-)
+from xiaomi_ble import XiaomiBluetoothDeviceData as DeviceData
 from xiaomi_ble.parser import EncryptionScheme
 
 from homeassistant.components import onboarding
@@ -24,17 +18,13 @@ from homeassistant.components.bluetooth import (
     async_process_advertisements,
 )
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ADDRESS, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.data_entry_flow import AbortFlow
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.const import CONF_ADDRESS
 
 from .const import DOMAIN
 
 # How long to wait for additional advertisement packets if we don't have the right ones
 ADDITIONAL_DISCOVERY_TIMEOUT = 60
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @dataclasses.dataclass
 class Discovery:
@@ -114,7 +104,7 @@ class XiaomiConfigFlow(ConfigFlow, domain=DOMAIN):
         if device.encryption_scheme == EncryptionScheme.MIBEACON_LEGACY:
             return await self.async_step_get_encryption_key_legacy()
         if device.encryption_scheme == EncryptionScheme.MIBEACON_4_5:
-            return await self.async_step_get_encryption_key_4_5_choose_method()
+            return await self.async_step_get_encryption_key_4_5()
         return await self.async_step_bluetooth_confirm()
 
     async def async_step_get_encryption_key_legacy(
@@ -185,67 +175,6 @@ class XiaomiConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_cloud_auth(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the cloud auth step."""
-        assert self._discovery_info
-
-        errors: dict[str, str] = {}
-        description_placeholders: dict[str, str] = {}
-        if user_input is not None:
-            session = async_get_clientsession(self.hass)
-            fetcher = XiaomiCloudTokenFetch(
-                user_input[CONF_USERNAME], user_input[CONF_PASSWORD], session
-            )
-            try:
-                device_details = await fetcher.get_device_info(
-                    self._discovery_info.address
-                )
-            except XiaomiCloudInvalidAuthenticationException as ex:
-                _LOGGER.debug("Authentication failed: %s", ex, exc_info=True)
-                errors = {"base": "auth_failed"}
-                description_placeholders = {"error_detail": str(ex)}
-            except XiaomiCloudException as ex:
-                _LOGGER.debug("Failed to connect to MI API: %s", ex, exc_info=True)
-                raise AbortFlow(
-                    "api_error", description_placeholders={"error_detail": str(ex)}
-                ) from ex
-            else:
-                if device_details:
-                    return await self.async_step_get_encryption_key_4_5(
-                        {"bindkey": device_details.bindkey}
-                    )
-                errors = {"base": "api_device_not_found"}
-
-        user_input = user_input or {}
-        return self.async_show_form(
-            step_id="cloud_auth",
-            errors=errors,
-            data_schema=vol.Schema(
-                {
-                    vol.Required(
-                        CONF_USERNAME, default=user_input.get(CONF_USERNAME)
-                    ): str,
-                    vol.Required(CONF_PASSWORD): str,
-                }
-            ),
-            description_placeholders={
-                **self.context["title_placeholders"],
-                **description_placeholders,
-            },
-        )
-
-    async def async_step_get_encryption_key_4_5_choose_method(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Choose method to get the bind key for a version 4/5 device."""
-        return self.async_show_menu(
-            step_id="get_encryption_key_4_5_choose_method",
-            menu_options=["cloud_auth", "get_encryption_key_4_5"],
-            description_placeholders=self.context["title_placeholders"],
-        )
-
     async def async_step_bluetooth_confirm(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -302,7 +231,7 @@ class XiaomiConfigFlow(ConfigFlow, domain=DOMAIN):
                 return await self.async_step_get_encryption_key_legacy()
 
             if discovery.device.encryption_scheme == EncryptionScheme.MIBEACON_4_5:
-                return await self.async_step_get_encryption_key_4_5_choose_method()
+                return await self.async_step_get_encryption_key_4_5()
 
             return self._async_get_or_create_entry()
 
@@ -344,7 +273,7 @@ class XiaomiConfigFlow(ConfigFlow, domain=DOMAIN):
             return await self.async_step_get_encryption_key_legacy()
 
         if device.encryption_scheme == EncryptionScheme.MIBEACON_4_5:
-            return await self.async_step_get_encryption_key_4_5_choose_method()
+            return await self.async_step_get_encryption_key_4_5()
 
         # Otherwise there wasn't actually encryption so abort
         return self.async_abort(reason="reauth_successful")
diff --git a/homeassistant/components/xiaomi_ble/manifest.json b/homeassistant/components/xiaomi_ble/manifest.json
index 26dd82c73bc..e4c643e491e 100644
--- a/homeassistant/components/xiaomi_ble/manifest.json
+++ b/homeassistant/components/xiaomi_ble/manifest.json
@@ -24,5 +24,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/xiaomi_ble",
   "iot_class": "local_push",
-  "requirements": ["xiaomi-ble==0.33.0"]
+  "requirements": ["xiaomi-ble==0.32.0"]
 }
diff --git a/homeassistant/components/xiaomi_ble/strings.json b/homeassistant/components/xiaomi_ble/strings.json
index 4ea4a47c61e..048c9bd92e2 100644
--- a/homeassistant/components/xiaomi_ble/strings.json
+++ b/homeassistant/components/xiaomi_ble/strings.json
@@ -25,35 +25,18 @@
         "data": {
           "bindkey": "Bindkey"
         }
-      },
-      "cloud_auth": {
-        "description": "Please provide your Mi app username and password. This data won't be saved and only used to retrieve the device encryption key. Usernames and passwords are case sensitive.",
-        "data": {
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        }
-      },
-      "get_encryption_key_4_5_choose_method": {
-        "description": "A Mi device can be set up in Home Assistant in two different ways.\n\nYou can enter the bindkey yourself, or Home Assistant can import them from your Mi account.",
-        "menu_options": {
-          "cloud_auth": "Mi account (recommended)",
-          "get_encryption_key_4_5": "Enter encryption key manually"
-        }
       }
     },
     "error": {
       "decryption_failed": "The provided bindkey did not work, sensor data could not be decrypted. Please check it and try again.",
       "expected_24_characters": "Expected a 24 character hexadecimal bindkey.",
-      "expected_32_characters": "Expected a 32 character hexadecimal bindkey.",
-      "auth_failed": "Authentication failed: {error_detail}",
-      "api_device_not_found": "The device was not found in your Mi account."
+      "expected_32_characters": "Expected a 32 character hexadecimal bindkey."
     },
     "abort": {
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "api_error": "Error while communicating with Mi API: {error_detail}"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "device_automation": {
diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py
index d841045d235..9e14a3c58ba 100644
--- a/homeassistant/components/xiaomi_miio/__init__.py
+++ b/homeassistant/components/xiaomi_miio/__init__.py
@@ -56,7 +56,6 @@ from .const import (
     MODEL_FAN_P9,
     MODEL_FAN_P10,
     MODEL_FAN_P11,
-    MODEL_FAN_P18,
     MODEL_FAN_ZA5,
     MODELS_AIR_MONITOR,
     MODELS_FAN,
@@ -119,7 +118,6 @@ MODEL_TO_CLASS_MAP = {
     MODEL_FAN_P9: FanMiot,
     MODEL_FAN_P10: FanMiot,
     MODEL_FAN_P11: FanMiot,
-    MODEL_FAN_P18: FanMiot,
     MODEL_FAN_P5: FanP5,
     MODEL_FAN_ZA5: FanZA5,
 }
@@ -308,7 +306,6 @@ async def async_create_miio_device_and_coordinator(
         "zhimi.fan.za3": True,
         "zhimi.fan.za5": True,
         "zhimi.airpurifier.za1": True,
-        "dmaker.fan.1c": True,
     }
     lazy_discover = LAZY_DISCOVER_FOR_MODEL.get(model, False)
 
@@ -388,7 +385,6 @@ async def async_create_miio_device_and_coordinator(
     coordinator = coordinator_class(
         hass,
         _LOGGER,
-        config_entry=entry,
         name=name,
         update_method=update_method(hass, device),
         # Polling interval. Will only be polled if there are subscribers.
@@ -454,7 +450,6 @@ async def async_setup_gateway_entry(hass: HomeAssistant, entry: ConfigEntry) ->
         coordinator_dict[sub_device.sid] = DataUpdateCoordinator(
             hass,
             _LOGGER,
-            config_entry=entry,
             name=name,
             update_method=update_data_factory(sub_device),
             # Polling interval. Will only be polled if there are subscribers.
diff --git a/homeassistant/components/xiaomi_miio/alarm_control_panel.py b/homeassistant/components/xiaomi_miio/alarm_control_panel.py
index 9c06198bc7e..58d5ed247ad 100644
--- a/homeassistant/components/xiaomi_miio/alarm_control_panel.py
+++ b/homeassistant/components/xiaomi_miio/alarm_control_panel.py
@@ -10,9 +10,13 @@ from miio import DeviceException
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -102,11 +106,11 @@ class XiaomiGatewayAlarm(AlarmControlPanelEntity):
         self._attr_available = True
 
         if state == XIAOMI_STATE_ARMED_VALUE:
-            self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+            self._attr_state = STATE_ALARM_ARMED_AWAY
         elif state == XIAOMI_STATE_DISARMED_VALUE:
-            self._attr_alarm_state = AlarmControlPanelState.DISARMED
+            self._attr_state = STATE_ALARM_DISARMED
         elif state == XIAOMI_STATE_ARMING_VALUE:
-            self._attr_alarm_state = AlarmControlPanelState.ARMING
+            self._attr_state = STATE_ALARM_ARMING
         else:
             _LOGGER.warning(
                 "New state (%s) doesn't match expected values: %s/%s/%s",
@@ -115,6 +119,6 @@ class XiaomiGatewayAlarm(AlarmControlPanelEntity):
                 XIAOMI_STATE_DISARMED_VALUE,
                 XIAOMI_STATE_ARMING_VALUE,
             )
-            self._attr_alarm_state = None
+            self._attr_state = None
 
-        _LOGGER.debug("State value: %s", self._attr_alarm_state)
+        _LOGGER.debug("State value: %s", self._attr_state)
diff --git a/homeassistant/components/xiaomi_miio/config_flow.py b/homeassistant/components/xiaomi_miio/config_flow.py
index b068f4a1e61..bd925b5fc54 100644
--- a/homeassistant/components/xiaomi_miio/config_flow.py
+++ b/homeassistant/components/xiaomi_miio/config_flow.py
@@ -13,6 +13,7 @@ import voluptuous as vol
 
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import (
+    SOURCE_REAUTH,
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
@@ -63,6 +64,10 @@ DEVICE_CLOUD_CONFIG = vol.Schema(
 class OptionsFlowHandler(OptionsFlow):
     """Options for the component."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Init object."""
+        self.config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -78,7 +83,14 @@ class OptionsFlowHandler(OptionsFlow):
                 not cloud_username or not cloud_password or not cloud_country
             ):
                 errors["base"] = "cloud_credentials_incomplete"
-                self.config_entry.async_start_reauth(self.hass)
+                # trigger re-auth flow
+                self.hass.async_create_task(
+                    self.hass.config_entries.flow.async_init(
+                        DOMAIN,
+                        context={"source": SOURCE_REAUTH},
+                        data=self.config_entry.data,
+                    )
+                )
 
             if not errors:
                 return self.async_create_entry(title="", data=user_input)
@@ -118,7 +130,7 @@ class XiaomiMiioFlowHandler(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
         """Get the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
diff --git a/homeassistant/components/xiaomi_miio/const.py b/homeassistant/components/xiaomi_miio/const.py
index 2b9cdb2ffdd..7d6cf152d7a 100644
--- a/homeassistant/components/xiaomi_miio/const.py
+++ b/homeassistant/components/xiaomi_miio/const.py
@@ -94,7 +94,6 @@ MODEL_AIRFRESH_T2017 = "dmaker.airfresh.t2017"
 MODEL_FAN_1C = "dmaker.fan.1c"
 MODEL_FAN_P10 = "dmaker.fan.p10"
 MODEL_FAN_P11 = "dmaker.fan.p11"
-MODEL_FAN_P18 = "dmaker.fan.p18"
 MODEL_FAN_P5 = "dmaker.fan.p5"
 MODEL_FAN_P9 = "dmaker.fan.p9"
 MODEL_FAN_SA1 = "zhimi.fan.sa1"
@@ -119,7 +118,6 @@ MODELS_FAN_MIOT = [
     MODEL_FAN_1C,
     MODEL_FAN_P10,
     MODEL_FAN_P11,
-    MODEL_FAN_P18,
     MODEL_FAN_P9,
     MODEL_FAN_ZA5,
 ]
@@ -493,7 +491,7 @@ FEATURE_FLAGS_FAN_P9 = (
     | FEATURE_SET_DELAY_OFF_COUNTDOWN
 )
 
-FEATURE_FLAGS_FAN_P10_P11_P18 = (
+FEATURE_FLAGS_FAN_P10_P11 = (
     FEATURE_SET_BUZZER
     | FEATURE_SET_CHILD_LOCK
     | FEATURE_SET_OSCILLATION_ANGLE
diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py
index 81ca38eb053..845b09e9262 100644
--- a/homeassistant/components/xiaomi_miio/fan.py
+++ b/homeassistant/components/xiaomi_miio/fan.py
@@ -60,7 +60,7 @@ from .const import (
     FEATURE_FLAGS_FAN_1C,
     FEATURE_FLAGS_FAN_P5,
     FEATURE_FLAGS_FAN_P9,
-    FEATURE_FLAGS_FAN_P10_P11_P18,
+    FEATURE_FLAGS_FAN_P10_P11,
     FEATURE_FLAGS_FAN_ZA5,
     FEATURE_RESET_FILTER,
     FEATURE_SET_EXTRA_FEATURES,
@@ -85,7 +85,6 @@ from .const import (
     MODEL_FAN_P9,
     MODEL_FAN_P10,
     MODEL_FAN_P11,
-    MODEL_FAN_P18,
     MODEL_FAN_ZA5,
     MODELS_FAN_MIIO,
     MODELS_FAN_MIOT,
@@ -913,8 +912,8 @@ class XiaomiGenericFan(XiaomiGenericDevice):
             self._device_features = FEATURE_FLAGS_FAN_1C
         elif self._model == MODEL_FAN_P9:
             self._device_features = FEATURE_FLAGS_FAN_P9
-        elif self._model in (MODEL_FAN_P10, MODEL_FAN_P11, MODEL_FAN_P18):
-            self._device_features = FEATURE_FLAGS_FAN_P10_P11_P18
+        elif self._model in (MODEL_FAN_P10, MODEL_FAN_P11):
+            self._device_features = FEATURE_FLAGS_FAN_P10_P11
         else:
             self._device_features = FEATURE_FLAGS_FAN
         self._attr_supported_features = (
diff --git a/homeassistant/components/xiaomi_miio/number.py b/homeassistant/components/xiaomi_miio/number.py
index a3c501aad3f..f8788ba07d6 100644
--- a/homeassistant/components/xiaomi_miio/number.py
+++ b/homeassistant/components/xiaomi_miio/number.py
@@ -50,7 +50,7 @@ from .const import (
     FEATURE_FLAGS_FAN_1C,
     FEATURE_FLAGS_FAN_P5,
     FEATURE_FLAGS_FAN_P9,
-    FEATURE_FLAGS_FAN_P10_P11_P18,
+    FEATURE_FLAGS_FAN_P10_P11,
     FEATURE_FLAGS_FAN_ZA5,
     FEATURE_SET_DELAY_OFF_COUNTDOWN,
     FEATURE_SET_FAN_LEVEL,
@@ -87,7 +87,6 @@ from .const import (
     MODEL_FAN_P9,
     MODEL_FAN_P10,
     MODEL_FAN_P11,
-    MODEL_FAN_P18,
     MODEL_FAN_SA1,
     MODEL_FAN_V2,
     MODEL_FAN_V3,
@@ -257,9 +256,8 @@ MODEL_TO_FEATURES_MAP = {
     MODEL_AIRPURIFIER_4_PRO: FEATURE_FLAGS_AIRPURIFIER_4,
     MODEL_AIRPURIFIER_ZA1: FEATURE_FLAGS_AIRPURIFIER_ZA1,
     MODEL_FAN_1C: FEATURE_FLAGS_FAN_1C,
-    MODEL_FAN_P10: FEATURE_FLAGS_FAN_P10_P11_P18,
-    MODEL_FAN_P11: FEATURE_FLAGS_FAN_P10_P11_P18,
-    MODEL_FAN_P18: FEATURE_FLAGS_FAN_P10_P11_P18,
+    MODEL_FAN_P10: FEATURE_FLAGS_FAN_P10_P11,
+    MODEL_FAN_P11: FEATURE_FLAGS_FAN_P10_P11,
     MODEL_FAN_P5: FEATURE_FLAGS_FAN_P5,
     MODEL_FAN_P9: FEATURE_FLAGS_FAN_P9,
     MODEL_FAN_SA1: FEATURE_FLAGS_FAN,
@@ -277,7 +275,6 @@ OSCILLATION_ANGLE_VALUES = {
     MODEL_FAN_P9: OscillationAngleValues(max_value=150, min_value=30, step=30),
     MODEL_FAN_P10: OscillationAngleValues(max_value=140, min_value=30, step=30),
     MODEL_FAN_P11: OscillationAngleValues(max_value=140, min_value=30, step=30),
-    MODEL_FAN_P18: OscillationAngleValues(max_value=140, min_value=30, step=30),
 }
 
 FAVORITE_LEVEL_VALUES = {
diff --git a/homeassistant/components/xiaomi_miio/switch.py b/homeassistant/components/xiaomi_miio/switch.py
index 02f4d4e94e5..8df3522b2ac 100644
--- a/homeassistant/components/xiaomi_miio/switch.py
+++ b/homeassistant/components/xiaomi_miio/switch.py
@@ -59,7 +59,7 @@ from .const import (
     FEATURE_FLAGS_FAN_1C,
     FEATURE_FLAGS_FAN_P5,
     FEATURE_FLAGS_FAN_P9,
-    FEATURE_FLAGS_FAN_P10_P11_P18,
+    FEATURE_FLAGS_FAN_P10_P11,
     FEATURE_FLAGS_FAN_ZA5,
     FEATURE_SET_ANION,
     FEATURE_SET_AUTO_DETECT,
@@ -99,7 +99,6 @@ from .const import (
     MODEL_FAN_P9,
     MODEL_FAN_P10,
     MODEL_FAN_P11,
-    MODEL_FAN_P18,
     MODEL_FAN_ZA1,
     MODEL_FAN_ZA3,
     MODEL_FAN_ZA4,
@@ -212,9 +211,8 @@ MODEL_TO_FEATURES_MAP = {
     MODEL_AIRPURIFIER_4_PRO: FEATURE_FLAGS_AIRPURIFIER_4,
     MODEL_AIRPURIFIER_ZA1: FEATURE_FLAGS_AIRPURIFIER_ZA1,
     MODEL_FAN_1C: FEATURE_FLAGS_FAN_1C,
-    MODEL_FAN_P10: FEATURE_FLAGS_FAN_P10_P11_P18,
-    MODEL_FAN_P11: FEATURE_FLAGS_FAN_P10_P11_P18,
-    MODEL_FAN_P18: FEATURE_FLAGS_FAN_P10_P11_P18,
+    MODEL_FAN_P10: FEATURE_FLAGS_FAN_P10_P11,
+    MODEL_FAN_P11: FEATURE_FLAGS_FAN_P10_P11,
     MODEL_FAN_P5: FEATURE_FLAGS_FAN_P5,
     MODEL_FAN_P9: FEATURE_FLAGS_FAN_P9,
     MODEL_FAN_ZA1: FEATURE_FLAGS_FAN,
diff --git a/homeassistant/components/yale_smart_alarm/alarm_control_panel.py b/homeassistant/components/yale_smart_alarm/alarm_control_panel.py
index 0f5b7d0b8e5..2fc56a9e5dd 100644
--- a/homeassistant/components/yale_smart_alarm/alarm_control_panel.py
+++ b/homeassistant/components/yale_smart_alarm/alarm_control_panel.py
@@ -13,12 +13,12 @@ from yalesmartalarmclient.const import (
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
 
 from . import YaleConfigEntry
 from .const import DOMAIN, STATE_MAP, YALE_ALL_ERRORS
@@ -106,6 +106,6 @@ class YaleAlarmDevice(YaleAlarmEntity, AlarmControlPanelEntity):
         return super().available
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> StateType:
         """Return the state of the alarm."""
         return STATE_MAP.get(self.coordinator.data["alarm"])
diff --git a/homeassistant/components/yale_smart_alarm/binary_sensor.py b/homeassistant/components/yale_smart_alarm/binary_sensor.py
index 8e68b1f0cb4..a1b94b907de 100644
--- a/homeassistant/components/yale_smart_alarm/binary_sensor.py
+++ b/homeassistant/components/yale_smart_alarm/binary_sensor.py
@@ -49,13 +49,9 @@ async def async_setup_entry(
     """Set up the Yale binary sensor entry."""
 
     coordinator = entry.runtime_data
-    sensors: list[YaleDoorSensor | YaleDoorBatterySensor | YaleProblemSensor] = [
+    sensors: list[YaleDoorSensor | YaleProblemSensor] = [
         YaleDoorSensor(coordinator, data) for data in coordinator.data["door_windows"]
     ]
-    sensors.extend(
-        YaleDoorBatterySensor(coordinator, data)
-        for data in coordinator.data["door_windows"]
-    )
     sensors.extend(
         YaleProblemSensor(coordinator, description) for description in SENSOR_TYPES
     )
@@ -74,27 +70,6 @@ class YaleDoorSensor(YaleEntity, BinarySensorEntity):
         return bool(self.coordinator.data["sensor_map"][self._attr_unique_id] == "open")
 
 
-class YaleDoorBatterySensor(YaleEntity, BinarySensorEntity):
-    """Representation of a Yale door sensor battery status."""
-
-    _attr_device_class = BinarySensorDeviceClass.BATTERY
-
-    def __init__(
-        self,
-        coordinator: YaleDataUpdateCoordinator,
-        data: dict,
-    ) -> None:
-        """Initiate Yale door battery Sensor."""
-        super().__init__(coordinator, data)
-        self._attr_unique_id = f"{data["address"]}-battery"
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if the battery is low."""
-        state: bool = self.coordinator.data["sensor_battery_map"][self._attr_unique_id]
-        return state
-
-
 class YaleProblemSensor(YaleAlarmEntity, BinarySensorEntity):
     """Representation of a Yale problem sensor."""
 
diff --git a/homeassistant/components/yale_smart_alarm/config_flow.py b/homeassistant/components/yale_smart_alarm/config_flow.py
index c71b7b33a08..7b68a1f5dab 100644
--- a/homeassistant/components/yale_smart_alarm/config_flow.py
+++ b/homeassistant/components/yale_smart_alarm/config_flow.py
@@ -23,8 +23,10 @@ from .const import (
     CONF_AREA_ID,
     CONF_LOCK_CODE_DIGITS,
     DEFAULT_AREA_ID,
+    DEFAULT_LOCK_CODE_DIGITS,
     DEFAULT_NAME,
     DOMAIN,
+    LOGGER,
     YALE_BASE_ERRORS,
 )
 
@@ -42,26 +44,6 @@ DATA_SCHEMA_AUTH = vol.Schema(
     }
 )
 
-OPTIONS_SCHEMA = vol.Schema(
-    {
-        vol.Optional(
-            CONF_LOCK_CODE_DIGITS,
-        ): int,
-    }
-)
-
-
-def validate_credentials(username: str, password: str) -> dict[str, Any]:
-    """Validate credentials."""
-    errors: dict[str, str] = {}
-    try:
-        YaleSmartAlarmClient(username, password)
-    except AuthenticationError:
-        errors = {"base": "invalid_auth"}
-    except YALE_BASE_ERRORS:
-        errors = {"base": "cannot_connect"}
-    return errors
-
 
 class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Yale integration."""
@@ -72,7 +54,7 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> YaleOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return YaleOptionsFlowHandler()
+        return YaleOptionsFlowHandler(config_entry)
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
@@ -84,16 +66,24 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Dialog that informs the user that reauth is required."""
-        errors: dict[str, str] = {}
+        errors = {}
 
         if user_input is not None:
             reauth_entry = self._get_reauth_entry()
             username = reauth_entry.data[CONF_USERNAME]
             password = user_input[CONF_PASSWORD]
 
-            errors = await self.hass.async_add_executor_job(
-                validate_credentials, username, password
-            )
+            try:
+                await self.hass.async_add_executor_job(
+                    YaleSmartAlarmClient, username, password
+                )
+            except AuthenticationError as error:
+                LOGGER.error("Authentication failed. Check credentials %s", error)
+                errors = {"base": "invalid_auth"}
+            except YALE_BASE_ERRORS as error:
+                LOGGER.error("Connection to API failed %s", error)
+                errors = {"base": "cannot_connect"}
+
             if not errors:
                 return self.async_update_reload_and_abort(
                     reauth_entry,
@@ -106,42 +96,11 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of existing entry."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            reconfigure_entry = self._get_reconfigure_entry()
-            username = user_input[CONF_USERNAME]
-
-            errors = await self.hass.async_add_executor_job(
-                validate_credentials, username, user_input[CONF_PASSWORD]
-            )
-            if (
-                username != reconfigure_entry.unique_id
-                and await self.async_set_unique_id(username)
-            ):
-                errors["base"] = "unique_id_exists"
-            if not errors:
-                return self.async_update_reload_and_abort(
-                    reconfigure_entry,
-                    unique_id=username,
-                    data_updates=user_input,
-                )
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=DATA_SCHEMA,
-            errors=errors,
-        )
-
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the initial step."""
-        errors: dict[str, str] = {}
+        errors = {}
 
         if user_input is not None:
             username = user_input[CONF_USERNAME]
@@ -149,9 +108,17 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
             name = DEFAULT_NAME
             area = user_input.get(CONF_AREA_ID, DEFAULT_AREA_ID)
 
-            errors = await self.hass.async_add_executor_job(
-                validate_credentials, username, password
-            )
+            try:
+                await self.hass.async_add_executor_job(
+                    YaleSmartAlarmClient, username, password
+                )
+            except AuthenticationError as error:
+                LOGGER.error("Authentication failed. Check credentials %s", error)
+                errors = {"base": "invalid_auth"}
+            except YALE_BASE_ERRORS as error:
+                LOGGER.error("Connection to API failed %s", error)
+                errors = {"base": "cannot_connect"}
+
             if not errors:
                 await self.async_set_unique_id(username)
                 self._abort_if_unique_id_configured()
@@ -176,18 +143,32 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
 class YaleOptionsFlowHandler(OptionsFlow):
     """Handle Yale options."""
 
+    def __init__(self, entry: ConfigEntry) -> None:
+        """Initialize Yale options flow."""
+        self.entry = entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Manage Yale options."""
+        errors: dict[str, Any] = {}
 
-        if user_input is not None:
+        if user_input:
             return self.async_create_entry(data=user_input)
 
         return self.async_show_form(
             step_id="init",
-            data_schema=self.add_suggested_values_to_schema(
-                OPTIONS_SCHEMA,
-                self.config_entry.options,
+            data_schema=vol.Schema(
+                {
+                    vol.Optional(
+                        CONF_LOCK_CODE_DIGITS,
+                        description={
+                            "suggested_value": self.entry.options.get(
+                                CONF_LOCK_CODE_DIGITS, DEFAULT_LOCK_CODE_DIGITS
+                            )
+                        },
+                    ): int,
+                }
             ),
+            errors=errors,
         )
diff --git a/homeassistant/components/yale_smart_alarm/const.py b/homeassistant/components/yale_smart_alarm/const.py
index 14e31268ec9..41a754e4ce7 100644
--- a/homeassistant/components/yale_smart_alarm/const.py
+++ b/homeassistant/components/yale_smart_alarm/const.py
@@ -9,8 +9,12 @@ from yalesmartalarmclient.client import (
 )
 from yalesmartalarmclient.exceptions import AuthenticationError, UnknownError
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
-from homeassistant.const import Platform
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    Platform,
+)
 
 CONF_AREA_ID = "area_id"
 CONF_LOCK_CODE_DIGITS = "lock_code_digits"
@@ -41,9 +45,9 @@ PLATFORMS = [
 ]
 
 STATE_MAP = {
-    YALE_STATE_DISARM: AlarmControlPanelState.DISARMED,
-    YALE_STATE_ARM_PARTIAL: AlarmControlPanelState.ARMED_HOME,
-    YALE_STATE_ARM_FULL: AlarmControlPanelState.ARMED_AWAY,
+    YALE_STATE_DISARM: STATE_ALARM_DISARMED,
+    YALE_STATE_ARM_PARTIAL: STATE_ALARM_ARMED_HOME,
+    YALE_STATE_ARM_FULL: STATE_ALARM_ARMED_AWAY,
 }
 
 YALE_BASE_ERRORS = (
diff --git a/homeassistant/components/yale_smart_alarm/coordinator.py b/homeassistant/components/yale_smart_alarm/coordinator.py
index 66bd71c9f1e..911b4523fc4 100644
--- a/homeassistant/components/yale_smart_alarm/coordinator.py
+++ b/homeassistant/components/yale_smart_alarm/coordinator.py
@@ -60,9 +60,6 @@ class YaleDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         for device in updates["cycle"]["device_status"]:
             state = device["status1"]
             if device["type"] == "device_type.door_contact":
-                device["_battery"] = False
-                if "device_status.low_battery" in state:
-                    device["_battery"] = True
                 if "device_status.dc_close" in state:
                     device["_state"] = "closed"
                     door_windows.append(device)
@@ -80,10 +77,6 @@ class YaleDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         _sensor_map = {
             contact["address"]: contact["_state"] for contact in door_windows
         }
-        _sensor_battery_map = {
-            f"{contact["address"]}-battery": contact["_battery"]
-            for contact in door_windows
-        }
         _temp_map = {temp["address"]: temp["status_temp"] for temp in temp_sensors}
 
         return {
@@ -93,7 +86,6 @@ class YaleDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             "status": updates["status"],
             "online": updates["online"],
             "sensor_map": _sensor_map,
-            "sensor_battery_map": _sensor_battery_map,
             "temp_map": _temp_map,
             "panel_info": updates["panel_info"],
         }
diff --git a/homeassistant/components/yale_smart_alarm/strings.json b/homeassistant/components/yale_smart_alarm/strings.json
index 7f940e1139e..cc837d7b7d7 100644
--- a/homeassistant/components/yale_smart_alarm/strings.json
+++ b/homeassistant/components/yale_smart_alarm/strings.json
@@ -2,13 +2,11 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "error": {
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unique_id_exists": "Another config entry with this username already exist"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "step": {
       "user": {
@@ -23,13 +21,6 @@
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
         }
-      },
-      "reconfigure": {
-        "data": {
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "area_id": "[%key:component::yale_smart_alarm::config::step::user::data::area_id%]"
-        }
       }
     }
   },
diff --git a/homeassistant/components/yalexs_ble/config_flow.py b/homeassistant/components/yalexs_ble/config_flow.py
index 6de74759686..191ef5a20b2 100644
--- a/homeassistant/components/yalexs_ble/config_flow.py
+++ b/homeassistant/components/yalexs_ble/config_flow.py
@@ -312,12 +312,16 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> YaleXSBLEOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return YaleXSBLEOptionsFlowHandler()
+        return YaleXSBLEOptionsFlowHandler(config_entry)
 
 
 class YaleXSBLEOptionsFlowHandler(OptionsFlow):
     """Handle YaleXSBLE options."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize YaleXSBLE options flow."""
+        self.entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -339,9 +343,7 @@ class YaleXSBLEOptionsFlowHandler(OptionsFlow):
                 {
                     vol.Optional(
                         CONF_ALWAYS_CONNECTED,
-                        default=self.config_entry.options.get(
-                            CONF_ALWAYS_CONNECTED, False
-                        ),
+                        default=self.entry.options.get(CONF_ALWAYS_CONNECTED, False),
                     ): bool,
                 }
             ),
diff --git a/homeassistant/components/yeelight/config_flow.py b/homeassistant/components/yeelight/config_flow.py
index 7a3a0a2f100..5438414ea61 100644
--- a/homeassistant/components/yeelight/config_flow.py
+++ b/homeassistant/components/yeelight/config_flow.py
@@ -58,11 +58,9 @@ class YeelightConfigFlow(ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> OptionsFlowHandler:
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
         """Return the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     def __init__(self) -> None:
         """Initialize the config flow."""
@@ -298,12 +296,16 @@ class YeelightConfigFlow(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     """Handle a option flow for Yeelight."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize the option flow."""
+        self._config_entry = config_entry
+
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the initial step."""
-        data = self.config_entry.data
-        options = self.config_entry.options
+        data = self._config_entry.data
+        options = self._config_entry.options
         detected_model = data.get(CONF_DETECTED_MODEL)
         model = options[CONF_MODEL] or detected_model
 
diff --git a/homeassistant/components/youless/__init__.py b/homeassistant/components/youless/__init__.py
index d475034cc9d..a968d052922 100644
--- a/homeassistant/components/youless/__init__.py
+++ b/homeassistant/components/youless/__init__.py
@@ -36,7 +36,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = DataUpdateCoordinator(
         hass,
         _LOGGER,
-        config_entry=entry,
         name="youless_gateway",
         update_method=async_update_data,
         update_interval=timedelta(seconds=10),
diff --git a/homeassistant/components/youtube/config_flow.py b/homeassistant/components/youtube/config_flow.py
index 48336422585..8d6c7753282 100644
--- a/homeassistant/components/youtube/config_flow.py
+++ b/homeassistant/components/youtube/config_flow.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import (
     SOURCE_REAUTH,
     ConfigEntry,
     ConfigFlowResult,
-    OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
 from homeassistant.core import callback
@@ -54,7 +54,7 @@ class OAuth2FlowHandler(
         config_entry: ConfigEntry,
     ) -> YouTubeOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return YouTubeOptionsFlowHandler()
+        return YouTubeOptionsFlowHandler(config_entry)
 
     @property
     def logger(self) -> logging.Logger:
@@ -159,7 +159,7 @@ class OAuth2FlowHandler(
         )
 
 
-class YouTubeOptionsFlowHandler(OptionsFlow):
+class YouTubeOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """YouTube Options flow handler."""
 
     async def async_step_init(
@@ -194,6 +194,6 @@ class YouTubeOptionsFlowHandler(OptionsFlow):
                         ),
                     }
                 ),
-                self.config_entry.options,
+                self.options,
             ),
         )
diff --git a/homeassistant/components/zeroconf/manifest.json b/homeassistant/components/zeroconf/manifest.json
index 98b09f1a251..8246085e405 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.136.0"]
+  "requirements": ["zeroconf==0.135.0"]
 }
diff --git a/homeassistant/components/zeroconf/usage.py b/homeassistant/components/zeroconf/usage.py
index 8ddfdbd592d..b9d51cd3c36 100644
--- a/homeassistant/components/zeroconf/usage.py
+++ b/homeassistant/components/zeroconf/usage.py
@@ -4,7 +4,7 @@ from typing import Any
 
 import zeroconf
 
-from homeassistant.helpers.frame import ReportBehavior, report_usage
+from homeassistant.helpers.frame import report
 
 from .models import HaZeroconf
 
@@ -16,14 +16,14 @@ def install_multiple_zeroconf_catcher(hass_zc: HaZeroconf) -> None:
     """
 
     def new_zeroconf_new(self: zeroconf.Zeroconf, *k: Any, **kw: Any) -> HaZeroconf:
-        report_usage(
+        report(
             (
                 "attempted to create another Zeroconf instance. Please use the shared"
                 " Zeroconf via await"
                 " homeassistant.components.zeroconf.async_get_instance(hass)"
             ),
             exclude_integrations={"zeroconf"},
-            core_behavior=ReportBehavior.LOG,
+            error_if_core=False,
         )
         return hass_zc
 
diff --git a/homeassistant/components/zeversolar/manifest.json b/homeassistant/components/zeversolar/manifest.json
index 18bab34c04e..af197b3aa7c 100644
--- a/homeassistant/components/zeversolar/manifest.json
+++ b/homeassistant/components/zeversolar/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/zeversolar",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["zeversolar==0.3.2"]
+  "requirements": ["zeversolar==0.3.1"]
 }
diff --git a/homeassistant/components/zha/alarm_control_panel.py b/homeassistant/components/zha/alarm_control_panel.py
index 734683e5497..c54d7c7ab2d 100644
--- a/homeassistant/components/zha/alarm_control_panel.py
+++ b/homeassistant/components/zha/alarm_control_panel.py
@@ -4,14 +4,9 @@ from __future__ import annotations
 
 import functools
 
-from zha.application.platforms.alarm_control_panel.const import (
-    AlarmState as ZHAAlarmState,
-)
-
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
     CodeFormat,
 )
 from homeassistant.config_entries import ConfigEntry
@@ -28,20 +23,6 @@ from .helpers import (
     get_zha_data,
 )
 
-ZHA_STATE_TO_ALARM_STATE_MAP = {
-    ZHAAlarmState.DISARMED.value: AlarmControlPanelState.DISARMED,
-    ZHAAlarmState.ARMED_HOME.value: AlarmControlPanelState.ARMED_HOME,
-    ZHAAlarmState.ARMED_AWAY.value: AlarmControlPanelState.ARMED_AWAY,
-    ZHAAlarmState.ARMED_NIGHT.value: AlarmControlPanelState.ARMED_NIGHT,
-    ZHAAlarmState.ARMED_VACATION.value: AlarmControlPanelState.ARMED_VACATION,
-    ZHAAlarmState.ARMED_CUSTOM_BYPASS.value: AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-    ZHAAlarmState.PENDING.value: AlarmControlPanelState.PENDING,
-    ZHAAlarmState.ARMING.value: AlarmControlPanelState.ARMING,
-    ZHAAlarmState.DISARMING.value: AlarmControlPanelState.DISARMING,
-    ZHAAlarmState.TRIGGERED.value: AlarmControlPanelState.TRIGGERED,
-    ZHAAlarmState.UNKNOWN.value: None,
-}
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -113,6 +94,6 @@ class ZHAAlarmControlPanel(ZHAEntity, AlarmControlPanelEntity):
         self.async_write_ha_state()
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the entity."""
-        return ZHA_STATE_TO_ALARM_STATE_MAP.get(self.entity_data.entity.state["state"])
+        return self.entity_data.entity.state["state"]
diff --git a/homeassistant/components/zha/config_flow.py b/homeassistant/components/zha/config_flow.py
index f3f7f38772d..20eb006eb74 100644
--- a/homeassistant/components/zha/config_flow.py
+++ b/homeassistant/components/zha/config_flow.py
@@ -33,7 +33,6 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.selector import FileSelector, FileSelectorConfig
 from homeassistant.util import dt as dt_util
 
@@ -105,26 +104,25 @@ async def list_serial_ports(hass: HomeAssistant) -> list[ListPortInfo]:
         yellow_radio.description = "Yellow Zigbee module"
         yellow_radio.manufacturer = "Nabu Casa"
 
-    if is_hassio(hass):
-        # Present the multi-PAN addon as a setup option, if it's available
-        multipan_manager = (
-            await silabs_multiprotocol_addon.get_multiprotocol_addon_manager(hass)
+    # Present the multi-PAN addon as a setup option, if it's available
+    multipan_manager = await silabs_multiprotocol_addon.get_multiprotocol_addon_manager(
+        hass
+    )
+
+    try:
+        addon_info = await multipan_manager.async_get_addon_info()
+    except (AddonError, KeyError):
+        addon_info = None
+
+    if addon_info is not None and addon_info.state != AddonState.NOT_INSTALLED:
+        addon_port = ListPortInfo(
+            device=silabs_multiprotocol_addon.get_zigbee_socket(),
+            skip_link_detection=True,
         )
 
-        try:
-            addon_info = await multipan_manager.async_get_addon_info()
-        except (AddonError, KeyError):
-            addon_info = None
-
-        if addon_info is not None and addon_info.state != AddonState.NOT_INSTALLED:
-            addon_port = ListPortInfo(
-                device=silabs_multiprotocol_addon.get_zigbee_socket(),
-                skip_link_detection=True,
-            )
-
-            addon_port.description = "Multiprotocol add-on"
-            addon_port.manufacturer = "Nabu Casa"
-            ports.append(addon_port)
+        addon_port.description = "Multiprotocol add-on"
+        addon_port.manufacturer = "Nabu Casa"
+        ports.append(addon_port)
 
     return ports
 
@@ -682,6 +680,8 @@ class ZhaOptionsFlowHandler(BaseZhaFlow, OptionsFlow):
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
         super().__init__()
+        self.config_entry = config_entry
+
         self._radio_mgr.device_path = config_entry.data[CONF_DEVICE][CONF_DEVICE_PATH]
         self._radio_mgr.device_settings = config_entry.data[CONF_DEVICE]
         self._radio_mgr.radio_type = RadioType[config_entry.data[CONF_RADIO_TYPE]]
diff --git a/homeassistant/components/zha/icons.json b/homeassistant/components/zha/icons.json
index 5b3b85ced39..9d5254fe237 100644
--- a/homeassistant/components/zha/icons.json
+++ b/homeassistant/components/zha/icons.json
@@ -45,15 +45,6 @@
       "maximum_level": {
         "default": "mdi:brightness-percent"
       },
-      "default_level_local": {
-        "default": "mdi:brightness-percent"
-      },
-      "default_level_remote": {
-        "default": "mdi:brightness-percent"
-      },
-      "state_after_power_restored": {
-        "default": "mdi:brightness-percent"
-      },
       "auto_off_timer": {
         "default": "mdi:timer"
       },
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 96c9bc030f6..89cfa5ae738 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "zha",
   "name": "Zigbee Home Automation",
-  "after_dependencies": ["hassio", "onboarding", "usb"],
+  "after_dependencies": ["onboarding", "usb"],
   "codeowners": ["@dmulcahey", "@adminiuga", "@puddly", "@TheJulianJES"],
   "config_flow": true,
   "dependencies": ["file_upload"],
@@ -21,7 +21,7 @@
     "zha",
     "universal_silabs_flasher"
   ],
-  "requirements": ["universal-silabs-flasher==0.0.24", "zha==0.0.37"],
+  "requirements": ["universal-silabs-flasher==0.0.23", "zha==0.0.35"],
   "usb": [
     {
       "vid": "10C4",
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index d0505bf2460..6123081fcd7 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -708,15 +708,6 @@
       "maximum_level": {
         "name": "Maximum load dimming level"
       },
-      "default_level_local": {
-        "name": "Local default dimming level"
-      },
-      "default_level_remote": {
-        "name": "Remote default dimming level"
-      },
-      "state_after_power_restored": {
-        "name": "Start-up default dimming level"
-      },
       "auto_off_timer": {
         "name": "Automatic switch shutoff timer"
       },
@@ -776,21 +767,6 @@
       },
       "regulation_setpoint_offset": {
         "name": "Regulation setpoint offset"
-      },
-      "irrigation_cycles": {
-        "name": "Irrigation cycles"
-      },
-      "irrigation_target": {
-        "name": "Irrigation target"
-      },
-      "irrigation_interval": {
-        "name": "Irrigation interval"
-      },
-      "valve_countdown_1": {
-        "name": "Irrigation time 1"
-      },
-      "valve_countdown_2": {
-        "name": "Irrigation time 2"
       }
     },
     "select": {
@@ -842,9 +818,6 @@
       "increased_non_neutral_output": {
         "name": "Non neutral output"
       },
-      "leading_or_trailing_edge": {
-        "name": "Dimming mode"
-      },
       "feeding_mode": {
         "name": "Mode"
       },
@@ -880,12 +853,6 @@
       },
       "setpoint_response_time": {
         "name": "Setpoint response time"
-      },
-      "irrigation_mode": {
-        "name": "Irrigation mode"
-      },
-      "weather_delay": {
-        "name": "Weather delay"
       }
     },
     "sensor": {
@@ -931,12 +898,6 @@
       "device_temperature": {
         "name": "Device temperature"
       },
-      "internal_temp_monitor": {
-        "name": "Internal temperature"
-      },
-      "overheated": {
-        "name": "Overheat protection"
-      },
       "formaldehyde": {
         "name": "Formaldehyde concentration"
       },
@@ -1062,27 +1023,6 @@
       },
       "motor_stepcount": {
         "name": "Motor stepcount"
-      },
-      "irrigation_duration": {
-        "name": "Last irrigation duration"
-      },
-      "irrigation_start_time": {
-        "name": "Irrigation start time"
-      },
-      "irrigation_end_time": {
-        "name": "Irrigation end time"
-      },
-      "irrigation_duration_1": {
-        "name": "Irrigation duration 1"
-      },
-      "irriation_duration_2": {
-        "name": "Irrigation duration 2"
-      },
-      "valve_status_1": {
-        "name": "Status 1"
-      },
-      "valve_status_2": {
-        "name": "Status 2"
       }
     },
     "switch": {
@@ -1187,12 +1127,6 @@
       },
       "adaptation_run_enabled": {
         "name": "Adaptation run enabled"
-      },
-      "valve_on_off_1": {
-        "name": "Valve 1"
-      },
-      "valve_on_off_2": {
-        "name": "Valve 2"
       }
     }
   }
diff --git a/homeassistant/components/zwave_js/api.py b/homeassistant/components/zwave_js/api.py
index bd49e85b601..0339023b954 100644
--- a/homeassistant/components/zwave_js/api.py
+++ b/homeassistant/components/zwave_js/api.py
@@ -13,10 +13,8 @@ from zwave_js_server.client import Client
 from zwave_js_server.const import (
     CommandClass,
     ExclusionStrategy,
-    InclusionState,
     InclusionStrategy,
     LogLevel,
-    NodeStatus,
     Protocols,
     ProvisioningEntryStatus,
     QRCodeVersion,
@@ -43,7 +41,6 @@ from zwave_js_server.model.controller.firmware import (
     ControllerFirmwareUpdateResult,
 )
 from zwave_js_server.model.driver import Driver
-from zwave_js_server.model.endpoint import Endpoint
 from zwave_js_server.model.log_config import LogConfig
 from zwave_js_server.model.log_message import LogMessage
 from zwave_js_server.model.node import Node, NodeStatistics
@@ -56,7 +53,6 @@ from zwave_js_server.model.utils import (
     async_parse_qr_code_string,
     async_try_parse_dsk_from_qr_code_string,
 )
-from zwave_js_server.model.value import ConfigurationValueFormat
 from zwave_js_server.util.node import async_set_config_parameter
 
 from homeassistant.components import websocket_api
@@ -77,11 +73,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .config_validation import BITMASK_SCHEMA
 from .const import (
-    ATTR_COMMAND_CLASS,
-    ATTR_ENDPOINT,
-    ATTR_METHOD_NAME,
-    ATTR_PARAMETERS,
-    ATTR_WAIT_FOR_RESULT,
     CONF_DATA_COLLECTION_OPTED_IN,
     DATA_CLIENT,
     EVENT_DEVICE_ADDED_TO_REGISTRY,
@@ -107,8 +98,6 @@ PROPERTY = "property"
 PROPERTY_KEY = "property_key"
 ENDPOINT = "endpoint"
 VALUE = "value"
-VALUE_SIZE = "value_size"
-VALUE_FORMAT = "value_format"
 
 # constants for log config commands
 CONFIG = "config"
@@ -419,8 +408,6 @@ def async_register_api(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, websocket_rebuild_node_routes)
     websocket_api.async_register_command(hass, websocket_set_config_parameter)
     websocket_api.async_register_command(hass, websocket_get_config_parameters)
-    websocket_api.async_register_command(hass, websocket_get_raw_config_parameter)
-    websocket_api.async_register_command(hass, websocket_set_raw_config_parameter)
     websocket_api.async_register_command(hass, websocket_subscribe_log_updates)
     websocket_api.async_register_command(hass, websocket_update_log_config)
     websocket_api.async_register_command(hass, websocket_get_log_config)
@@ -448,8 +435,6 @@ def async_register_api(hass: HomeAssistant) -> None:
     )
     websocket_api.async_register_command(hass, websocket_subscribe_node_statistics)
     websocket_api.async_register_command(hass, websocket_hard_reset_controller)
-    websocket_api.async_register_command(hass, websocket_node_capabilities)
-    websocket_api.async_register_command(hass, websocket_invoke_cc_api)
     hass.http.register_view(FirmwareUploadView(dr.async_get(hass)))
 
 
@@ -708,30 +693,6 @@ async def websocket_add_node(
             )
         )
 
-    @callback
-    def forward_node_added(
-        node: Node, low_security: bool, low_security_reason: str | None
-    ) -> None:
-        interview_unsubs = [
-            node.on("interview started", forward_event),
-            node.on("interview completed", forward_event),
-            node.on("interview stage completed", forward_stage),
-            node.on("interview failed", forward_event),
-        ]
-        unsubs.extend(interview_unsubs)
-        node_details = {
-            "node_id": node.node_id,
-            "status": node.status,
-            "ready": node.ready,
-            "low_security": low_security,
-            "low_security_reason": low_security_reason,
-        }
-        connection.send_message(
-            websocket_api.event_message(
-                msg[ID], {"event": "node added", "node": node_details}
-            )
-        )
-
     @callback
     def forward_requested_grant(event: dict) -> None:
         connection.send_message(
@@ -766,10 +727,25 @@ async def websocket_add_node(
 
     @callback
     def node_added(event: dict) -> None:
-        forward_node_added(
-            event["node"],
-            event["result"].get("lowSecurity", False),
-            event["result"].get("lowSecurityReason"),
+        node = event["node"]
+        interview_unsubs = [
+            node.on("interview started", forward_event),
+            node.on("interview completed", forward_event),
+            node.on("interview stage completed", forward_stage),
+            node.on("interview failed", forward_event),
+        ]
+        unsubs.extend(interview_unsubs)
+        node_details = {
+            "node_id": node.node_id,
+            "status": node.status,
+            "ready": node.ready,
+            "low_security": event["result"].get("lowSecurity", False),
+            "low_security_reason": event["result"].get("lowSecurityReason"),
+        }
+        connection.send_message(
+            websocket_api.event_message(
+                msg[ID], {"event": "node added", "node": node_details}
+            )
         )
 
     @callback
@@ -801,39 +777,25 @@ async def websocket_add_node(
     ]
     msg[DATA_UNSUBSCRIBE] = unsubs
 
-    if controller.inclusion_state == InclusionState.INCLUDING:
-        connection.send_result(
-            msg[ID],
-            True,  # Inclusion is already in progress
+    try:
+        result = await controller.async_begin_inclusion(
+            INCLUSION_STRATEGY_NOT_SMART_START[inclusion_strategy.value],
+            force_security=force_security,
+            provisioning=provisioning,
+            dsk=dsk,
         )
-        # Check for nodes that have been added but not fully included
-        for node in controller.nodes.values():
-            if node.status != NodeStatus.DEAD and not node.ready:
-                forward_node_added(
-                    node,
-                    not node.is_secure,
-                    None,
-                )
-    else:
-        try:
-            result = await controller.async_begin_inclusion(
-                INCLUSION_STRATEGY_NOT_SMART_START[inclusion_strategy.value],
-                force_security=force_security,
-                provisioning=provisioning,
-                dsk=dsk,
-            )
-        except ValueError as err:
-            connection.send_error(
-                msg[ID],
-                ERR_INVALID_FORMAT,
-                err.args[0],
-            )
-            return
+    except ValueError as err:
+        connection.send_error(
+            msg[ID],
+            ERR_INVALID_FORMAT,
+            err.args[0],
+        )
+        return
 
-        connection.send_result(
-            msg[ID],
-            result,
-        )
+    connection.send_result(
+        msg[ID],
+        result,
+    )
 
 
 @websocket_api.require_admin
@@ -1765,72 +1727,6 @@ async def websocket_get_config_parameters(
     )
 
 
-@websocket_api.require_admin
-@websocket_api.websocket_command(
-    {
-        vol.Required(TYPE): "zwave_js/set_raw_config_parameter",
-        vol.Required(DEVICE_ID): str,
-        vol.Required(PROPERTY): int,
-        vol.Required(VALUE): int,
-        vol.Required(VALUE_SIZE): vol.All(vol.Coerce(int), vol.Range(min=1, max=4)),
-        vol.Required(VALUE_FORMAT): vol.Coerce(ConfigurationValueFormat),
-    }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_set_raw_config_parameter(
-    hass: HomeAssistant,
-    connection: ActiveConnection,
-    msg: dict[str, Any],
-    node: Node,
-) -> None:
-    """Set a custom config parameter value for a Z-Wave node."""
-    result = await node.async_set_raw_config_parameter_value(
-        msg[VALUE],
-        msg[PROPERTY],
-        value_size=msg[VALUE_SIZE],
-        value_format=msg[VALUE_FORMAT],
-    )
-
-    connection.send_result(
-        msg[ID],
-        {
-            STATUS: result.status,
-        },
-    )
-
-
-@websocket_api.require_admin
-@websocket_api.websocket_command(
-    {
-        vol.Required(TYPE): "zwave_js/get_raw_config_parameter",
-        vol.Required(DEVICE_ID): str,
-        vol.Required(PROPERTY): int,
-    }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_get_raw_config_parameter(
-    hass: HomeAssistant,
-    connection: ActiveConnection,
-    msg: dict[str, Any],
-    node: Node,
-) -> None:
-    """Get a custom config parameter value for a Z-Wave node."""
-    value = await node.async_get_raw_config_parameter_value(
-        msg[PROPERTY],
-    )
-
-    connection.send_result(
-        msg[ID],
-        {
-            VALUE: value,
-        },
-    )
-
-
 def filename_is_present_if_logging_to_file(obj: dict) -> dict:
     """Validate that filename is provided if log_to_file is True."""
     if obj.get(LOG_TO_FILE, False) and FILENAME not in obj:
@@ -2604,81 +2500,3 @@ async def websocket_hard_reset_controller(
         )
     ]
     await driver.async_hard_reset()
-
-
-@websocket_api.websocket_command(
-    {
-        vol.Required(TYPE): "zwave_js/node_capabilities",
-        vol.Required(DEVICE_ID): str,
-    }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_node_capabilities(
-    hass: HomeAssistant,
-    connection: ActiveConnection,
-    msg: dict[str, Any],
-    node: Node,
-) -> None:
-    """Get node endpoints with their support command classes."""
-    # consumers expect snake_case at the moment
-    # remove that addition when consumers are updated
-    connection.send_result(
-        msg[ID],
-        {
-            idx: [
-                command_class.to_dict() | {"is_secure": command_class.is_secure}
-                for command_class in endpoint.command_classes
-            ]
-            for idx, endpoint in node.endpoints.items()
-        },
-    )
-
-
-@websocket_api.require_admin
-@websocket_api.websocket_command(
-    {
-        vol.Required(TYPE): "zwave_js/invoke_cc_api",
-        vol.Required(DEVICE_ID): str,
-        vol.Required(ATTR_COMMAND_CLASS): vol.All(
-            vol.Coerce(int), vol.Coerce(CommandClass)
-        ),
-        vol.Optional(ATTR_ENDPOINT): vol.Coerce(int),
-        vol.Required(ATTR_METHOD_NAME): cv.string,
-        vol.Required(ATTR_PARAMETERS): list,
-        vol.Optional(ATTR_WAIT_FOR_RESULT): cv.boolean,
-    }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_invoke_cc_api(
-    hass: HomeAssistant,
-    connection: ActiveConnection,
-    msg: dict[str, Any],
-    node: Node,
-) -> None:
-    """Call invokeCCAPI on the node or provided endpoint."""
-    command_class: CommandClass = msg[ATTR_COMMAND_CLASS]
-    method_name: str = msg[ATTR_METHOD_NAME]
-    parameters: list[Any] = msg[ATTR_PARAMETERS]
-
-    node_or_endpoint: Node | Endpoint = node
-    if (endpoint := msg.get(ATTR_ENDPOINT)) is not None:
-        node_or_endpoint = node.endpoints[endpoint]
-
-    try:
-        result = await node_or_endpoint.async_invoke_cc_api(
-            command_class,
-            method_name,
-            *parameters,
-            wait_for_result=msg.get(ATTR_WAIT_FOR_RESULT, False),
-        )
-    except BaseZwaveJSServerError as err:
-        connection.send_error(msg[ID], err.__class__.__name__, str(err))
-    else:
-        connection.send_result(
-            msg[ID],
-            result,
-        )
diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py
index 36f208e18d5..5668f90f4c5 100644
--- a/homeassistant/components/zwave_js/config_flow.py
+++ b/homeassistant/components/zwave_js/config_flow.py
@@ -18,6 +18,8 @@ from homeassistant.components.hassio import (
     AddonInfo,
     AddonManager,
     AddonState,
+    HassioServiceInfo,
+    is_hassio,
 )
 from homeassistant.components.zeroconf import ZeroconfServiceInfo
 from homeassistant.config_entries import (
@@ -37,8 +39,6 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import AbortFlow, FlowManager
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.hassio import is_hassio
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.helpers.typing import VolDictType
 
 from . import disconnect_client
@@ -366,7 +366,7 @@ class ZWaveJSConfigFlow(BaseZwaveJSFlow, ConfigFlow, domain=DOMAIN):
         config_entry: ConfigEntry,
     ) -> OptionsFlowHandler:
         """Return the options flow."""
-        return OptionsFlowHandler()
+        return OptionsFlowHandler(config_entry)
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -725,9 +725,10 @@ class ZWaveJSConfigFlow(BaseZwaveJSFlow, ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(BaseZwaveJSFlow, OptionsFlow):
     """Handle an options flow for Z-Wave JS."""
 
-    def __init__(self) -> None:
+    def __init__(self, config_entry: ConfigEntry) -> None:
         """Set up the options flow."""
         super().__init__()
+        self.config_entry = config_entry
         self.original_addon_config: dict[str, Any] | None = None
         self.revert_reason: str | None = None
 
diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json
index 3631bf1163b..0fee480b093 100644
--- a/homeassistant/components/zwave_js/manifest.json
+++ b/homeassistant/components/zwave_js/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "zwave_js",
   "name": "Z-Wave",
-  "after_dependencies": ["hassio"],
   "codeowners": ["@home-assistant/z-wave"],
   "config_flow": true,
   "dependencies": ["http", "repairs", "usb", "websocket_api"],
@@ -10,7 +9,7 @@
   "iot_class": "local_push",
   "loggers": ["zwave_js_server"],
   "quality_scale": "platinum",
-  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.59.1"],
+  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.58.1"],
   "usb": [
     {
       "vid": "0658",
diff --git a/homeassistant/components/zwave_js/services.py b/homeassistant/components/zwave_js/services.py
index d1cb66ceafc..969a235bb41 100644
--- a/homeassistant/components/zwave_js/services.py
+++ b/homeassistant/components/zwave_js/services.py
@@ -529,15 +529,8 @@ class ZWaveServices:
             for node_or_endpoint, result in get_valid_responses_from_results(
                 nodes_or_endpoints_list, _results
             ):
-                if value_size is None:
-                    # async_set_config_parameter still returns (Value, SetConfigParameterResult)
-                    zwave_value = result[0]
-                    cmd_status = result[1]
-                else:
-                    # async_set_raw_config_parameter_value now returns just SetConfigParameterResult
-                    cmd_status = result
-                    zwave_value = f"parameter {property_or_property_name}"
-
+                zwave_value = result[0]
+                cmd_status = result[1]
                 if cmd_status.status == CommandStatus.ACCEPTED:
                     msg = "Set configuration parameter %s on Node %s with value %s"
                 else:
diff --git a/homeassistant/components/zwave_js/services.yaml b/homeassistant/components/zwave_js/services.yaml
index acf6e9a0665..f5063fdfd93 100644
--- a/homeassistant/components/zwave_js/services.yaml
+++ b/homeassistant/components/zwave_js/services.yaml
@@ -51,6 +51,16 @@ set_lock_configuration:
           min: 0
           max: 65535
           unit_of_measurement: sec
+    outside_handles_can_open_door_configuration:
+      required: false
+      example: [true, true, true, false]
+      selector:
+        object:
+    inside_handles_can_open_door_configuration:
+      required: false
+      example: [true, true, true, false]
+      selector:
+        object:
     auto_relock_time:
       required: false
       example: 1
diff --git a/homeassistant/components/zwave_js/strings.json b/homeassistant/components/zwave_js/strings.json
index 28789bbf9f4..ca7d5153e6e 100644
--- a/homeassistant/components/zwave_js/strings.json
+++ b/homeassistant/components/zwave_js/strings.json
@@ -523,6 +523,10 @@
           "description": "Duration in seconds the latch stays retracted.",
           "name": "Hold and release time"
         },
+        "inside_handles_can_open_door_configuration": {
+          "description": "A list of four booleans which indicate which inside handles can open the door.",
+          "name": "Inside handles can open door configuration"
+        },
         "lock_timeout": {
           "description": "Seconds until lock mode times out. Should only be used if operation type is `timed`.",
           "name": "Lock timeout"
@@ -531,6 +535,10 @@
           "description": "The operation type of the lock.",
           "name": "Operation Type"
         },
+        "outside_handles_can_open_door_configuration": {
+          "description": "A list of four booleans which indicate which outside handles can open the door.",
+          "name": "Outside handles can open door configuration"
+        },
         "twist_assist": {
           "description": "Enable Twist Assist.",
           "name": "Twist assist"
diff --git a/homeassistant/components/zwave_js/update.py b/homeassistant/components/zwave_js/update.py
index d060abe007d..02c59d220e1 100644
--- a/homeassistant/components/zwave_js/update.py
+++ b/homeassistant/components/zwave_js/update.py
@@ -155,8 +155,7 @@ class ZWaveNodeFirmwareUpdate(UpdateEntity):
         progress: NodeFirmwareUpdateProgress = event["firmware_update_progress"]
         if not self._latest_version_firmware:
             return
-        self._attr_in_progress = True
-        self._attr_update_percentage = int(progress.progress)
+        self._attr_in_progress = int(progress.progress)
         self.async_write_ha_state()
 
     @callback
@@ -182,7 +181,6 @@ class ZWaveNodeFirmwareUpdate(UpdateEntity):
         self._result = None
         self._finished_event.clear()
         self._attr_in_progress = False
-        self._attr_update_percentage = None
         if write_state:
             self.async_write_ha_state()
 
@@ -269,7 +267,6 @@ class ZWaveNodeFirmwareUpdate(UpdateEntity):
         assert firmware
         self._unsub_firmware_events_and_reset_progress(False)
         self._attr_in_progress = True
-        self._attr_update_percentage = None
         self.async_write_ha_state()
 
         self._progress_unsub = self.node.on(
diff --git a/homeassistant/config.py b/homeassistant/config.py
index cab4d0c7aff..9063429ca91 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -17,23 +17,62 @@ import re
 import shutil
 from types import ModuleType
 from typing import TYPE_CHECKING, Any
+from urllib.parse import urlparse
 
 from awesomeversion import AwesomeVersion
 import voluptuous as vol
 from voluptuous.humanize import MAX_VALIDATION_ERROR_ITEM_LENGTH
 from yaml.error import MarkedYAMLError
 
-from .const import CONF_PACKAGES, CONF_PLATFORM, __version__
-from .core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback
-from .core_config import _PACKAGE_DEFINITION_SCHEMA, _PACKAGES_CONFIG_SCHEMA
+from . import auth
+from .auth import mfa_modules as auth_mfa_modules, providers as auth_providers
+from .const import (
+    ATTR_ASSUMED_STATE,
+    ATTR_FRIENDLY_NAME,
+    ATTR_HIDDEN,
+    CONF_ALLOWLIST_EXTERNAL_DIRS,
+    CONF_ALLOWLIST_EXTERNAL_URLS,
+    CONF_AUTH_MFA_MODULES,
+    CONF_AUTH_PROVIDERS,
+    CONF_COUNTRY,
+    CONF_CURRENCY,
+    CONF_CUSTOMIZE,
+    CONF_CUSTOMIZE_DOMAIN,
+    CONF_CUSTOMIZE_GLOB,
+    CONF_DEBUG,
+    CONF_ELEVATION,
+    CONF_EXTERNAL_URL,
+    CONF_ID,
+    CONF_INTERNAL_URL,
+    CONF_LANGUAGE,
+    CONF_LATITUDE,
+    CONF_LEGACY_TEMPLATES,
+    CONF_LONGITUDE,
+    CONF_MEDIA_DIRS,
+    CONF_NAME,
+    CONF_PACKAGES,
+    CONF_PLATFORM,
+    CONF_RADIUS,
+    CONF_TEMPERATURE_UNIT,
+    CONF_TIME_ZONE,
+    CONF_TYPE,
+    CONF_UNIT_SYSTEM,
+    LEGACY_CONF_WHITELIST_EXTERNAL_DIRS,
+    __version__,
+)
+from .core import DOMAIN as HOMEASSISTANT_DOMAIN, ConfigSource, HomeAssistant, callback
 from .exceptions import ConfigValidationError, HomeAssistantError
-from .helpers import config_validation as cv
+from .generated.currencies import HISTORIC_CURRENCIES
+from .helpers import config_validation as cv, issue_registry as ir
+from .helpers.entity_values import EntityValues
 from .helpers.translation import async_get_exception_message
 from .helpers.typing import ConfigType
 from .loader import ComponentProtocol, Integration, IntegrationNotFound
 from .requirements import RequirementsNotFound, async_get_integration_with_requirements
 from .util.async_ import create_eager_task
+from .util.hass_dict import HassKey
 from .util.package import is_docker_env
+from .util.unit_system import get_unit_system, validate_unit_system
 from .util.yaml import SECRET_YAML, Secrets, YamlTypeError, load_yaml_dict
 from .util.yaml.objects import NodeStrClass
 
@@ -44,6 +83,7 @@ RE_ASCII = re.compile(r"\033\[[^m]*m")
 YAML_CONFIG_FILE = "configuration.yaml"
 VERSION_FILE = ".HA_VERSION"
 CONFIG_DIR_NAME = ".homeassistant"
+DATA_CUSTOMIZE: HassKey[EntityValues] = HassKey("hass_customize")
 
 AUTOMATION_CONFIG_PATH = "automations.yaml"
 SCRIPT_CONFIG_PATH = "scripts.yaml"
@@ -132,6 +172,201 @@ class IntegrationConfigInfo:
     exception_info_list: list[ConfigExceptionInfo]
 
 
+def _no_duplicate_auth_provider(
+    configs: Sequence[dict[str, Any]],
+) -> Sequence[dict[str, Any]]:
+    """No duplicate auth provider config allowed in a list.
+
+    Each type of auth provider can only have one config without optional id.
+    Unique id is required if same type of auth provider used multiple times.
+    """
+    config_keys: set[tuple[str, str | None]] = set()
+    for config in configs:
+        key = (config[CONF_TYPE], config.get(CONF_ID))
+        if key in config_keys:
+            raise vol.Invalid(
+                f"Duplicate auth provider {config[CONF_TYPE]} found. "
+                "Please add unique IDs "
+                "if you want to have the same auth provider twice"
+            )
+        config_keys.add(key)
+    return configs
+
+
+def _no_duplicate_auth_mfa_module(
+    configs: Sequence[dict[str, Any]],
+) -> Sequence[dict[str, Any]]:
+    """No duplicate auth mfa module item allowed in a list.
+
+    Each type of mfa module can only have one config without optional id.
+    A global unique id is required if same type of mfa module used multiple
+    times.
+    Note: this is different than auth provider
+    """
+    config_keys: set[str] = set()
+    for config in configs:
+        key = config.get(CONF_ID, config[CONF_TYPE])
+        if key in config_keys:
+            raise vol.Invalid(
+                f"Duplicate mfa module {config[CONF_TYPE]} found. "
+                "Please add unique IDs "
+                "if you want to have the same mfa module twice"
+            )
+        config_keys.add(key)
+    return configs
+
+
+def _filter_bad_internal_external_urls(conf: dict) -> dict:
+    """Filter internal/external URL with a path."""
+    for key in CONF_INTERNAL_URL, CONF_EXTERNAL_URL:
+        if key in conf and urlparse(conf[key]).path not in ("", "/"):
+            # We warn but do not fix, because if this was incorrectly configured,
+            # adjusting this value might impact security.
+            _LOGGER.warning(
+                "Invalid %s set. It's not allowed to have a path (/bla)", key
+            )
+
+    return conf
+
+
+# Schema for all packages element
+PACKAGES_CONFIG_SCHEMA = vol.Schema({cv.string: vol.Any(dict, list)})
+
+# Schema for individual package definition
+PACKAGE_DEFINITION_SCHEMA = vol.Schema({cv.string: vol.Any(dict, list, None)})
+
+CUSTOMIZE_DICT_SCHEMA = vol.Schema(
+    {
+        vol.Optional(ATTR_FRIENDLY_NAME): cv.string,
+        vol.Optional(ATTR_HIDDEN): cv.boolean,
+        vol.Optional(ATTR_ASSUMED_STATE): cv.boolean,
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+CUSTOMIZE_CONFIG_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_CUSTOMIZE, default={}): vol.Schema(
+            {cv.entity_id: CUSTOMIZE_DICT_SCHEMA}
+        ),
+        vol.Optional(CONF_CUSTOMIZE_DOMAIN, default={}): vol.Schema(
+            {cv.string: CUSTOMIZE_DICT_SCHEMA}
+        ),
+        vol.Optional(CONF_CUSTOMIZE_GLOB, default={}): vol.Schema(
+            {cv.string: CUSTOMIZE_DICT_SCHEMA}
+        ),
+    }
+)
+
+
+def _raise_issue_if_historic_currency(hass: HomeAssistant, currency: str) -> None:
+    if currency not in HISTORIC_CURRENCIES:
+        ir.async_delete_issue(hass, HOMEASSISTANT_DOMAIN, "historic_currency")
+        return
+
+    ir.async_create_issue(
+        hass,
+        HOMEASSISTANT_DOMAIN,
+        "historic_currency",
+        is_fixable=False,
+        learn_more_url="homeassistant://config/general",
+        severity=ir.IssueSeverity.WARNING,
+        translation_key="historic_currency",
+        translation_placeholders={"currency": currency},
+    )
+
+
+def _raise_issue_if_no_country(hass: HomeAssistant, country: str | None) -> None:
+    if country is not None:
+        ir.async_delete_issue(hass, HOMEASSISTANT_DOMAIN, "country_not_configured")
+        return
+
+    ir.async_create_issue(
+        hass,
+        HOMEASSISTANT_DOMAIN,
+        "country_not_configured",
+        is_fixable=False,
+        learn_more_url="homeassistant://config/general",
+        severity=ir.IssueSeverity.WARNING,
+        translation_key="country_not_configured",
+    )
+
+
+def _validate_currency(data: Any) -> Any:
+    try:
+        return cv.currency(data)
+    except vol.InInvalid:
+        with suppress(vol.InInvalid):
+            return cv.historic_currency(data)
+        raise
+
+
+CORE_CONFIG_SCHEMA = vol.All(
+    CUSTOMIZE_CONFIG_SCHEMA.extend(
+        {
+            CONF_NAME: vol.Coerce(str),
+            CONF_LATITUDE: cv.latitude,
+            CONF_LONGITUDE: cv.longitude,
+            CONF_ELEVATION: vol.Coerce(int),
+            CONF_RADIUS: cv.positive_int,
+            vol.Remove(CONF_TEMPERATURE_UNIT): cv.temperature_unit,
+            CONF_UNIT_SYSTEM: validate_unit_system,
+            CONF_TIME_ZONE: cv.time_zone,
+            vol.Optional(CONF_INTERNAL_URL): cv.url,
+            vol.Optional(CONF_EXTERNAL_URL): cv.url,
+            vol.Optional(CONF_ALLOWLIST_EXTERNAL_DIRS): vol.All(
+                cv.ensure_list, [vol.IsDir()]
+            ),
+            vol.Optional(LEGACY_CONF_WHITELIST_EXTERNAL_DIRS): vol.All(
+                cv.ensure_list, [vol.IsDir()]
+            ),
+            vol.Optional(CONF_ALLOWLIST_EXTERNAL_URLS): vol.All(
+                cv.ensure_list, [cv.url]
+            ),
+            vol.Optional(CONF_PACKAGES, default={}): PACKAGES_CONFIG_SCHEMA,
+            vol.Optional(CONF_AUTH_PROVIDERS): vol.All(
+                cv.ensure_list,
+                [
+                    auth_providers.AUTH_PROVIDER_SCHEMA.extend(
+                        {
+                            CONF_TYPE: vol.NotIn(
+                                ["insecure_example"],
+                                (
+                                    "The insecure_example auth provider"
+                                    " is for testing only."
+                                ),
+                            )
+                        }
+                    )
+                ],
+                _no_duplicate_auth_provider,
+            ),
+            vol.Optional(CONF_AUTH_MFA_MODULES): vol.All(
+                cv.ensure_list,
+                [
+                    auth_mfa_modules.MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend(
+                        {
+                            CONF_TYPE: vol.NotIn(
+                                ["insecure_example"],
+                                "The insecure_example mfa module is for testing only.",
+                            )
+                        }
+                    )
+                ],
+                _no_duplicate_auth_mfa_module,
+            ),
+            vol.Optional(CONF_MEDIA_DIRS): cv.schema_with_slug_keys(vol.IsDir()),
+            vol.Remove(CONF_LEGACY_TEMPLATES): cv.boolean,
+            vol.Optional(CONF_CURRENCY): _validate_currency,
+            vol.Optional(CONF_COUNTRY): cv.country,
+            vol.Optional(CONF_LANGUAGE): cv.language,
+            vol.Optional(CONF_DEBUG): cv.boolean,
+        }
+    ),
+    _filter_bad_internal_external_urls,
+)
+
+
 def get_default_config_dir() -> str:
     """Put together the default configuration directory based on the OS."""
     data_dir = os.path.expanduser("~")
@@ -577,6 +812,131 @@ def format_schema_error(
     return humanize_error(hass, exc, domain, config, link)
 
 
+async def async_process_ha_core_config(hass: HomeAssistant, config: dict) -> None:
+    """Process the [homeassistant] section from the configuration.
+
+    This method is a coroutine.
+    """
+    # CORE_CONFIG_SCHEMA is not async safe since it uses vol.IsDir
+    # so we need to run it in an executor job.
+    config = await hass.async_add_executor_job(CORE_CONFIG_SCHEMA, config)
+
+    # Only load auth during startup.
+    if not hasattr(hass, "auth"):
+        if (auth_conf := config.get(CONF_AUTH_PROVIDERS)) is None:
+            auth_conf = [{"type": "homeassistant"}]
+
+        mfa_conf = config.get(
+            CONF_AUTH_MFA_MODULES,
+            [{"type": "totp", "id": "totp", "name": "Authenticator app"}],
+        )
+
+        setattr(
+            hass, "auth", await auth.auth_manager_from_config(hass, auth_conf, mfa_conf)
+        )
+
+    await hass.config.async_load()
+
+    hac = hass.config
+
+    if any(
+        k in config
+        for k in (
+            CONF_LATITUDE,
+            CONF_LONGITUDE,
+            CONF_NAME,
+            CONF_ELEVATION,
+            CONF_TIME_ZONE,
+            CONF_UNIT_SYSTEM,
+            CONF_EXTERNAL_URL,
+            CONF_INTERNAL_URL,
+            CONF_CURRENCY,
+            CONF_COUNTRY,
+            CONF_LANGUAGE,
+            CONF_RADIUS,
+        )
+    ):
+        hac.config_source = ConfigSource.YAML
+
+    for key, attr in (
+        (CONF_LATITUDE, "latitude"),
+        (CONF_LONGITUDE, "longitude"),
+        (CONF_NAME, "location_name"),
+        (CONF_ELEVATION, "elevation"),
+        (CONF_INTERNAL_URL, "internal_url"),
+        (CONF_EXTERNAL_URL, "external_url"),
+        (CONF_MEDIA_DIRS, "media_dirs"),
+        (CONF_CURRENCY, "currency"),
+        (CONF_COUNTRY, "country"),
+        (CONF_LANGUAGE, "language"),
+        (CONF_RADIUS, "radius"),
+    ):
+        if key in config:
+            setattr(hac, attr, config[key])
+
+    if config.get(CONF_DEBUG):
+        hac.debug = True
+
+    _raise_issue_if_historic_currency(hass, hass.config.currency)
+    _raise_issue_if_no_country(hass, hass.config.country)
+
+    if CONF_TIME_ZONE in config:
+        await hac.async_set_time_zone(config[CONF_TIME_ZONE])
+
+    if CONF_MEDIA_DIRS not in config:
+        if is_docker_env():
+            hac.media_dirs = {"local": "/media"}
+        else:
+            hac.media_dirs = {"local": hass.config.path("media")}
+
+    # Init whitelist external dir
+    hac.allowlist_external_dirs = {hass.config.path("www"), *hac.media_dirs.values()}
+    if CONF_ALLOWLIST_EXTERNAL_DIRS in config:
+        hac.allowlist_external_dirs.update(set(config[CONF_ALLOWLIST_EXTERNAL_DIRS]))
+
+    elif LEGACY_CONF_WHITELIST_EXTERNAL_DIRS in config:
+        _LOGGER.warning(
+            "Key %s has been replaced with %s. Please update your config",
+            LEGACY_CONF_WHITELIST_EXTERNAL_DIRS,
+            CONF_ALLOWLIST_EXTERNAL_DIRS,
+        )
+        hac.allowlist_external_dirs.update(
+            set(config[LEGACY_CONF_WHITELIST_EXTERNAL_DIRS])
+        )
+
+    # Init whitelist external URL list – make sure to add / to every URL that doesn't
+    # already have it so that we can properly test "path ownership"
+    if CONF_ALLOWLIST_EXTERNAL_URLS in config:
+        hac.allowlist_external_urls.update(
+            url if url.endswith("/") else f"{url}/"
+            for url in config[CONF_ALLOWLIST_EXTERNAL_URLS]
+        )
+
+    # Customize
+    cust_exact = dict(config[CONF_CUSTOMIZE])
+    cust_domain = dict(config[CONF_CUSTOMIZE_DOMAIN])
+    cust_glob = OrderedDict(config[CONF_CUSTOMIZE_GLOB])
+
+    for name, pkg in config[CONF_PACKAGES].items():
+        if (pkg_cust := pkg.get(HOMEASSISTANT_DOMAIN)) is None:
+            continue
+
+        try:
+            pkg_cust = CUSTOMIZE_CONFIG_SCHEMA(pkg_cust)
+        except vol.Invalid:
+            _LOGGER.warning("Package %s contains invalid customize", name)
+            continue
+
+        cust_exact.update(pkg_cust[CONF_CUSTOMIZE])
+        cust_domain.update(pkg_cust[CONF_CUSTOMIZE_DOMAIN])
+        cust_glob.update(pkg_cust[CONF_CUSTOMIZE_GLOB])
+
+    hass.data[DATA_CUSTOMIZE] = EntityValues(cust_exact, cust_domain, cust_glob)
+
+    if CONF_UNIT_SYSTEM in config:
+        hac.units = get_unit_system(config[CONF_UNIT_SYSTEM])
+
+
 def _log_pkg_error(
     hass: HomeAssistant, package: str, component: str | None, config: dict, message: str
 ) -> None:
@@ -641,7 +1001,7 @@ def _identify_config_schema(module: ComponentProtocol) -> str | None:
 def _validate_package_definition(name: str, conf: Any) -> None:
     """Validate basic package definition properties."""
     cv.slug(name)
-    _PACKAGE_DEFINITION_SCHEMA(conf)
+    PACKAGE_DEFINITION_SCHEMA(conf)
 
 
 def _recursive_merge(conf: dict[str, Any], package: dict[str, Any]) -> str | None:
@@ -680,7 +1040,7 @@ async def merge_packages_config(
     vol.Invalid if whole package config is invalid.
     """
 
-    _PACKAGES_CONFIG_SCHEMA(packages)
+    PACKAGES_CONFIG_SCHEMA(packages)
 
     invalid_packages = []
     for pack_name, pack_conf in packages.items():
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index f1748c6b7fb..c1815df87bf 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -27,16 +27,10 @@ from typing import TYPE_CHECKING, Any, Generic, Self, cast
 from async_interrupt import interrupt
 from propcache import cached_property
 from typing_extensions import TypeVar
-import voluptuous as vol
 
 from . import data_entry_flow, loader
 from .components import persistent_notification
-from .const import (
-    CONF_NAME,
-    EVENT_HOMEASSISTANT_STARTED,
-    EVENT_HOMEASSISTANT_STOP,
-    Platform,
-)
+from .const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP, Platform
 from .core import (
     CALLBACK_TYPE,
     DOMAIN as HOMEASSISTANT_DOMAIN,
@@ -63,7 +57,7 @@ from .helpers.event import (
     RANDOM_MICROSECOND_MIN,
     async_call_later,
 )
-from .helpers.frame import ReportBehavior, report, report_usage
+from .helpers.frame import report
 from .helpers.json import json_bytes, json_bytes_sorted, json_fragment
 from .helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType, UndefinedType
 from .loader import async_suggest_report_issue
@@ -84,10 +78,10 @@ from .util.enum import try_parse_enum
 if TYPE_CHECKING:
     from .components.bluetooth import BluetoothServiceInfoBleak
     from .components.dhcp import DhcpServiceInfo
+    from .components.hassio import HassioServiceInfo
     from .components.ssdp import SsdpServiceInfo
     from .components.usb import UsbServiceInfo
     from .components.zeroconf import ZeroconfServiceInfo
-    from .helpers.service_info.hassio import HassioServiceInfo
     from .helpers.service_info.mqtt import MqttServiceInfo
 
 
@@ -129,9 +123,6 @@ SAVE_DELAY = 1
 
 DISCOVERY_COOLDOWN = 1
 
-ISSUE_UNIQUE_ID_COLLISION = "config_entry_unique_id_collision"
-UNIQUE_ID_COLLISION_TITLE_LIMIT = 5
-
 _DataT = TypeVar("_DataT", default=Any)
 
 
@@ -1260,31 +1251,14 @@ class ConfigEntriesFlowManager(
         if not context or "source" not in context:
             raise KeyError("Context not set or doesn't have a source set")
 
-        # reauth/reconfigure flows should be linked to a config entry
-        if (source := context["source"]) in {
-            SOURCE_REAUTH,
-            SOURCE_RECONFIGURE,
-        } and "entry_id" not in context:
-            # Deprecated in 2024.12, should fail in 2025.12
-            report(
-                f"initialises a {source} flow without a link to the config entry",
-                error_if_integration=False,
-                error_if_core=True,
-            )
-
         flow_id = ulid_util.ulid_now()
 
         # Avoid starting a config flow on an integration that only supports
         # a single config entry, but which already has an entry
         if (
-            source not in {SOURCE_IGNORE, SOURCE_REAUTH, SOURCE_RECONFIGURE}
-            and (
-                self.config_entries.async_has_entries(handler, include_ignore=False)
-                or (
-                    self.config_entries.async_has_entries(handler, include_ignore=True)
-                    and source != SOURCE_USER
-                )
-            )
+            context.get("source")
+            not in {SOURCE_IGNORE, SOURCE_REAUTH, SOURCE_RECONFIGURE}
+            and self.config_entries.async_has_entries(handler, include_ignore=False)
             and await _support_single_config_entry_only(self.hass, handler)
         ):
             return ConfigFlowResult(
@@ -1297,7 +1271,7 @@ class ConfigEntriesFlowManager(
 
         loop = self.hass.loop
 
-        if source == SOURCE_IMPORT:
+        if context["source"] == SOURCE_IMPORT:
             self._pending_import_flows[handler][flow_id] = loop.create_future()
 
         cancel_init_future = loop.create_future()
@@ -1463,7 +1437,6 @@ class ConfigEntriesFlowManager(
                 or progress_unique_id == DEFAULT_DISCOVERY_UNIQUE_ID
             ):
                 self.async_abort(progress_flow_id)
-                continue
 
             # Abort any flows in progress for the same handler
             # when integration allows only one config entry
@@ -1507,14 +1480,10 @@ class ConfigEntriesFlowManager(
             version=result["version"],
         )
 
-        if existing_entry is not None:
-            # Unload and remove the existing entry
-            await self.config_entries._async_remove(existing_entry.entry_id)  # noqa: SLF001
         await self.config_entries.async_add(entry)
 
         if existing_entry is not None:
-            # Clean up devices and entities belonging to the existing entry
-            self.config_entries._async_clean_up(existing_entry)  # noqa: SLF001
+            await self.config_entries.async_remove(existing_entry.entry_id)
 
         result["result"] = entry
         return result
@@ -1630,7 +1599,6 @@ class ConfigEntryItems(UserDict[str, ConfigEntry]):
     def __setitem__(self, entry_id: str, entry: ConfigEntry) -> None:
         """Add an item."""
         data = self.data
-        self.check_unique_id(entry)
         if entry_id in data:
             # This is likely a bug in a test that is adding the same entry twice.
             # In the future, once we have fixed the tests, this will raise HomeAssistantError.
@@ -1639,49 +1607,34 @@ class ConfigEntryItems(UserDict[str, ConfigEntry]):
         data[entry_id] = entry
         self._index_entry(entry)
 
-    def check_unique_id(self, entry: ConfigEntry) -> None:
-        """Check config entry unique id.
-
-        For a string unique id (this is the correct case): return
-        For a hashable non string unique id: log warning
-        For a non-hashable unique id: raise error
-        """
-        if (unique_id := entry.unique_id) is None:
-            return
-        if isinstance(unique_id, str):
-            # Unique id should be a string
-            return
-        if isinstance(unique_id, Hashable):  # type: ignore[unreachable]
-            # Checks for other non-string was added in HA Core 2024.10
-            # In HA Core 2025.10, we should remove the error and instead fail
-            report_issue = async_suggest_report_issue(
-                self._hass, integration_domain=entry.domain
-            )
-            _LOGGER.error(
-                (
-                    "Config entry '%s' from integration %s has an invalid unique_id"
-                    " '%s' of type %s when a string is expected, please %s"
-                ),
-                entry.title,
-                entry.domain,
-                entry.unique_id,
-                type(entry.unique_id).__name__,
-                report_issue,
-            )
-        else:
-            # Guard against integrations using unhashable unique_id
-            # In HA Core 2024.11, the guard was changed from warning to failing
-            raise HomeAssistantError(
-                f"The entry unique id {unique_id} is not a string."
-            )
-
     def _index_entry(self, entry: ConfigEntry) -> None:
         """Index an entry."""
-        self.check_unique_id(entry)
         self._domain_index.setdefault(entry.domain, []).append(entry)
         if entry.unique_id is not None:
+            unique_id_hash = entry.unique_id
+            if not isinstance(entry.unique_id, str):
+                # Guard against integrations using unhashable unique_id
+                # In HA Core 2024.9, we should remove the guard and instead fail
+                if not isinstance(entry.unique_id, Hashable):  # type: ignore[unreachable]
+                    unique_id_hash = str(entry.unique_id)
+                # Checks for other non-string was added in HA Core 2024.10
+                # In HA Core 2025.10, we should remove the error and instead fail
+                report_issue = async_suggest_report_issue(
+                    self._hass, integration_domain=entry.domain
+                )
+                _LOGGER.error(
+                    (
+                        "Config entry '%s' from integration %s has an invalid unique_id"
+                        " '%s', please %s"
+                    ),
+                    entry.title,
+                    entry.domain,
+                    entry.unique_id,
+                    report_issue,
+                )
+
             self._domain_unique_id_index.setdefault(entry.domain, {}).setdefault(
-                entry.unique_id, []
+                unique_id_hash, []
             ).append(entry)
 
     def _unindex_entry(self, entry_id: str) -> None:
@@ -1692,6 +1645,9 @@ class ConfigEntryItems(UserDict[str, ConfigEntry]):
         if not self._domain_index[domain]:
             del self._domain_index[domain]
         if (unique_id := entry.unique_id) is not None:
+            # Check type first to avoid expensive isinstance call
+            if type(unique_id) is not str and not isinstance(unique_id, Hashable):  # noqa: E721
+                unique_id = str(entry.unique_id)  # type: ignore[unreachable]
             self._domain_unique_id_index[domain][unique_id].remove(entry)
             if not self._domain_unique_id_index[domain][unique_id]:
                 del self._domain_unique_id_index[domain][unique_id]
@@ -1710,7 +1666,6 @@ class ConfigEntryItems(UserDict[str, ConfigEntry]):
         """
         entry_id = entry.entry_id
         self._unindex_entry(entry_id)
-        self.check_unique_id(entry)
         object.__setattr__(entry, "unique_id", new_unique_id)
         self._index_entry(entry)
         entry.clear_state_cache()
@@ -1724,12 +1679,9 @@ class ConfigEntryItems(UserDict[str, ConfigEntry]):
         self, domain: str, unique_id: str
     ) -> ConfigEntry | None:
         """Get entry by domain and unique id."""
-        if unique_id is None:
-            return None  # type: ignore[unreachable]
-        if not isinstance(unique_id, Hashable):
-            raise HomeAssistantError(
-                f"The entry unique id {unique_id} is not a string."
-            )
+        # Check type first to avoid expensive isinstance call
+        if type(unique_id) is not str and not isinstance(unique_id, Hashable):  # noqa: E721
+            unique_id = str(unique_id)  # type: ignore[unreachable]
         entries = self._domain_unique_id_index.get(domain, {}).get(unique_id)
         if not entries:
             return None
@@ -1898,27 +1850,12 @@ class ConfigEntries:
             )
 
         self._entries[entry.entry_id] = entry
-        self.async_update_issues()
         self._async_dispatch(ConfigEntryChange.ADDED, entry)
         await self.async_setup(entry.entry_id)
         self._async_schedule_save()
 
     async def async_remove(self, entry_id: str) -> dict[str, Any]:
-        """Remove, unload and clean up after an entry."""
-        unload_success, entry = await self._async_remove(entry_id)
-        self._async_clean_up(entry)
-
-        for discovery_domain in entry.discovery_keys:
-            async_dispatcher_send_internal(
-                self.hass,
-                signal_discovered_config_entry_removed(discovery_domain),
-                entry,
-            )
-
-        return {"require_restart": not unload_success}
-
-    async def _async_remove(self, entry_id: str) -> tuple[bool, ConfigEntry]:
-        """Remove and unload an entry."""
+        """Remove an entry."""
         if (entry := self.async_get_entry(entry_id)) is None:
             raise UnknownEntry
 
@@ -1931,16 +1868,8 @@ class ConfigEntries:
             await entry.async_remove(self.hass)
 
             del self._entries[entry.entry_id]
-            self.async_update_issues()
             self._async_schedule_save()
 
-        return (unload_success, entry)
-
-    @callback
-    def _async_clean_up(self, entry: ConfigEntry) -> None:
-        """Clean up after an entry."""
-        entry_id = entry.entry_id
-
         dev_reg = device_registry.async_get(self.hass)
         ent_reg = entity_registry.async_get(self.hass)
 
@@ -1959,6 +1888,13 @@ class ConfigEntries:
                 ir.async_delete_issue(self.hass, HOMEASSISTANT_DOMAIN, issue_id)
 
         self._async_dispatch(ConfigEntryChange.REMOVED, entry)
+        for discovery_domain in entry.discovery_keys:
+            async_dispatcher_send_internal(
+                self.hass,
+                signal_discovered_config_entry_removed(discovery_domain),
+                entry,
+            )
+        return {"require_restart": not unload_success}
 
     @callback
     def _async_shutdown(self, event: Event) -> None:
@@ -2006,7 +1942,6 @@ class ConfigEntries:
             entries[entry_id] = config_entry
 
         self._entries = entries
-        self.async_update_issues()
 
     async def async_setup(self, entry_id: str, _lock: bool = True) -> bool:
         """Set up a config entry.
@@ -2176,12 +2111,7 @@ class ConfigEntries:
         if unique_id is not UNDEFINED and entry.unique_id != unique_id:
             # Deprecated in 2024.11, should fail in 2025.11
             if (
-                # flipr creates duplicates during migration, and asks users to
-                # remove the duplicate. We don't need warn about it here too.
-                # We should remove the special case for "flipr" in HA Core 2025.4,
-                # when the flipr migration period ends
-                entry.domain != "flipr"
-                and unique_id is not None
+                unique_id is not None
                 and self.async_entry_for_domain_unique_id(entry.domain, unique_id)
                 is not None
             ):
@@ -2200,7 +2130,6 @@ class ConfigEntries:
                 )
             # Reindex the entry if the unique_id has changed
             self._entries.update_unique_id(entry, unique_id)
-            self.async_update_issues()
             changed = True
 
         for attr, value in (
@@ -2443,84 +2372,6 @@ class ConfigEntries:
             return False
         return entry.state is ConfigEntryState.LOADED
 
-    @callback
-    def async_update_issues(self) -> None:
-        """Update unique id collision issues."""
-        issue_registry = ir.async_get(self.hass)
-        issues: set[str] = set()
-
-        for issue in issue_registry.issues.values():
-            if (
-                issue.domain != HOMEASSISTANT_DOMAIN
-                or not (issue_data := issue.data)
-                or issue_data.get("issue_type") != ISSUE_UNIQUE_ID_COLLISION
-            ):
-                continue
-            issues.add(issue.issue_id)
-
-        for domain, unique_ids in self._entries._domain_unique_id_index.items():  # noqa: SLF001
-            # flipr creates duplicates during migration, and asks users to
-            # remove the duplicate. We don't need warn about it here too.
-            # We should remove the special case for "flipr" in HA Core 2025.4,
-            # when the flipr migration period ends
-            if domain == "flipr":
-                continue
-            for unique_id, entries in unique_ids.items():
-                # We might mutate the list of entries, so we need a copy to not mess up
-                # the index
-                entries = list(entries)
-
-                # There's no need to raise an issue for ignored entries, we can
-                # safely remove them once we no longer allow unique id collisions.
-                # Iterate over a copy of the copy to allow mutating while iterating
-                for entry in list(entries):
-                    if entry.source == SOURCE_IGNORE:
-                        entries.remove(entry)
-
-                if len(entries) < 2:
-                    continue
-                issue_id = f"{ISSUE_UNIQUE_ID_COLLISION}_{domain}_{unique_id}"
-                issues.discard(issue_id)
-                titles = [f"'{entry.title}'" for entry in entries]
-                translation_placeholders = {
-                    "domain": domain,
-                    "configure_url": f"/config/integrations/integration/{domain}",
-                    "unique_id": str(unique_id),
-                }
-                if len(titles) <= UNIQUE_ID_COLLISION_TITLE_LIMIT:
-                    translation_key = "config_entry_unique_id_collision"
-                    translation_placeholders["titles"] = ", ".join(titles)
-                else:
-                    translation_key = "config_entry_unique_id_collision_many"
-                    translation_placeholders["number_of_entries"] = str(len(titles))
-                    translation_placeholders["titles"] = ", ".join(
-                        titles[:UNIQUE_ID_COLLISION_TITLE_LIMIT]
-                    )
-                    translation_placeholders["title_limit"] = str(
-                        UNIQUE_ID_COLLISION_TITLE_LIMIT
-                    )
-
-                ir.async_create_issue(
-                    self.hass,
-                    HOMEASSISTANT_DOMAIN,
-                    issue_id,
-                    breaks_in_ha_version="2025.11.0",
-                    data={
-                        "issue_type": ISSUE_UNIQUE_ID_COLLISION,
-                        "unique_id": unique_id,
-                    },
-                    is_fixable=False,
-                    issue_domain=domain,
-                    severity=ir.IssueSeverity.ERROR,
-                    translation_key=translation_key,
-                    translation_placeholders=translation_placeholders,
-                )
-
-                break  # Only create one issue per domain
-
-        for issue_id in issues:
-            ir.async_delete_issue(self.hass, HOMEASSISTANT_DOMAIN, issue_id)
-
 
 @callback
 def _async_abort_entries_match(
@@ -2963,38 +2814,6 @@ class ConfigFlow(ConfigEntryBaseFlow):
                 reason = "reconfigure_successful"
         return self.async_abort(reason=reason)
 
-    @callback
-    def async_show_form(
-        self,
-        *,
-        step_id: str | None = None,
-        data_schema: vol.Schema | None = None,
-        errors: dict[str, str] | None = None,
-        description_placeholders: Mapping[str, str | None] | None = None,
-        last_step: bool | None = None,
-        preview: str | None = None,
-    ) -> ConfigFlowResult:
-        """Return the definition of a form to gather user input.
-
-        The step_id parameter is deprecated and will be removed in a future release.
-        """
-        if self.source == SOURCE_REAUTH and "entry_id" in self.context:
-            # If the integration does not provide a name for the reauth title,
-            # we append it to the description placeholders.
-            # We also need to check entry_id as some integrations bypass the
-            # reauth helpers and create a flow without it.
-            description_placeholders = dict(description_placeholders or {})
-            if description_placeholders.get(CONF_NAME) is None:
-                description_placeholders[CONF_NAME] = self._get_reauth_entry().title
-        return super().async_show_form(
-            step_id=step_id,
-            data_schema=data_schema,
-            errors=errors,
-            description_placeholders=description_placeholders,
-            last_step=last_step,
-            preview=preview,
-        )
-
     def is_matching(self, other_flow: Self) -> bool:
         """Return True if other_flow is matching this flow."""
         raise NotImplementedError
@@ -3102,9 +2921,6 @@ class OptionsFlow(ConfigEntryBaseFlow):
 
     handler: str
 
-    _config_entry: ConfigEntry
-    """For compatibility only - to be removed in 2025.12"""
-
     @callback
     def _async_abort_entries_match(
         self, match_dict: dict[str, Any] | None = None
@@ -3113,78 +2929,32 @@ class OptionsFlow(ConfigEntryBaseFlow):
 
         Requires `already_configured` in strings.json in user visible flows.
         """
+
+        config_entry = cast(
+            ConfigEntry, self.hass.config_entries.async_get_entry(self.handler)
+        )
         _async_abort_entries_match(
             [
                 entry
-                for entry in self.hass.config_entries.async_entries(
-                    self.config_entry.domain
-                )
-                if entry is not self.config_entry and entry.source != SOURCE_IGNORE
+                for entry in self.hass.config_entries.async_entries(config_entry.domain)
+                if entry is not config_entry and entry.source != SOURCE_IGNORE
             ],
             match_dict,
         )
 
-    @property
-    def _config_entry_id(self) -> str:
-        """Return config entry id.
-
-        Please note that this is not available inside `__init__` method, and
-        can only be referenced after initialisation.
-        """
-        # This is the same as handler, but that's an implementation detail
-        if self.handler is None:
-            raise ValueError(
-                "The config entry id is not available during initialisation"
-            )
-        return self.handler
-
-    @property
-    def config_entry(self) -> ConfigEntry:
-        """Return the config entry linked to the current options flow.
-
-        Please note that this is not available inside `__init__` method, and
-        can only be referenced after initialisation.
-        """
-        # For compatibility only - to be removed in 2025.12
-        if hasattr(self, "_config_entry"):
-            return self._config_entry
-
-        if self.hass is None:
-            raise ValueError("The config entry is not available during initialisation")
-        if entry := self.hass.config_entries.async_get_entry(self._config_entry_id):
-            return entry
-        raise UnknownEntry
-
-    @config_entry.setter
-    def config_entry(self, value: ConfigEntry) -> None:
-        """Set the config entry value."""
-        report_usage(
-            "sets option flow config_entry explicitly, which is deprecated "
-            "and will stop working in 2025.12",
-            core_behavior=ReportBehavior.ERROR,
-            core_integration_behavior=ReportBehavior.ERROR,
-            custom_integration_behavior=ReportBehavior.LOG,
-        )
-        self._config_entry = value
-
 
 class OptionsFlowWithConfigEntry(OptionsFlow):
-    """Base class for options flows with config entry and options.
-
-    This class is being phased out, and should not be referenced in new code.
-    It is kept only for backward compatibility, and only for custom integrations.
-    """
+    """Base class for options flows with config entry and options."""
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""
         self._config_entry = config_entry
         self._options = deepcopy(dict(config_entry.options))
-        report_usage(
-            "inherits from OptionsFlowWithConfigEntry",
-            core_behavior=ReportBehavior.ERROR,
-            core_integration_behavior=ReportBehavior.ERROR,
-            custom_integration_behavior=ReportBehavior.IGNORE,
-        )
+
+    @property
+    def config_entry(self) -> ConfigEntry:
+        """Return the config entry."""
+        return self._config_entry
 
     @property
     def options(self) -> dict[str, Any]:
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 4082a076b94..33c4f228430 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -24,14 +24,14 @@ if TYPE_CHECKING:
 
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2024
-MINOR_VERSION: Final = 12
+MINOR_VERSION: Final = 11
 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, 12, 0)
-REQUIRED_NEXT_PYTHON_VER: Final[tuple[int, int, int]] = (3, 13, 0)
+REQUIRED_NEXT_PYTHON_VER: Final[tuple[int, int, int]] = (3, 12, 0)
 # Truthy date string triggers showing related deprecation warning messages.
-REQUIRED_NEXT_PYTHON_HA_RELEASE: Final = "2025.2"
+REQUIRED_NEXT_PYTHON_HA_RELEASE: Final = ""
 
 # Format for platform files
 PLATFORM_FORMAT: Final = "{platform}.{domain}"
@@ -479,6 +479,16 @@ STATE_PLAYING: Final = "playing"
 STATE_PAUSED: Final = "paused"
 STATE_IDLE: Final = "idle"
 STATE_STANDBY: Final = "standby"
+STATE_ALARM_DISARMED: Final = "disarmed"
+STATE_ALARM_ARMED_HOME: Final = "armed_home"
+STATE_ALARM_ARMED_AWAY: Final = "armed_away"
+STATE_ALARM_ARMED_NIGHT: Final = "armed_night"
+STATE_ALARM_ARMED_VACATION: Final = "armed_vacation"
+STATE_ALARM_ARMED_CUSTOM_BYPASS: Final = "armed_custom_bypass"
+STATE_ALARM_PENDING: Final = "pending"
+STATE_ALARM_ARMING: Final = "arming"
+STATE_ALARM_DISARMING: Final = "disarming"
+STATE_ALARM_TRIGGERED: Final = "triggered"
 STATE_UNAVAILABLE: Final = "unavailable"
 STATE_OK: Final = "ok"
 STATE_PROBLEM: Final = "problem"
@@ -512,60 +522,6 @@ _DEPRECATED_STATE_JAMMED: Final = DeprecatedConstant(
     "2025.10",
 )
 
-# #### ALARM CONTROL PANEL STATES ####
-# STATE_ALARM_* below are deprecated as of 2024.11
-# use the AlarmControlPanelState enum instead.
-_DEPRECATED_STATE_ALARM_DISARMED: Final = DeprecatedConstant(
-    "disarmed",
-    "AlarmControlPanelState.DISARMED",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_ARMED_HOME: Final = DeprecatedConstant(
-    "armed_home",
-    "AlarmControlPanelState.ARMED_HOME",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_ARMED_AWAY: Final = DeprecatedConstant(
-    "armed_away",
-    "AlarmControlPanelState.ARMED_AWAY",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_ARMED_NIGHT: Final = DeprecatedConstant(
-    "armed_night",
-    "AlarmControlPanelState.ARMED_NIGHT",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_ARMED_VACATION: Final = DeprecatedConstant(
-    "armed_vacation",
-    "AlarmControlPanelState.ARMED_VACATION",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_ARMED_CUSTOM_BYPASS: Final = DeprecatedConstant(
-    "armed_custom_bypass",
-    "AlarmControlPanelState.ARMED_CUSTOM_BYPASS",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_PENDING: Final = DeprecatedConstant(
-    "pending",
-    "AlarmControlPanelState.PENDING",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_ARMING: Final = DeprecatedConstant(
-    "arming",
-    "AlarmControlPanelState.ARMING",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_DISARMING: Final = DeprecatedConstant(
-    "disarming",
-    "AlarmControlPanelState.DISARMING",
-    "2025.11",
-)
-_DEPRECATED_STATE_ALARM_TRIGGERED: Final = DeprecatedConstant(
-    "triggered",
-    "AlarmControlPanelState.TRIGGERED",
-    "2025.11",
-)
-
 # #### STATE AND EVENT ATTRIBUTES ####
 # Attribution
 ATTR_ATTRIBUTION: Final = "attribution"
@@ -725,9 +681,6 @@ class UnitOfPower(StrEnum):
 
     WATT = "W"
     KILO_WATT = "kW"
-    MEGA_WATT = "MW"
-    GIGA_WATT = "GW"
-    TERA_WATT = "TW"
     BTU_PER_HOUR = "BTU/h"
 
 
@@ -773,8 +726,6 @@ class UnitOfEnergy(StrEnum):
     WATT_HOUR = "Wh"
     KILO_WATT_HOUR = "kWh"
     MEGA_WATT_HOUR = "MWh"
-    GIGA_WATT_HOUR = "GWh"
-    TERA_WATT_HOUR = "TWh"
     CALORIE = "cal"
     KILO_CALORIE = "kcal"
     MEGA_CALORIE = "Mcal"
@@ -1231,9 +1182,9 @@ class UnitOfConductivity(
     StrEnum,
     metaclass=EnumWithDeprecatedMembers,
     deprecated={
-        "SIEMENS": ("UnitOfConductivity.SIEMENS_PER_CM", "2025.11.0"),
-        "MICROSIEMENS": ("UnitOfConductivity.MICROSIEMENS_PER_CM", "2025.11.0"),
-        "MILLISIEMENS": ("UnitOfConductivity.MILLISIEMENS_PER_CM", "2025.11.0"),
+        "SIEMENS": ("SIEMENS_PER_CM", "2025.11.0"),
+        "MICROSIEMENS": ("MICROSIEMENS_PER_CM", "2025.11.0"),
+        "MILLISIEMENS": ("MILLISIEMENS_PER_CM", "2025.11.0"),
     },
 ):
     """Conductivity units."""
@@ -1358,13 +1309,6 @@ CONCENTRATION_PARTS_PER_MILLION: Final = "ppm"
 CONCENTRATION_PARTS_PER_BILLION: Final = "ppb"
 
 
-class UnitOfBloodGlucoseConcentration(StrEnum):
-    """Blood glucose concentration units."""
-
-    MILLIGRAMS_PER_DECILITER = "mg/dL"
-    MILLIMOLE_PER_LITER = "mmol/L"
-
-
 # Speed units
 class UnitOfSpeed(StrEnum):
     """Speed units."""
diff --git a/homeassistant/core.py b/homeassistant/core.py
index cdfb5570b44..82ec4956a94 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -18,12 +18,15 @@ from collections.abc import (
     ValuesView,
 )
 import concurrent.futures
+from contextlib import suppress
 from dataclasses import dataclass
 import datetime
 import enum
 import functools
 import inspect
 import logging
+import os
+import pathlib
 import re
 import threading
 import time
@@ -39,10 +42,12 @@ from typing import (
     cast,
     overload,
 )
+from urllib.parse import urlparse
 
 from propcache import cached_property, under_cached_property
 from typing_extensions import TypeVar
 import voluptuous as vol
+import yarl
 
 from . import util
 from .const import (
@@ -50,6 +55,7 @@ from .const import (
     ATTR_FRIENDLY_NAME,
     ATTR_SERVICE,
     ATTR_SERVICE_DATA,
+    BASE_PLATFORMS,
     COMPRESSED_STATE_ATTRIBUTES,
     COMPRESSED_STATE_CONTEXT,
     COMPRESSED_STATE_LAST_CHANGED,
@@ -71,6 +77,7 @@ from .const import (
     MAX_EXPECTED_ENTITY_IDS,
     MAX_LENGTH_EVENT_EVENT_TYPE,
     MAX_LENGTH_STATE_STATE,
+    UnitOfLength,
     __version__,
 )
 from .exceptions import (
@@ -83,16 +90,14 @@ from .exceptions import (
     Unauthorized,
 )
 from .helpers.deprecation import (
-    DeferredDeprecatedAlias,
     DeprecatedConstantEnum,
-    EnumWithDeprecatedMembers,
     all_with_deprecated_constants,
     check_if_deprecated_constant,
     dir_with_deprecated_constants,
 )
 from .helpers.json import json_bytes, json_fragment
-from .helpers.typing import VolSchemaType
-from .util import dt as dt_util
+from .helpers.typing import UNDEFINED, UndefinedType, VolSchemaType
+from .util import dt as dt_util, location
 from .util.async_ import (
     cancelling,
     create_eager_task,
@@ -107,11 +112,18 @@ from .util.json import JsonObjectType
 from .util.read_only_dict import ReadOnlyDict
 from .util.timeout import TimeoutManager
 from .util.ulid import ulid_at_time, ulid_now
+from .util.unit_system import (
+    _CONF_UNIT_SYSTEM_IMPERIAL,
+    _CONF_UNIT_SYSTEM_US_CUSTOMARY,
+    METRIC_SYSTEM,
+    UnitSystem,
+    get_unit_system,
+)
 
 # Typing imports that create a circular dependency
 if TYPE_CHECKING:
     from .auth import AuthManager
-    from .components.http import HomeAssistantHTTP
+    from .components.http import ApiConfig, HomeAssistantHTTP
     from .config_entries import ConfigEntries
     from .helpers.entity import StateInfo
 
@@ -125,6 +137,10 @@ _SENTINEL = object()
 _DataT = TypeVar("_DataT", bound=Mapping[str, Any], default=Mapping[str, Any])
 type CALLBACK_TYPE = Callable[[], None]
 
+CORE_STORAGE_KEY = "core.config"
+CORE_STORAGE_VERSION = 1
+CORE_STORAGE_MINOR_VERSION = 4
+
 DOMAIN = "homeassistant"
 
 # How long to wait to log tasks that are blocking
@@ -134,16 +150,7 @@ type ServiceResponse = JsonObjectType | None
 type EntityServiceResponse = dict[str, ServiceResponse]
 
 
-class ConfigSource(
-    enum.StrEnum,
-    metaclass=EnumWithDeprecatedMembers,
-    deprecated={
-        "DEFAULT": ("core_config.ConfigSource.DEFAULT", "2025.11.0"),
-        "DISCOVERED": ("core_config.ConfigSource.DISCOVERED", "2025.11.0"),
-        "STORAGE": ("core_config.ConfigSource.STORAGE", "2025.11.0"),
-        "YAML": ("core_config.ConfigSource.YAML", "2025.11.0"),
-    },
-):
+class ConfigSource(enum.StrEnum):
     """Source of core configuration."""
 
     DEFAULT = "default"
@@ -185,19 +192,6 @@ _DEPRECATED_SOURCE_STORAGE = DeprecatedConstantEnum(ConfigSource.STORAGE, "2025.
 _DEPRECATED_SOURCE_YAML = DeprecatedConstantEnum(ConfigSource.YAML, "2025.1")
 
 
-def _deprecated_core_config() -> Any:
-    # pylint: disable-next=import-outside-toplevel
-    from . import core_config
-
-    return core_config.Config
-
-
-# The Config class was moved to core_config in Home Assistant 2024.11
-_DEPRECATED_Config = DeferredDeprecatedAlias(
-    _deprecated_core_config, "homeassistant.core_config.Config", "2025.11"
-)
-
-
 # How long to wait until things that run on startup have to finish.
 TIMEOUT_EVENT_START = 15
 
@@ -437,9 +431,6 @@ class HomeAssistant:
         # pylint: disable-next=import-outside-toplevel
         from . import loader
 
-        # pylint: disable-next=import-outside-toplevel
-        from .core_config import Config
-
         # This is a dictionary that any component can store any data on.
         self.data = HassDict()
         self.loop = asyncio.get_running_loop()
@@ -656,12 +647,12 @@ class HomeAssistant:
         # late import to avoid circular imports
         from .helpers import frame  # pylint: disable=import-outside-toplevel
 
-        frame.report_usage(
+        frame.report(
             "calls `async_add_job`, which is deprecated and will be removed in Home "
             "Assistant 2025.4; Please review "
             "https://developers.home-assistant.io/blog/2024/03/13/deprecate_add_run_job"
             " for replacement options",
-            core_behavior=frame.ReportBehavior.LOG,
+            error_if_core=False,
         )
 
         if target is None:
@@ -712,12 +703,12 @@ class HomeAssistant:
         # late import to avoid circular imports
         from .helpers import frame  # pylint: disable=import-outside-toplevel
 
-        frame.report_usage(
+        frame.report(
             "calls `async_add_hass_job`, which is deprecated and will be removed in Home "
             "Assistant 2025.5; Please review "
             "https://developers.home-assistant.io/blog/2024/04/07/deprecate_add_hass_job"
             " for replacement options",
-            core_behavior=frame.ReportBehavior.LOG,
+            error_if_core=False,
         )
 
         return self._async_add_hass_job(hassjob, *args, background=background)
@@ -986,12 +977,12 @@ class HomeAssistant:
         # late import to avoid circular imports
         from .helpers import frame  # pylint: disable=import-outside-toplevel
 
-        frame.report_usage(
+        frame.report(
             "calls `async_run_job`, which is deprecated and will be removed in Home "
             "Assistant 2025.4; Please review "
             "https://developers.home-assistant.io/blog/2024/03/13/deprecate_add_run_job"
             " for replacement options",
-            core_behavior=frame.ReportBehavior.LOG,
+            error_if_core=False,
         )
 
         if asyncio.iscoroutine(target):
@@ -1635,10 +1626,10 @@ class EventBus:
             # late import to avoid circular imports
             from .helpers import frame  # pylint: disable=import-outside-toplevel
 
-            frame.report_usage(
+            frame.report(
                 "calls `async_listen` with run_immediately, which is"
                 " deprecated and will be removed in Home Assistant 2025.5",
-                core_behavior=frame.ReportBehavior.LOG,
+                error_if_core=False,
             )
 
         if event_filter is not None and not is_callback_check_partial(event_filter):
@@ -1705,10 +1696,10 @@ class EventBus:
             # late import to avoid circular imports
             from .helpers import frame  # pylint: disable=import-outside-toplevel
 
-            frame.report_usage(
+            frame.report(
                 "calls `async_listen_once` with run_immediately, which is "
                 "deprecated and will be removed in Home Assistant 2025.5",
-                core_behavior=frame.ReportBehavior.LOG,
+                error_if_core=False,
             )
 
         one_time_listener: _OneTimeListener[_DataT] = _OneTimeListener(
@@ -2852,6 +2843,452 @@ class ServiceRegistry:
         return await self._hass.async_add_executor_job(target, service_call)
 
 
+class _ComponentSet(set[str]):
+    """Set of loaded components.
+
+    This set contains both top level components and platforms.
+
+    Examples:
+    `light`, `switch`, `hue`, `mjpeg.camera`, `universal.media_player`,
+    `homeassistant.scene`
+
+    The top level components set only contains the top level components.
+
+    The all components set contains all components, including platform
+    based components.
+
+    """
+
+    def __init__(
+        self, top_level_components: set[str], all_components: set[str]
+    ) -> None:
+        """Initialize the component set."""
+        self._top_level_components = top_level_components
+        self._all_components = all_components
+
+    def add(self, component: str) -> None:
+        """Add a component to the store."""
+        if "." not in component:
+            self._top_level_components.add(component)
+            self._all_components.add(component)
+        else:
+            platform, _, domain = component.partition(".")
+            if domain in BASE_PLATFORMS:
+                self._all_components.add(platform)
+        return super().add(component)
+
+    def remove(self, component: str) -> None:
+        """Remove a component from the store."""
+        if "." in component:
+            raise ValueError("_ComponentSet does not support removing sub-components")
+        self._top_level_components.remove(component)
+        return super().remove(component)
+
+    def discard(self, component: str) -> None:
+        """Remove a component from the store."""
+        raise NotImplementedError("_ComponentSet does not support discard, use remove")
+
+
+class Config:
+    """Configuration settings for Home Assistant."""
+
+    _store: Config._ConfigStore
+
+    def __init__(self, hass: HomeAssistant, config_dir: str) -> None:
+        """Initialize a new config object."""
+        # pylint: disable-next=import-outside-toplevel
+        from .components.zone import DEFAULT_RADIUS
+
+        self.hass = hass
+
+        self.latitude: float = 0
+        self.longitude: float = 0
+
+        self.elevation: int = 0
+        """Elevation (always in meters regardless of the unit system)."""
+
+        self.radius: int = DEFAULT_RADIUS
+        """Radius of the Home Zone (always in meters regardless of the unit system)."""
+
+        self.debug: bool = False
+        self.location_name: str = "Home"
+        self.time_zone: str = "UTC"
+        self.units: UnitSystem = METRIC_SYSTEM
+        self.internal_url: str | None = None
+        self.external_url: str | None = None
+        self.currency: str = "EUR"
+        self.country: str | None = None
+        self.language: str = "en"
+
+        self.config_source: ConfigSource = ConfigSource.DEFAULT
+
+        # If True, pip install is skipped for requirements on startup
+        self.skip_pip: bool = False
+
+        # List of packages to skip when installing requirements on startup
+        self.skip_pip_packages: list[str] = []
+
+        # Set of loaded top level components
+        # This set is updated by _ComponentSet
+        # and should not be modified directly
+        self.top_level_components: set[str] = set()
+
+        # Set of all loaded components including platform
+        # based components
+        self.all_components: set[str] = set()
+
+        # Set of loaded components
+        self.components: _ComponentSet = _ComponentSet(
+            self.top_level_components, self.all_components
+        )
+
+        # API (HTTP) server configuration
+        self.api: ApiConfig | None = None
+
+        # Directory that holds the configuration
+        self.config_dir: str = config_dir
+
+        # List of allowed external dirs to access
+        self.allowlist_external_dirs: set[str] = set()
+
+        # List of allowed external URLs that integrations may use
+        self.allowlist_external_urls: set[str] = set()
+
+        # Dictionary of Media folders that integrations may use
+        self.media_dirs: dict[str, str] = {}
+
+        # If Home Assistant is running in recovery mode
+        self.recovery_mode: bool = False
+
+        # Use legacy template behavior
+        self.legacy_templates: bool = False
+
+        # If Home Assistant is running in safe mode
+        self.safe_mode: bool = False
+
+    def async_initialize(self) -> None:
+        """Finish initializing a config object.
+
+        This must be called before the config object is used.
+        """
+        self._store = self._ConfigStore(self.hass)
+
+    def distance(self, lat: float, lon: float) -> float | None:
+        """Calculate distance from Home Assistant.
+
+        Async friendly.
+        """
+        return self.units.length(
+            location.distance(self.latitude, self.longitude, lat, lon),
+            UnitOfLength.METERS,
+        )
+
+    def path(self, *path: str) -> str:
+        """Generate path to the file within the configuration directory.
+
+        Async friendly.
+        """
+        return os.path.join(self.config_dir, *path)
+
+    def is_allowed_external_url(self, url: str) -> bool:
+        """Check if an external URL is allowed."""
+        parsed_url = f"{yarl.URL(url)!s}/"
+
+        return any(
+            allowed
+            for allowed in self.allowlist_external_urls
+            if parsed_url.startswith(allowed)
+        )
+
+    def is_allowed_path(self, path: str) -> bool:
+        """Check if the path is valid for access from outside.
+
+        This function does blocking I/O and should not be called from the event loop.
+        Use hass.async_add_executor_job to schedule it on the executor.
+        """
+        assert path is not None
+
+        thepath = pathlib.Path(path)
+        try:
+            # The file path does not have to exist (it's parent should)
+            if thepath.exists():
+                thepath = thepath.resolve()
+            else:
+                thepath = thepath.parent.resolve()
+        except (FileNotFoundError, RuntimeError, PermissionError):
+            return False
+
+        for allowed_path in self.allowlist_external_dirs:
+            try:
+                thepath.relative_to(allowed_path)
+            except ValueError:
+                pass
+            else:
+                return True
+
+        return False
+
+    def as_dict(self) -> dict[str, Any]:
+        """Create a dictionary representation of the configuration.
+
+        Async friendly.
+        """
+        allowlist_external_dirs = list(self.allowlist_external_dirs)
+        return {
+            "latitude": self.latitude,
+            "longitude": self.longitude,
+            "elevation": self.elevation,
+            "unit_system": self.units.as_dict(),
+            "location_name": self.location_name,
+            "time_zone": self.time_zone,
+            "components": list(self.components),
+            "config_dir": self.config_dir,
+            # legacy, backwards compat
+            "whitelist_external_dirs": allowlist_external_dirs,
+            "allowlist_external_dirs": allowlist_external_dirs,
+            "allowlist_external_urls": list(self.allowlist_external_urls),
+            "version": __version__,
+            "config_source": self.config_source,
+            "recovery_mode": self.recovery_mode,
+            "state": self.hass.state.value,
+            "external_url": self.external_url,
+            "internal_url": self.internal_url,
+            "currency": self.currency,
+            "country": self.country,
+            "language": self.language,
+            "safe_mode": self.safe_mode,
+            "debug": self.debug,
+            "radius": self.radius,
+        }
+
+    async def async_set_time_zone(self, time_zone_str: str) -> None:
+        """Help to set the time zone."""
+        if time_zone := await dt_util.async_get_time_zone(time_zone_str):
+            self.time_zone = time_zone_str
+            dt_util.set_default_time_zone(time_zone)
+        else:
+            raise ValueError(f"Received invalid time zone {time_zone_str}")
+
+    def set_time_zone(self, time_zone_str: str) -> None:
+        """Set the time zone.
+
+        This is a legacy method that should not be used in new code.
+        Use async_set_time_zone instead.
+
+        It will be removed in Home Assistant 2025.6.
+        """
+        # report is imported here to avoid a circular import
+        from .helpers.frame import report  # pylint: disable=import-outside-toplevel
+
+        report(
+            "set the time zone using set_time_zone instead of async_set_time_zone"
+            " which will stop working in Home Assistant 2025.6",
+            error_if_core=True,
+            error_if_integration=True,
+        )
+        if time_zone := dt_util.get_time_zone(time_zone_str):
+            self.time_zone = time_zone_str
+            dt_util.set_default_time_zone(time_zone)
+        else:
+            raise ValueError(f"Received invalid time zone {time_zone_str}")
+
+    async def _async_update(
+        self,
+        *,
+        source: ConfigSource,
+        latitude: float | None = None,
+        longitude: float | None = None,
+        elevation: int | None = None,
+        unit_system: str | None = None,
+        location_name: str | None = None,
+        time_zone: str | None = None,
+        external_url: str | UndefinedType | None = UNDEFINED,
+        internal_url: str | UndefinedType | None = UNDEFINED,
+        currency: str | None = None,
+        country: str | UndefinedType | None = UNDEFINED,
+        language: str | None = None,
+        radius: int | None = None,
+    ) -> None:
+        """Update the configuration from a dictionary."""
+        self.config_source = source
+        if latitude is not None:
+            self.latitude = latitude
+        if longitude is not None:
+            self.longitude = longitude
+        if elevation is not None:
+            self.elevation = elevation
+        if unit_system is not None:
+            try:
+                self.units = get_unit_system(unit_system)
+            except ValueError:
+                self.units = METRIC_SYSTEM
+        if location_name is not None:
+            self.location_name = location_name
+        if time_zone is not None:
+            await self.async_set_time_zone(time_zone)
+        if external_url is not UNDEFINED:
+            self.external_url = external_url
+        if internal_url is not UNDEFINED:
+            self.internal_url = internal_url
+        if currency is not None:
+            self.currency = currency
+        if country is not UNDEFINED:
+            self.country = country
+        if language is not None:
+            self.language = language
+        if radius is not None:
+            self.radius = radius
+
+    async def async_update(self, **kwargs: Any) -> None:
+        """Update the configuration from a dictionary."""
+        # pylint: disable-next=import-outside-toplevel
+        from .config import (
+            _raise_issue_if_historic_currency,
+            _raise_issue_if_no_country,
+        )
+
+        await self._async_update(source=ConfigSource.STORAGE, **kwargs)
+        await self._async_store()
+        self.hass.bus.async_fire_internal(EVENT_CORE_CONFIG_UPDATE, kwargs)
+
+        _raise_issue_if_historic_currency(self.hass, self.currency)
+        _raise_issue_if_no_country(self.hass, self.country)
+
+    async def async_load(self) -> None:
+        """Load [homeassistant] core config."""
+        if not (data := await self._store.async_load()):
+            return
+
+        # In 2021.9 we fixed validation to disallow a path (because that's never
+        # correct) but this data still lives in storage, so we print a warning.
+        if data.get("external_url") and urlparse(data["external_url"]).path not in (
+            "",
+            "/",
+        ):
+            _LOGGER.warning("Invalid external_url set. It's not allowed to have a path")
+
+        if data.get("internal_url") and urlparse(data["internal_url"]).path not in (
+            "",
+            "/",
+        ):
+            _LOGGER.warning("Invalid internal_url set. It's not allowed to have a path")
+
+        await self._async_update(
+            source=ConfigSource.STORAGE,
+            latitude=data.get("latitude"),
+            longitude=data.get("longitude"),
+            elevation=data.get("elevation"),
+            unit_system=data.get("unit_system_v2"),
+            location_name=data.get("location_name"),
+            time_zone=data.get("time_zone"),
+            external_url=data.get("external_url", UNDEFINED),
+            internal_url=data.get("internal_url", UNDEFINED),
+            currency=data.get("currency"),
+            country=data.get("country"),
+            language=data.get("language"),
+            radius=data["radius"],
+        )
+
+    async def _async_store(self) -> None:
+        """Store [homeassistant] core config."""
+        data = {
+            "latitude": self.latitude,
+            "longitude": self.longitude,
+            "elevation": self.elevation,
+            # We don't want any integrations to use the name of the unit system
+            # so we are using the private attribute here
+            "unit_system_v2": self.units._name,  # noqa: SLF001
+            "location_name": self.location_name,
+            "time_zone": self.time_zone,
+            "external_url": self.external_url,
+            "internal_url": self.internal_url,
+            "currency": self.currency,
+            "country": self.country,
+            "language": self.language,
+            "radius": self.radius,
+        }
+        await self._store.async_save(data)
+
+    # Circular dependency prevents us from generating the class at top level
+    # pylint: disable-next=import-outside-toplevel
+    from .helpers.storage import Store
+
+    class _ConfigStore(Store[dict[str, Any]]):
+        """Class to help storing Config data."""
+
+        def __init__(self, hass: HomeAssistant) -> None:
+            """Initialize storage class."""
+            super().__init__(
+                hass,
+                CORE_STORAGE_VERSION,
+                CORE_STORAGE_KEY,
+                private=True,
+                atomic_writes=True,
+                minor_version=CORE_STORAGE_MINOR_VERSION,
+            )
+            self._original_unit_system: str | None = None  # from old store 1.1
+
+        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."""
+
+            # pylint: disable-next=import-outside-toplevel
+            from .components.zone import DEFAULT_RADIUS
+
+            data = old_data
+            if old_major_version == 1 and old_minor_version < 2:
+                # In 1.2, we remove support for "imperial", replaced by "us_customary"
+                # Using a new key to allow rollback
+                self._original_unit_system = data.get("unit_system")
+                data["unit_system_v2"] = self._original_unit_system
+                if data["unit_system_v2"] == _CONF_UNIT_SYSTEM_IMPERIAL:
+                    data["unit_system_v2"] = _CONF_UNIT_SYSTEM_US_CUSTOMARY
+            if old_major_version == 1 and old_minor_version < 3:
+                # In 1.3, we add the key "language", initialize it from the
+                # owner account.
+                data["language"] = "en"
+                try:
+                    owner = await self.hass.auth.async_get_owner()
+                    if owner is not None:
+                        # pylint: disable-next=import-outside-toplevel
+                        from .components.frontend import storage as frontend_store
+
+                        # pylint: disable-next=import-outside-toplevel
+                        from .helpers import config_validation as cv
+
+                        _, owner_data = await frontend_store.async_user_store(
+                            self.hass, owner.id
+                        )
+
+                        if (
+                            "language" in owner_data
+                            and "language" in owner_data["language"]
+                        ):
+                            with suppress(vol.InInvalid):
+                                data["language"] = cv.language(
+                                    owner_data["language"]["language"]
+                                )
+                # pylint: disable-next=broad-except
+                except Exception:
+                    _LOGGER.exception("Unexpected error during core config migration")
+            if old_major_version == 1 and old_minor_version < 4:
+                # In 1.4, we add the key "radius", initialize it with the default.
+                data.setdefault("radius", DEFAULT_RADIUS)
+
+            if old_major_version > 1:
+                raise NotImplementedError
+            return data
+
+        async def async_save(self, data: dict[str, Any]) -> None:
+            if self._original_unit_system:
+                data["unit_system"] = self._original_unit_system
+            return await super().async_save(data)
+
+
 # These can be removed if no deprecated constant are in this module anymore
 __getattr__ = functools.partial(check_if_deprecated_constant, module_globals=globals())
 __dir__ = functools.partial(
diff --git a/homeassistant/core_config.py b/homeassistant/core_config.py
deleted file mode 100644
index 5c773c57bc4..00000000000
--- a/homeassistant/core_config.py
+++ /dev/null
@@ -1,891 +0,0 @@
-"""Module to help with parsing and generating configuration files."""
-
-from __future__ import annotations
-
-from collections import OrderedDict
-from collections.abc import Sequence
-from contextlib import suppress
-import enum
-import logging
-import os
-import pathlib
-from typing import TYPE_CHECKING, Any, Final
-from urllib.parse import urlparse
-
-import voluptuous as vol
-from webrtc_models import RTCConfiguration, RTCIceServer
-import yarl
-
-from . import auth
-from .auth import mfa_modules as auth_mfa_modules, providers as auth_providers
-from .const import (
-    ATTR_ASSUMED_STATE,
-    ATTR_FRIENDLY_NAME,
-    ATTR_HIDDEN,
-    BASE_PLATFORMS,
-    CONF_ALLOWLIST_EXTERNAL_DIRS,
-    CONF_ALLOWLIST_EXTERNAL_URLS,
-    CONF_AUTH_MFA_MODULES,
-    CONF_AUTH_PROVIDERS,
-    CONF_COUNTRY,
-    CONF_CURRENCY,
-    CONF_CUSTOMIZE,
-    CONF_CUSTOMIZE_DOMAIN,
-    CONF_CUSTOMIZE_GLOB,
-    CONF_DEBUG,
-    CONF_ELEVATION,
-    CONF_EXTERNAL_URL,
-    CONF_ID,
-    CONF_INTERNAL_URL,
-    CONF_LANGUAGE,
-    CONF_LATITUDE,
-    CONF_LEGACY_TEMPLATES,
-    CONF_LONGITUDE,
-    CONF_MEDIA_DIRS,
-    CONF_NAME,
-    CONF_PACKAGES,
-    CONF_RADIUS,
-    CONF_TEMPERATURE_UNIT,
-    CONF_TIME_ZONE,
-    CONF_TYPE,
-    CONF_UNIT_SYSTEM,
-    CONF_URL,
-    CONF_USERNAME,
-    EVENT_CORE_CONFIG_UPDATE,
-    LEGACY_CONF_WHITELIST_EXTERNAL_DIRS,
-    UnitOfLength,
-    __version__,
-)
-from .core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-from .generated.currencies import HISTORIC_CURRENCIES
-from .helpers import config_validation as cv, issue_registry as ir
-from .helpers.entity_values import EntityValues
-from .helpers.frame import ReportBehavior, report_usage
-from .helpers.storage import Store
-from .helpers.typing import UNDEFINED, UndefinedType
-from .util import dt as dt_util, location
-from .util.hass_dict import HassKey
-from .util.package import is_docker_env
-from .util.unit_system import (
-    _CONF_UNIT_SYSTEM_IMPERIAL,
-    _CONF_UNIT_SYSTEM_US_CUSTOMARY,
-    METRIC_SYSTEM,
-    UnitSystem,
-    get_unit_system,
-    validate_unit_system,
-)
-
-# Typing imports that create a circular dependency
-if TYPE_CHECKING:
-    from .components.http import ApiConfig
-
-_LOGGER = logging.getLogger(__name__)
-
-DATA_CUSTOMIZE: HassKey[EntityValues] = HassKey("hass_customize")
-
-CONF_CREDENTIAL: Final = "credential"
-CONF_ICE_SERVERS: Final = "ice_servers"
-CONF_WEBRTC: Final = "webrtc"
-
-CORE_STORAGE_KEY = "core.config"
-CORE_STORAGE_VERSION = 1
-CORE_STORAGE_MINOR_VERSION = 4
-
-
-class ConfigSource(enum.StrEnum):
-    """Source of core configuration."""
-
-    DEFAULT = "default"
-    DISCOVERED = "discovered"
-    STORAGE = "storage"
-    YAML = "yaml"
-
-
-def _no_duplicate_auth_provider(
-    configs: Sequence[dict[str, Any]],
-) -> Sequence[dict[str, Any]]:
-    """No duplicate auth provider config allowed in a list.
-
-    Each type of auth provider can only have one config without optional id.
-    Unique id is required if same type of auth provider used multiple times.
-    """
-    config_keys: set[tuple[str, str | None]] = set()
-    for config in configs:
-        key = (config[CONF_TYPE], config.get(CONF_ID))
-        if key in config_keys:
-            raise vol.Invalid(
-                f"Duplicate auth provider {config[CONF_TYPE]} found. "
-                "Please add unique IDs "
-                "if you want to have the same auth provider twice"
-            )
-        config_keys.add(key)
-    return configs
-
-
-def _no_duplicate_auth_mfa_module(
-    configs: Sequence[dict[str, Any]],
-) -> Sequence[dict[str, Any]]:
-    """No duplicate auth mfa module item allowed in a list.
-
-    Each type of mfa module can only have one config without optional id.
-    A global unique id is required if same type of mfa module used multiple
-    times.
-    Note: this is different than auth provider
-    """
-    config_keys: set[str] = set()
-    for config in configs:
-        key = config.get(CONF_ID, config[CONF_TYPE])
-        if key in config_keys:
-            raise vol.Invalid(
-                f"Duplicate mfa module {config[CONF_TYPE]} found. "
-                "Please add unique IDs "
-                "if you want to have the same mfa module twice"
-            )
-        config_keys.add(key)
-    return configs
-
-
-def _filter_bad_internal_external_urls(conf: dict) -> dict:
-    """Filter internal/external URL with a path."""
-    for key in CONF_INTERNAL_URL, CONF_EXTERNAL_URL:
-        if key in conf and urlparse(conf[key]).path not in ("", "/"):
-            # We warn but do not fix, because if this was incorrectly configured,
-            # adjusting this value might impact security.
-            _LOGGER.warning(
-                "Invalid %s set. It's not allowed to have a path (/bla)", key
-            )
-
-    return conf
-
-
-# Schema for all packages element
-_PACKAGES_CONFIG_SCHEMA = vol.Schema({cv.string: vol.Any(dict, list)})
-
-# Schema for individual package definition
-_PACKAGE_DEFINITION_SCHEMA = vol.Schema({cv.string: vol.Any(dict, list, None)})
-
-_CUSTOMIZE_DICT_SCHEMA = vol.Schema(
-    {
-        vol.Optional(ATTR_FRIENDLY_NAME): cv.string,
-        vol.Optional(ATTR_HIDDEN): cv.boolean,
-        vol.Optional(ATTR_ASSUMED_STATE): cv.boolean,
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-_CUSTOMIZE_CONFIG_SCHEMA = vol.Schema(
-    {
-        vol.Optional(CONF_CUSTOMIZE, default={}): vol.Schema(
-            {cv.entity_id: _CUSTOMIZE_DICT_SCHEMA}
-        ),
-        vol.Optional(CONF_CUSTOMIZE_DOMAIN, default={}): vol.Schema(
-            {cv.string: _CUSTOMIZE_DICT_SCHEMA}
-        ),
-        vol.Optional(CONF_CUSTOMIZE_GLOB, default={}): vol.Schema(
-            {cv.string: _CUSTOMIZE_DICT_SCHEMA}
-        ),
-    }
-)
-
-
-def _raise_issue_if_historic_currency(hass: HomeAssistant, currency: str) -> None:
-    if currency not in HISTORIC_CURRENCIES:
-        ir.async_delete_issue(hass, HOMEASSISTANT_DOMAIN, "historic_currency")
-        return
-
-    ir.async_create_issue(
-        hass,
-        HOMEASSISTANT_DOMAIN,
-        "historic_currency",
-        is_fixable=False,
-        learn_more_url="homeassistant://config/general",
-        severity=ir.IssueSeverity.WARNING,
-        translation_key="historic_currency",
-        translation_placeholders={"currency": currency},
-    )
-
-
-def _raise_issue_if_no_country(hass: HomeAssistant, country: str | None) -> None:
-    if country is not None:
-        ir.async_delete_issue(hass, HOMEASSISTANT_DOMAIN, "country_not_configured")
-        return
-
-    ir.async_create_issue(
-        hass,
-        HOMEASSISTANT_DOMAIN,
-        "country_not_configured",
-        is_fixable=False,
-        learn_more_url="homeassistant://config/general",
-        severity=ir.IssueSeverity.WARNING,
-        translation_key="country_not_configured",
-    )
-
-
-def _validate_currency(data: Any) -> Any:
-    try:
-        return cv.currency(data)
-    except vol.InInvalid:
-        with suppress(vol.InInvalid):
-            return cv.historic_currency(data)
-        raise
-
-
-def _validate_stun_or_turn_url(value: Any) -> str:
-    """Validate an URL."""
-    url_in = str(value)
-    url = urlparse(url_in)
-
-    if url.scheme not in ("stun", "stuns", "turn", "turns"):
-        raise vol.Invalid("invalid url")
-    return url_in
-
-
-CORE_CONFIG_SCHEMA = vol.All(
-    _CUSTOMIZE_CONFIG_SCHEMA.extend(
-        {
-            CONF_NAME: vol.Coerce(str),
-            CONF_LATITUDE: cv.latitude,
-            CONF_LONGITUDE: cv.longitude,
-            CONF_ELEVATION: vol.Coerce(int),
-            CONF_RADIUS: cv.positive_int,
-            vol.Remove(CONF_TEMPERATURE_UNIT): cv.temperature_unit,
-            CONF_UNIT_SYSTEM: validate_unit_system,
-            CONF_TIME_ZONE: cv.time_zone,
-            vol.Optional(CONF_INTERNAL_URL): cv.url,
-            vol.Optional(CONF_EXTERNAL_URL): cv.url,
-            vol.Optional(CONF_ALLOWLIST_EXTERNAL_DIRS): vol.All(
-                cv.ensure_list, [vol.IsDir()]
-            ),
-            vol.Optional(LEGACY_CONF_WHITELIST_EXTERNAL_DIRS): vol.All(
-                cv.ensure_list, [vol.IsDir()]
-            ),
-            vol.Optional(CONF_ALLOWLIST_EXTERNAL_URLS): vol.All(
-                cv.ensure_list, [cv.url]
-            ),
-            vol.Optional(CONF_PACKAGES, default={}): _PACKAGES_CONFIG_SCHEMA,
-            vol.Optional(CONF_AUTH_PROVIDERS): vol.All(
-                cv.ensure_list,
-                [
-                    auth_providers.AUTH_PROVIDER_SCHEMA.extend(
-                        {
-                            CONF_TYPE: vol.NotIn(
-                                ["insecure_example"],
-                                (
-                                    "The insecure_example auth provider"
-                                    " is for testing only."
-                                ),
-                            )
-                        }
-                    )
-                ],
-                _no_duplicate_auth_provider,
-            ),
-            vol.Optional(CONF_AUTH_MFA_MODULES): vol.All(
-                cv.ensure_list,
-                [
-                    auth_mfa_modules.MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend(
-                        {
-                            CONF_TYPE: vol.NotIn(
-                                ["insecure_example"],
-                                "The insecure_example mfa module is for testing only.",
-                            )
-                        }
-                    )
-                ],
-                _no_duplicate_auth_mfa_module,
-            ),
-            vol.Optional(CONF_MEDIA_DIRS): cv.schema_with_slug_keys(vol.IsDir()),
-            vol.Remove(CONF_LEGACY_TEMPLATES): cv.boolean,
-            vol.Optional(CONF_CURRENCY): _validate_currency,
-            vol.Optional(CONF_COUNTRY): cv.country,
-            vol.Optional(CONF_LANGUAGE): cv.language,
-            vol.Optional(CONF_DEBUG): cv.boolean,
-            vol.Optional(CONF_WEBRTC): vol.Schema(
-                {
-                    vol.Required(CONF_ICE_SERVERS): vol.All(
-                        cv.ensure_list,
-                        [
-                            vol.Schema(
-                                {
-                                    vol.Required(CONF_URL): vol.All(
-                                        cv.ensure_list, [_validate_stun_or_turn_url]
-                                    ),
-                                    vol.Optional(CONF_USERNAME): cv.string,
-                                    vol.Optional(CONF_CREDENTIAL): cv.string,
-                                }
-                            )
-                        ],
-                    )
-                }
-            ),
-        }
-    ),
-    _filter_bad_internal_external_urls,
-)
-
-
-async def async_process_ha_core_config(hass: HomeAssistant, config: dict) -> None:
-    """Process the [homeassistant] section from the configuration.
-
-    This method is a coroutine.
-    """
-    # CORE_CONFIG_SCHEMA is not async safe since it uses vol.IsDir
-    # so we need to run it in an executor job.
-    config = await hass.async_add_executor_job(CORE_CONFIG_SCHEMA, config)
-
-    # Only load auth during startup.
-    if not hasattr(hass, "auth"):
-        if (auth_conf := config.get(CONF_AUTH_PROVIDERS)) is None:
-            auth_conf = [{"type": "homeassistant"}]
-
-        mfa_conf = config.get(
-            CONF_AUTH_MFA_MODULES,
-            [{"type": "totp", "id": "totp", "name": "Authenticator app"}],
-        )
-
-        setattr(
-            hass, "auth", await auth.auth_manager_from_config(hass, auth_conf, mfa_conf)
-        )
-
-    await hass.config.async_load()
-
-    hac = hass.config
-
-    if any(
-        k in config
-        for k in (
-            CONF_COUNTRY,
-            CONF_CURRENCY,
-            CONF_ELEVATION,
-            CONF_EXTERNAL_URL,
-            CONF_INTERNAL_URL,
-            CONF_LANGUAGE,
-            CONF_LATITUDE,
-            CONF_LONGITUDE,
-            CONF_NAME,
-            CONF_RADIUS,
-            CONF_TIME_ZONE,
-            CONF_UNIT_SYSTEM,
-        )
-    ):
-        hac.config_source = ConfigSource.YAML
-
-    for key, attr in (
-        (CONF_COUNTRY, "country"),
-        (CONF_CURRENCY, "currency"),
-        (CONF_ELEVATION, "elevation"),
-        (CONF_EXTERNAL_URL, "external_url"),
-        (CONF_INTERNAL_URL, "internal_url"),
-        (CONF_LANGUAGE, "language"),
-        (CONF_LATITUDE, "latitude"),
-        (CONF_LONGITUDE, "longitude"),
-        (CONF_MEDIA_DIRS, "media_dirs"),
-        (CONF_NAME, "location_name"),
-        (CONF_RADIUS, "radius"),
-    ):
-        if key in config:
-            setattr(hac, attr, config[key])
-
-    if config.get(CONF_DEBUG):
-        hac.debug = True
-
-    if CONF_WEBRTC in config:
-        hac.webrtc.ice_servers = [
-            RTCIceServer(
-                server[CONF_URL],
-                server.get(CONF_USERNAME),
-                server.get(CONF_CREDENTIAL),
-            )
-            for server in config[CONF_WEBRTC][CONF_ICE_SERVERS]
-        ]
-
-    _raise_issue_if_historic_currency(hass, hass.config.currency)
-    _raise_issue_if_no_country(hass, hass.config.country)
-
-    if CONF_TIME_ZONE in config:
-        await hac.async_set_time_zone(config[CONF_TIME_ZONE])
-
-    if CONF_MEDIA_DIRS not in config:
-        if is_docker_env():
-            hac.media_dirs = {"local": "/media"}
-        else:
-            hac.media_dirs = {"local": hass.config.path("media")}
-
-    # Init whitelist external dir
-    hac.allowlist_external_dirs = {hass.config.path("www"), *hac.media_dirs.values()}
-    if CONF_ALLOWLIST_EXTERNAL_DIRS in config:
-        hac.allowlist_external_dirs.update(set(config[CONF_ALLOWLIST_EXTERNAL_DIRS]))
-
-    elif LEGACY_CONF_WHITELIST_EXTERNAL_DIRS in config:
-        _LOGGER.warning(
-            "Key %s has been replaced with %s. Please update your config",
-            LEGACY_CONF_WHITELIST_EXTERNAL_DIRS,
-            CONF_ALLOWLIST_EXTERNAL_DIRS,
-        )
-        hac.allowlist_external_dirs.update(
-            set(config[LEGACY_CONF_WHITELIST_EXTERNAL_DIRS])
-        )
-
-    # Init whitelist external URL list – make sure to add / to every URL that doesn't
-    # already have it so that we can properly test "path ownership"
-    if CONF_ALLOWLIST_EXTERNAL_URLS in config:
-        hac.allowlist_external_urls.update(
-            url if url.endswith("/") else f"{url}/"
-            for url in config[CONF_ALLOWLIST_EXTERNAL_URLS]
-        )
-
-    # Customize
-    cust_exact = dict(config[CONF_CUSTOMIZE])
-    cust_domain = dict(config[CONF_CUSTOMIZE_DOMAIN])
-    cust_glob = OrderedDict(config[CONF_CUSTOMIZE_GLOB])
-
-    for name, pkg in config[CONF_PACKAGES].items():
-        if (pkg_cust := pkg.get(HOMEASSISTANT_DOMAIN)) is None:
-            continue
-
-        try:
-            pkg_cust = _CUSTOMIZE_CONFIG_SCHEMA(pkg_cust)
-        except vol.Invalid:
-            _LOGGER.warning("Package %s contains invalid customize", name)
-            continue
-
-        cust_exact.update(pkg_cust[CONF_CUSTOMIZE])
-        cust_domain.update(pkg_cust[CONF_CUSTOMIZE_DOMAIN])
-        cust_glob.update(pkg_cust[CONF_CUSTOMIZE_GLOB])
-
-    hass.data[DATA_CUSTOMIZE] = EntityValues(cust_exact, cust_domain, cust_glob)
-
-    if CONF_UNIT_SYSTEM in config:
-        hac.units = get_unit_system(config[CONF_UNIT_SYSTEM])
-
-
-class _ComponentSet(set[str]):
-    """Set of loaded components.
-
-    This set contains both top level components and platforms.
-
-    Examples:
-    `light`, `switch`, `hue`, `mjpeg.camera`, `universal.media_player`,
-    `homeassistant.scene`
-
-    The top level components set only contains the top level components.
-
-    The all components set contains all components, including platform
-    based components.
-
-    """
-
-    def __init__(
-        self, top_level_components: set[str], all_components: set[str]
-    ) -> None:
-        """Initialize the component set."""
-        self._top_level_components = top_level_components
-        self._all_components = all_components
-
-    def add(self, component: str) -> None:
-        """Add a component to the store."""
-        if "." not in component:
-            self._top_level_components.add(component)
-            self._all_components.add(component)
-        else:
-            platform, _, domain = component.partition(".")
-            if domain in BASE_PLATFORMS:
-                self._all_components.add(platform)
-        return super().add(component)
-
-    def remove(self, component: str) -> None:
-        """Remove a component from the store."""
-        if "." in component:
-            raise ValueError("_ComponentSet does not support removing sub-components")
-        self._top_level_components.remove(component)
-        return super().remove(component)
-
-    def discard(self, component: str) -> None:
-        """Remove a component from the store."""
-        raise NotImplementedError("_ComponentSet does not support discard, use remove")
-
-
-class Config:
-    """Configuration settings for Home Assistant."""
-
-    _store: Config._ConfigStore
-
-    def __init__(self, hass: HomeAssistant, config_dir: str) -> None:
-        """Initialize a new config object."""
-        # pylint: disable-next=import-outside-toplevel
-        from .components.zone import DEFAULT_RADIUS
-
-        self.hass = hass
-
-        self.latitude: float = 0
-        self.longitude: float = 0
-
-        self.elevation: int = 0
-        """Elevation (always in meters regardless of the unit system)."""
-
-        self.radius: int = DEFAULT_RADIUS
-        """Radius of the Home Zone (always in meters regardless of the unit system)."""
-
-        self.debug: bool = False
-        self.location_name: str = "Home"
-        self.time_zone: str = "UTC"
-        self.units: UnitSystem = METRIC_SYSTEM
-        self.internal_url: str | None = None
-        self.external_url: str | None = None
-        self.currency: str = "EUR"
-        self.country: str | None = None
-        self.language: str = "en"
-
-        self.config_source: ConfigSource = ConfigSource.DEFAULT
-
-        # If True, pip install is skipped for requirements on startup
-        self.skip_pip: bool = False
-
-        # List of packages to skip when installing requirements on startup
-        self.skip_pip_packages: list[str] = []
-
-        # Set of loaded top level components
-        # This set is updated by _ComponentSet
-        # and should not be modified directly
-        self.top_level_components: set[str] = set()
-
-        # Set of all loaded components including platform
-        # based components
-        self.all_components: set[str] = set()
-
-        # Set of loaded components
-        self.components: _ComponentSet = _ComponentSet(
-            self.top_level_components, self.all_components
-        )
-
-        # API (HTTP) server configuration
-        self.api: ApiConfig | None = None
-
-        # Directory that holds the configuration
-        self.config_dir: str = config_dir
-
-        # List of allowed external dirs to access
-        self.allowlist_external_dirs: set[str] = set()
-
-        # List of allowed external URLs that integrations may use
-        self.allowlist_external_urls: set[str] = set()
-
-        # Dictionary of Media folders that integrations may use
-        self.media_dirs: dict[str, str] = {}
-
-        # If Home Assistant is running in recovery mode
-        self.recovery_mode: bool = False
-
-        # Use legacy template behavior
-        self.legacy_templates: bool = False
-
-        # If Home Assistant is running in safe mode
-        self.safe_mode: bool = False
-
-        self.webrtc = RTCConfiguration()
-
-    def async_initialize(self) -> None:
-        """Finish initializing a config object.
-
-        This must be called before the config object is used.
-        """
-        self._store = self._ConfigStore(self.hass)
-
-    def distance(self, lat: float, lon: float) -> float | None:
-        """Calculate distance from Home Assistant.
-
-        Async friendly.
-        """
-        return self.units.length(
-            location.distance(self.latitude, self.longitude, lat, lon),
-            UnitOfLength.METERS,
-        )
-
-    def path(self, *path: str) -> str:
-        """Generate path to the file within the configuration directory.
-
-        Async friendly.
-        """
-        return os.path.join(self.config_dir, *path)
-
-    def is_allowed_external_url(self, url: str) -> bool:
-        """Check if an external URL is allowed."""
-        parsed_url = f"{yarl.URL(url)!s}/"
-
-        return any(
-            allowed
-            for allowed in self.allowlist_external_urls
-            if parsed_url.startswith(allowed)
-        )
-
-    def is_allowed_path(self, path: str) -> bool:
-        """Check if the path is valid for access from outside.
-
-        This function does blocking I/O and should not be called from the event loop.
-        Use hass.async_add_executor_job to schedule it on the executor.
-        """
-        assert path is not None
-
-        thepath = pathlib.Path(path)
-        try:
-            # The file path does not have to exist (it's parent should)
-            if thepath.exists():
-                thepath = thepath.resolve()
-            else:
-                thepath = thepath.parent.resolve()
-        except (FileNotFoundError, RuntimeError, PermissionError):
-            return False
-
-        for allowed_path in self.allowlist_external_dirs:
-            try:
-                thepath.relative_to(allowed_path)
-            except ValueError:
-                pass
-            else:
-                return True
-
-        return False
-
-    def as_dict(self) -> dict[str, Any]:
-        """Return a dictionary representation of the configuration.
-
-        Async friendly.
-        """
-        allowlist_external_dirs = list(self.allowlist_external_dirs)
-        return {
-            "allowlist_external_dirs": allowlist_external_dirs,
-            "allowlist_external_urls": list(self.allowlist_external_urls),
-            "components": list(self.components),
-            "config_dir": self.config_dir,
-            "config_source": self.config_source,
-            "country": self.country,
-            "currency": self.currency,
-            "debug": self.debug,
-            "elevation": self.elevation,
-            "external_url": self.external_url,
-            "internal_url": self.internal_url,
-            "language": self.language,
-            "latitude": self.latitude,
-            "location_name": self.location_name,
-            "longitude": self.longitude,
-            "radius": self.radius,
-            "recovery_mode": self.recovery_mode,
-            "safe_mode": self.safe_mode,
-            "state": self.hass.state.value,
-            "time_zone": self.time_zone,
-            "unit_system": self.units.as_dict(),
-            "version": __version__,
-            # legacy, backwards compat
-            "whitelist_external_dirs": allowlist_external_dirs,
-        }
-
-    async def async_set_time_zone(self, time_zone_str: str) -> None:
-        """Help to set the time zone."""
-        if time_zone := await dt_util.async_get_time_zone(time_zone_str):
-            self.time_zone = time_zone_str
-            dt_util.set_default_time_zone(time_zone)
-        else:
-            raise ValueError(f"Received invalid time zone {time_zone_str}")
-
-    def set_time_zone(self, time_zone_str: str) -> None:
-        """Set the time zone.
-
-        This is a legacy method that should not be used in new code.
-        Use async_set_time_zone instead.
-
-        It will be removed in Home Assistant 2025.6.
-        """
-        report_usage(
-            "set the time zone using set_time_zone instead of async_set_time_zone"
-            " which will stop working in Home Assistant 2025.6",
-            core_integration_behavior=ReportBehavior.ERROR,
-            custom_integration_behavior=ReportBehavior.ERROR,
-        )
-        if time_zone := dt_util.get_time_zone(time_zone_str):
-            self.time_zone = time_zone_str
-            dt_util.set_default_time_zone(time_zone)
-        else:
-            raise ValueError(f"Received invalid time zone {time_zone_str}")
-
-    async def _async_update(
-        self,
-        *,
-        country: str | UndefinedType | None = UNDEFINED,
-        currency: str | None = None,
-        elevation: int | None = None,
-        external_url: str | UndefinedType | None = UNDEFINED,
-        internal_url: str | UndefinedType | None = UNDEFINED,
-        language: str | None = None,
-        latitude: float | None = None,
-        location_name: str | None = None,
-        longitude: float | None = None,
-        radius: int | None = None,
-        source: ConfigSource,
-        time_zone: str | None = None,
-        unit_system: str | None = None,
-    ) -> None:
-        """Update the configuration from a dictionary."""
-        self.config_source = source
-        if country is not UNDEFINED:
-            self.country = country
-        if currency is not None:
-            self.currency = currency
-        if elevation is not None:
-            self.elevation = elevation
-        if external_url is not UNDEFINED:
-            self.external_url = external_url
-        if internal_url is not UNDEFINED:
-            self.internal_url = internal_url
-        if language is not None:
-            self.language = language
-        if latitude is not None:
-            self.latitude = latitude
-        if location_name is not None:
-            self.location_name = location_name
-        if longitude is not None:
-            self.longitude = longitude
-        if radius is not None:
-            self.radius = radius
-        if time_zone is not None:
-            await self.async_set_time_zone(time_zone)
-        if unit_system is not None:
-            try:
-                self.units = get_unit_system(unit_system)
-            except ValueError:
-                self.units = METRIC_SYSTEM
-
-    async def async_update(self, **kwargs: Any) -> None:
-        """Update the configuration from a dictionary."""
-        await self._async_update(source=ConfigSource.STORAGE, **kwargs)
-        await self._async_store()
-        self.hass.bus.async_fire_internal(EVENT_CORE_CONFIG_UPDATE, kwargs)
-
-        _raise_issue_if_historic_currency(self.hass, self.currency)
-        _raise_issue_if_no_country(self.hass, self.country)
-
-    async def async_load(self) -> None:
-        """Load [homeassistant] core config."""
-        if not (data := await self._store.async_load()):
-            return
-
-        # In 2021.9 we fixed validation to disallow a path (because that's never
-        # correct) but this data still lives in storage, so we print a warning.
-        if data.get("external_url") and urlparse(data["external_url"]).path not in (
-            "",
-            "/",
-        ):
-            _LOGGER.warning("Invalid external_url set. It's not allowed to have a path")
-
-        if data.get("internal_url") and urlparse(data["internal_url"]).path not in (
-            "",
-            "/",
-        ):
-            _LOGGER.warning("Invalid internal_url set. It's not allowed to have a path")
-
-        await self._async_update(
-            source=ConfigSource.STORAGE,
-            latitude=data.get("latitude"),
-            longitude=data.get("longitude"),
-            elevation=data.get("elevation"),
-            unit_system=data.get("unit_system_v2"),
-            location_name=data.get("location_name"),
-            time_zone=data.get("time_zone"),
-            external_url=data.get("external_url", UNDEFINED),
-            internal_url=data.get("internal_url", UNDEFINED),
-            currency=data.get("currency"),
-            country=data.get("country"),
-            language=data.get("language"),
-            radius=data["radius"],
-        )
-
-    async def _async_store(self) -> None:
-        """Store [homeassistant] core config."""
-        data = {
-            "latitude": self.latitude,
-            "longitude": self.longitude,
-            "elevation": self.elevation,
-            # We don't want any integrations to use the name of the unit system
-            # so we are using the private attribute here
-            "unit_system_v2": self.units._name,  # noqa: SLF001
-            "location_name": self.location_name,
-            "time_zone": self.time_zone,
-            "external_url": self.external_url,
-            "internal_url": self.internal_url,
-            "currency": self.currency,
-            "country": self.country,
-            "language": self.language,
-            "radius": self.radius,
-        }
-        await self._store.async_save(data)
-
-    class _ConfigStore(Store[dict[str, Any]]):
-        """Class to help storing Config data."""
-
-        def __init__(self, hass: HomeAssistant) -> None:
-            """Initialize storage class."""
-            super().__init__(
-                hass,
-                CORE_STORAGE_VERSION,
-                CORE_STORAGE_KEY,
-                private=True,
-                atomic_writes=True,
-                minor_version=CORE_STORAGE_MINOR_VERSION,
-            )
-            self._original_unit_system: str | None = None  # from old store 1.1
-
-        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."""
-
-            # pylint: disable-next=import-outside-toplevel
-            from .components.zone import DEFAULT_RADIUS
-
-            data = old_data
-            if old_major_version == 1 and old_minor_version < 2:
-                # In 1.2, we remove support for "imperial", replaced by "us_customary"
-                # Using a new key to allow rollback
-                self._original_unit_system = data.get("unit_system")
-                data["unit_system_v2"] = self._original_unit_system
-                if data["unit_system_v2"] == _CONF_UNIT_SYSTEM_IMPERIAL:
-                    data["unit_system_v2"] = _CONF_UNIT_SYSTEM_US_CUSTOMARY
-            if old_major_version == 1 and old_minor_version < 3:
-                # In 1.3, we add the key "language", initialize it from the
-                # owner account.
-                data["language"] = "en"
-                try:
-                    owner = await self.hass.auth.async_get_owner()
-                    if owner is not None:
-                        # pylint: disable-next=import-outside-toplevel
-                        from .components.frontend import storage as frontend_store
-
-                        _, owner_data = await frontend_store.async_user_store(
-                            self.hass, owner.id
-                        )
-
-                        if (
-                            "language" in owner_data
-                            and "language" in owner_data["language"]
-                        ):
-                            with suppress(vol.InInvalid):
-                                data["language"] = cv.language(
-                                    owner_data["language"]["language"]
-                                )
-                # pylint: disable-next=broad-except
-                except Exception:
-                    _LOGGER.exception("Unexpected error during core config migration")
-            if old_major_version == 1 and old_minor_version < 4:
-                # In 1.4, we add the key "radius", initialize it with the default.
-                data.setdefault("radius", DEFAULT_RADIUS)
-
-            if old_major_version > 1:
-                raise NotImplementedError
-            return data
-
-        async def async_save(self, data: dict[str, Any]) -> None:
-            if self._original_unit_system:
-                data["unit_system"] = self._original_unit_system
-            return await super().async_save(data)
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index 9d041c9b8d3..1fb6439a8c4 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -26,7 +26,7 @@ from .helpers.deprecation import (
     check_if_deprecated_constant,
     dir_with_deprecated_constants,
 )
-from .helpers.frame import ReportBehavior, report_usage
+from .helpers.frame import report
 from .loader import async_suggest_report_issue
 from .util import uuid as uuid_util
 
@@ -530,12 +530,12 @@ class FlowManager(abc.ABC, Generic[_FlowContextT, _FlowResultT, _HandlerT]):
 
         if not isinstance(result["type"], FlowResultType):
             result["type"] = FlowResultType(result["type"])  # type: ignore[unreachable]
-            report_usage(
+            report(
                 (
                     "does not use FlowResultType enum for data entry flow result type. "
                     "This is deprecated and will stop working in Home Assistant 2025.1"
                 ),
-                core_behavior=ReportBehavior.LOG,
+                error_if_core=False,
             )
 
         if (
diff --git a/homeassistant/generated/bluetooth.py b/homeassistant/generated/bluetooth.py
index a105efc2685..2ea604a91a2 100644
--- a/homeassistant/generated/bluetooth.py
+++ b/homeassistant/generated/bluetooth.py
@@ -8,26 +8,6 @@ from __future__ import annotations
 from typing import Final
 
 BLUETOOTH: Final[list[dict[str, bool | str | int | list[int]]]] = [
-    {
-        "domain": "acaia",
-        "manufacturer_id": 16962,
-    },
-    {
-        "domain": "acaia",
-        "local_name": "ACAIA*",
-    },
-    {
-        "domain": "acaia",
-        "local_name": "PYXIS-*",
-    },
-    {
-        "domain": "acaia",
-        "local_name": "LUNAR-*",
-    },
-    {
-        "domain": "acaia",
-        "local_name": "PROCHBT001",
-    },
     {
         "domain": "airthings_ble",
         "manufacturer_id": 820,
@@ -299,11 +279,6 @@ BLUETOOTH: Final[list[dict[str, bool | str | int | list[int]]]] = [
         ],
         "manufacturer_id": 76,
     },
-    {
-        "connectable": True,
-        "domain": "husqvarna_automower_ble",
-        "service_uuid": "98bd0001-0b0e-421a-84e5-ddbf75dc6de4",
-    },
     {
         "domain": "ibeacon",
         "manufacturer_data_start": [
diff --git a/homeassistant/generated/config_flows.py b/homeassistant/generated/config_flows.py
index ffe61b915c6..f399b0922f1 100644
--- a/homeassistant/generated/config_flows.py
+++ b/homeassistant/generated/config_flows.py
@@ -24,7 +24,6 @@ FLOWS = {
     ],
     "integration": [
         "abode",
-        "acaia",
         "accuweather",
         "acmeda",
         "adax",
@@ -222,6 +221,7 @@ FLOWS = {
         "gios",
         "github",
         "glances",
+        "go2rtc",
         "goalzero",
         "gogogate2",
         "goodwe",
@@ -265,7 +265,6 @@ FLOWS = {
         "huisbaasje",
         "hunterdouglas_powerview",
         "husqvarna_automower",
-        "husqvarna_automower_ble",
         "huum",
         "hvv_departures",
         "hydrawise",
@@ -328,7 +327,6 @@ FLOWS = {
         "lektrico",
         "lg_netcast",
         "lg_soundbar",
-        "lg_thinq",
         "lidarr",
         "lifx",
         "linear_garage_door",
@@ -337,7 +335,6 @@ FLOWS = {
         "litterrobot",
         "livisi",
         "local_calendar",
-        "local_file",
         "local_ip",
         "local_todo",
         "locative",
@@ -385,14 +382,12 @@ FLOWS = {
         "mpd",
         "mqtt",
         "mullvad",
-        "music_assistant",
         "mutesync",
         "mysensors",
         "mystrom",
         "myuplink",
         "nam",
         "nanoleaf",
-        "nasweb",
         "neato",
         "nest",
         "netatmo",
@@ -409,7 +404,6 @@ FLOWS = {
         "nina",
         "nmap_tracker",
         "nobo_hub",
-        "nordpool",
         "notion",
         "nuheat",
         "nuki",
@@ -424,7 +418,6 @@ FLOWS = {
         "oncue",
         "ondilo_ico",
         "onewire",
-        "onkyo",
         "onvif",
         "open_meteo",
         "openai_conversation",
@@ -445,7 +438,6 @@ FLOWS = {
         "ovo_energy",
         "owntracks",
         "p1_monitor",
-        "palazzetti",
         "panasonic_viera",
         "peco",
         "pegel_online",
@@ -538,7 +530,6 @@ FLOWS = {
         "simplefin",
         "simplepush",
         "simplisafe",
-        "sky_remote",
         "skybell",
         "slack",
         "sleepiq",
@@ -548,7 +539,6 @@ FLOWS = {
         "smart_meter_texas",
         "smartthings",
         "smarttub",
-        "smarty",
         "smhi",
         "smlight",
         "sms",
diff --git a/homeassistant/generated/dhcp.py b/homeassistant/generated/dhcp.py
index 7dacf9a0bca..154ca93545c 100644
--- a/homeassistant/generated/dhcp.py
+++ b/homeassistant/generated/dhcp.py
@@ -37,6 +37,10 @@ DHCP: Final[list[dict[str, str | bool]]] = [
         "hostname": "august*",
         "macaddress": "E076D0*",
     },
+    {
+        "domain": "awair",
+        "macaddress": "70886B1*",
+    },
     {
         "domain": "axis",
         "registered_devices": True,
@@ -276,18 +280,6 @@ DHCP: Final[list[dict[str, str | bool]]] = [
         "hostname": "polisy*",
         "macaddress": "000DB9*",
     },
-    {
-        "domain": "lamarzocco",
-        "hostname": "gs[0-9][0-9][0-9][0-9][0-9][0-9]",
-    },
-    {
-        "domain": "lamarzocco",
-        "hostname": "lm[0-9][0-9][0-9][0-9][0-9][0-9]",
-    },
-    {
-        "domain": "lamarzocco",
-        "hostname": "mr[0-9][0-9][0-9][0-9][0-9][0-9]",
-    },
     {
         "domain": "lametric",
         "registered_devices": True,
@@ -379,15 +371,6 @@ DHCP: Final[list[dict[str, str | bool]]] = [
         "hostname": "gateway*",
         "macaddress": "F8811A*",
     },
-    {
-        "domain": "palazzetti",
-        "hostname": "connbox*",
-        "macaddress": "40F3857*",
-    },
-    {
-        "domain": "palazzetti",
-        "registered_devices": True,
-    },
     {
         "domain": "powerwall",
         "hostname": "1118431-*",
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index f007db87868..5375ad2c05c 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -11,12 +11,6 @@
       "config_flow": true,
       "iot_class": "cloud_push"
     },
-    "acaia": {
-      "name": "Acaia",
-      "integration_type": "device",
-      "config_flow": true,
-      "iot_class": "local_push"
-    },
     "accuweather": {
       "name": "AccuWeather",
       "integration_type": "service",
@@ -704,6 +698,12 @@
       "config_flow": false,
       "iot_class": "cloud_polling"
     },
+    "bloomsky": {
+      "name": "BloomSky",
+      "integration_type": "hub",
+      "config_flow": false,
+      "iot_class": "cloud_polling"
+    },
     "blue_current": {
       "name": "Blue Current",
       "integration_type": "hub",
@@ -2252,6 +2252,13 @@
         }
       }
     },
+    "go2rtc": {
+      "name": "go2rtc",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_polling",
+      "single_config_entry": true
+    },
     "goalzero": {
       "name": "Goal Zero Yeti",
       "integration_type": "device",
@@ -2684,22 +2691,11 @@
       "integration_type": "virtual",
       "supported_by": "motion_blinds"
     },
-    "husqvarna": {
-      "name": "Husqvarna",
-      "integrations": {
-        "husqvarna_automower": {
-          "integration_type": "hub",
-          "config_flow": true,
-          "iot_class": "cloud_push",
-          "name": "Husqvarna Automower"
-        },
-        "husqvarna_automower_ble": {
-          "integration_type": "hub",
-          "config_flow": true,
-          "iot_class": "local_polling",
-          "name": "Husqvarna Automower BLE"
-        }
-      }
+    "husqvarna_automower": {
+      "name": "Husqvarna Automower",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "cloud_push"
     },
     "huum": {
       "name": "Huum",
@@ -3291,12 +3287,6 @@
           "iot_class": "local_polling",
           "name": "LG Soundbars"
         },
-        "lg_thinq": {
-          "integration_type": "hub",
-          "config_flow": true,
-          "iot_class": "cloud_push",
-          "name": "LG ThinQ"
-        },
         "webostv": {
           "integration_type": "hub",
           "config_flow": true,
@@ -3404,7 +3394,7 @@
     "local_file": {
       "name": "Local File",
       "integration_type": "hub",
-      "config_flow": true,
+      "config_flow": false,
       "iot_class": "local_polling"
     },
     "local_ip": {
@@ -3950,12 +3940,6 @@
       "iot_class": "cloud_polling",
       "single_config_entry": true
     },
-    "music_assistant": {
-      "name": "Music Assistant",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "local_push"
-    },
     "mutesync": {
       "name": "mutesync",
       "integration_type": "hub",
@@ -4022,12 +4006,6 @@
       "config_flow": true,
       "iot_class": "local_push"
     },
-    "nasweb": {
-      "name": "NASweb",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "local_push"
-    },
     "neato": {
       "name": "Neato Botvac",
       "integration_type": "hub",
@@ -4193,13 +4171,6 @@
       "config_flow": true,
       "iot_class": "local_push"
     },
-    "nordpool": {
-      "name": "Nord Pool",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "cloud_polling",
-      "single_config_entry": true
-    },
     "norway_air": {
       "name": "Om Luftkvalitet i Norge (Norway Air)",
       "integration_type": "hub",
@@ -4354,8 +4325,8 @@
     },
     "onkyo": {
       "name": "Onkyo",
-      "integration_type": "device",
-      "config_flow": true,
+      "integration_type": "hub",
+      "config_flow": false,
       "iot_class": "local_push"
     },
     "onvif": {
@@ -4561,12 +4532,6 @@
       "config_flow": true,
       "iot_class": "local_polling"
     },
-    "palazzetti": {
-      "name": "Palazzetti",
-      "integration_type": "device",
-      "config_flow": true,
-      "iot_class": "local_polling"
-    },
     "panasonic": {
       "name": "Panasonic",
       "integrations": {
@@ -5614,22 +5579,11 @@
       "config_flow": false,
       "iot_class": "local_push"
     },
-    "sky": {
-      "name": "Sky",
-      "integrations": {
-        "sky_hub": {
-          "integration_type": "hub",
-          "config_flow": false,
-          "iot_class": "local_polling",
-          "name": "Sky Hub"
-        },
-        "sky_remote": {
-          "integration_type": "device",
-          "config_flow": true,
-          "iot_class": "assumed_state",
-          "name": "Sky Remote Control"
-        }
-      }
+    "sky_hub": {
+      "name": "Sky Hub",
+      "integration_type": "hub",
+      "config_flow": false,
+      "iot_class": "local_polling"
     },
     "skybeacon": {
       "name": "Skybeacon",
@@ -5715,7 +5669,7 @@
     "smarty": {
       "name": "Salda Smarty",
       "integration_type": "hub",
-      "config_flow": true,
+      "config_flow": false,
       "iot_class": "local_polling"
     },
     "smhi": {
@@ -7328,7 +7282,6 @@
       "iot_class": "calculated"
     },
     "filter": {
-      "name": "Filter",
       "integration_type": "helper",
       "config_flow": false,
       "iot_class": "local_push"
@@ -7394,11 +7347,13 @@
       "iot_class": "calculated"
     },
     "mold_indicator": {
+      "name": "Mold Indicator",
       "integration_type": "helper",
       "config_flow": true,
       "iot_class": "calculated"
     },
     "random": {
+      "name": "Random",
       "integration_type": "helper",
       "config_flow": true,
       "iot_class": "calculated"
@@ -7429,6 +7384,7 @@
       "iot_class": "local_polling"
     },
     "timer": {
+      "name": "Timer",
       "integration_type": "helper",
       "config_flow": false
     },
@@ -7438,6 +7394,7 @@
       "iot_class": "calculated"
     },
     "trend": {
+      "name": "Trend",
       "integration_type": "helper",
       "config_flow": true,
       "iot_class": "calculated"
@@ -7459,6 +7416,7 @@
     "emulated_roku",
     "energenie_power_sockets",
     "filesize",
+    "filter",
     "garages_amsterdam",
     "generic",
     "generic_hygrostat",
@@ -7483,13 +7441,11 @@
     "min_max",
     "mobile_app",
     "moehlenhoff_alpha2",
-    "mold_indicator",
     "moon",
     "nextbus",
     "nmap_tracker",
     "plant",
     "proximity",
-    "random",
     "rpi_power",
     "schedule",
     "season",
@@ -7499,9 +7455,7 @@
     "switch_as_x",
     "threshold",
     "time_date",
-    "timer",
     "tod",
-    "trend",
     "uptime",
     "utility_meter",
     "version",
diff --git a/homeassistant/generated/zeroconf.py b/homeassistant/generated/zeroconf.py
index 1fbd6337fdb..a2d9b663cec 100644
--- a/homeassistant/generated/zeroconf.py
+++ b/homeassistant/generated/zeroconf.py
@@ -614,12 +614,6 @@ ZEROCONF = {
         },
     ],
     "_lutron._tcp.local.": [
-        {
-            "domain": "lutron_caseta",
-            "properties": {
-                "SYSTYPE": "hwqs*",
-            },
-        },
         {
             "domain": "lutron_caseta",
             "properties": {
@@ -639,11 +633,6 @@ ZEROCONF = {
             },
         },
     ],
-    "_mass._tcp.local.": [
-        {
-            "domain": "music_assistant",
-        },
-    ],
     "_matter._tcp.local.": [
         {
             "domain": "matter",
diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index f01ae325875..2f4c1980468 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -44,13 +44,11 @@ SERVER_SOFTWARE = (
     f"aiohttp/{aiohttp.__version__} Python/{sys.version_info[0]}.{sys.version_info[1]}"
 )
 
-ENABLE_CLEANUP_CLOSED = (3, 13, 0) <= sys.version_info < (
-    3,
-    13,
-    1,
-) or sys.version_info < (3, 12, 7)
-# Cleanup closed is no longer needed after https://github.com/python/cpython/pull/118960
-# which first appeared in Python 3.12.7 and 3.13.1
+ENABLE_CLEANUP_CLOSED = not (3, 11, 1) <= sys.version_info < (3, 11, 4)
+# Enabling cleanup closed on python 3.11.1+ leaks memory relatively quickly
+# see https://github.com/aio-libs/aiohttp/issues/7252
+# aiohttp interacts poorly with https://github.com/python/cpython/pull/98540
+# The issue was fixed in 3.11.4 via https://github.com/python/cpython/pull/104485
 
 WARN_CLOSE_MSG = "closes the Home Assistant aiohttp session"
 
diff --git a/homeassistant/helpers/check_config.py b/homeassistant/helpers/check_config.py
index 4b5e2f277a0..43021fffac5 100644
--- a/homeassistant/helpers/check_config.py
+++ b/homeassistant/helpers/check_config.py
@@ -13,6 +13,7 @@ import voluptuous as vol
 from homeassistant import loader
 from homeassistant.config import (  # type: ignore[attr-defined]
     CONF_PACKAGES,
+    CORE_CONFIG_SCHEMA,
     YAML_CONFIG_FILE,
     config_per_platform,
     extract_domain_configs,
@@ -22,7 +23,6 @@ from homeassistant.config import (  # type: ignore[attr-defined]
     merge_packages_config,
 )
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-from homeassistant.core_config import CORE_CONFIG_SCHEMA
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.requirements import (
     RequirementsNotFound,
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 2b35ebade76..98a2cd71931 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -719,14 +719,14 @@ def template(value: Any | None) -> template_helper.Template:
         raise vol.Invalid("template value should be a string")
     if not (hass := _async_get_hass_or_none()):
         # pylint: disable-next=import-outside-toplevel
-        from .frame import ReportBehavior, report_usage
+        from .frame import report
 
-        report_usage(
+        report(
             (
                 "validates schema outside the event loop, "
                 "which will stop working in HA Core 2025.10"
             ),
-            core_behavior=ReportBehavior.LOG,
+            error_if_core=False,
         )
 
     template_value = template_helper.Template(str(value), hass)
@@ -748,14 +748,14 @@ def dynamic_template(value: Any | None) -> template_helper.Template:
         raise vol.Invalid("template value does not contain a dynamic template")
     if not (hass := _async_get_hass_or_none()):
         # pylint: disable-next=import-outside-toplevel
-        from .frame import ReportBehavior, report_usage
+        from .frame import report
 
-        report_usage(
+        report(
             (
                 "validates schema outside the event loop, "
                 "which will stop working in HA Core 2025.10"
             ),
-            core_behavior=ReportBehavior.LOG,
+            error_if_core=False,
         )
 
     template_value = template_helper.Template(str(value), hass)
@@ -874,7 +874,7 @@ def url_no_path(value: Any) -> str:
     url_in = url(value)
 
     if urlparse(url_in).path not in ("", "/"):
-        raise vol.Invalid("url is not allowed to have a path component")
+        raise vol.Invalid("url it not allowed to have a path component")
 
     return url_in
 
diff --git a/homeassistant/helpers/deprecation.py b/homeassistant/helpers/deprecation.py
index 81f7821ec79..df65546986b 100644
--- a/homeassistant/helpers/deprecation.py
+++ b/homeassistant/helpers/deprecation.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from contextlib import suppress
 from enum import Enum, EnumType, _EnumDict
 import functools
 import inspect
@@ -165,30 +164,6 @@ def _print_deprecation_warning_internal(
     breaks_in_ha_version: str | None,
     *,
     log_when_no_integration_is_found: bool,
-) -> None:
-    # Suppress ImportError due to use of deprecated enum in core.py
-    # Can be removed in HA Core 2025.1
-    with suppress(ImportError):
-        _print_deprecation_warning_internal_impl(
-            obj_name,
-            module_name,
-            replacement,
-            description,
-            verb,
-            breaks_in_ha_version,
-            log_when_no_integration_is_found=log_when_no_integration_is_found,
-        )
-
-
-def _print_deprecation_warning_internal_impl(
-    obj_name: str,
-    module_name: str,
-    replacement: str,
-    description: str,
-    verb: str,
-    breaks_in_ha_version: str | None,
-    *,
-    log_when_no_integration_is_found: bool,
 ) -> None:
     # pylint: disable=import-outside-toplevel
     from homeassistant.core import async_get_hass_or_none
@@ -388,7 +363,7 @@ class EnumWithDeprecatedMembers(EnumType):
             _print_deprecation_warning_internal(
                 f"{cls.__name__}.{name}",
                 cls.__module__,
-                f"{deprecated[name][0]}",
+                f"{cls.__name__}.{deprecated[name][0]}",
                 "enum member",
                 "used",
                 deprecated[name][1],
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index 1f77dd3f95c..73ce1291a3c 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -21,6 +21,7 @@ from typing import TYPE_CHECKING, Any, Final, Literal, NotRequired, TypedDict, f
 from propcache import cached_property
 import voluptuous as vol
 
+from homeassistant.config import DATA_CUSTOMIZE
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
     ATTR_ATTRIBUTION,
@@ -48,7 +49,6 @@ from homeassistant.core import (
     get_hassjob_callable_job_type,
     get_release_channel,
 )
-from homeassistant.core_config import DATA_CUSTOMIZE
 from homeassistant.exceptions import (
     HomeAssistantError,
     InvalidStateError,
diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py
index 61a798dbd75..97a85fdde89 100644
--- a/homeassistant/helpers/event.py
+++ b/homeassistant/helpers/event.py
@@ -322,10 +322,6 @@ def async_track_state_change_event(
     for each one, we keep a dict of entity ids that
     care about the state change events so we can
     do a fast dict lookup to route events.
-    The passed in entity_ids will be automatically lower cased.
-
-    EVENT_STATE_CHANGED is fired on each occasion the state is updated
-    and changed, opposite of EVENT_STATE_REPORTED.
     """
     if not (entity_ids := _async_string_to_lower_list(entity_ids)):
         return _remove_empty_listener
@@ -387,10 +383,7 @@ def _async_track_state_change_event(
     action: Callable[[Event[EventStateChangedData]], Any],
     job_type: HassJobType | None,
 ) -> CALLBACK_TYPE:
-    """Faster version of async_track_state_change_event.
-
-    The passed in entity_ids will not be automatically lower cased.
-    """
+    """async_track_state_change_event without lowercasing."""
     return _async_track_event(
         _KEYED_TRACK_STATE_CHANGE, hass, entity_ids, action, job_type
     )
@@ -410,11 +403,7 @@ def async_track_state_report_event(
     action: Callable[[Event[EventStateReportedData]], Any],
     job_type: HassJobType | None = None,
 ) -> CALLBACK_TYPE:
-    """Track EVENT_STATE_REPORTED by entity_ids.
-
-    EVENT_STATE_REPORTED is fired on each occasion the state is updated
-    but not changed, opposite of EVENT_STATE_CHANGED.
-    """
+    """Track EVENT_STATE_REPORTED by entity_id without lowercasing."""
     return _async_track_event(
         _KEYED_TRACK_STATE_REPORT, hass, entity_ids, action, job_type
     )
@@ -997,14 +986,14 @@ class TrackTemplateResultInfo:
                 continue
 
             # pylint: disable-next=import-outside-toplevel
-            from .frame import ReportBehavior, report_usage
+            from .frame import report
 
-            report_usage(
+            report(
                 (
                     "calls async_track_template_result with template without hass, "
                     "which will stop working in HA Core 2025.10"
                 ),
-                core_behavior=ReportBehavior.LOG,
+                error_if_core=False,
             )
             track_template_.template.hass = hass
 
diff --git a/homeassistant/helpers/frame.py b/homeassistant/helpers/frame.py
index eda98099713..fd7e014b2ff 100644
--- a/homeassistant/helpers/frame.py
+++ b/homeassistant/helpers/frame.py
@@ -5,7 +5,6 @@ from __future__ import annotations
 import asyncio
 from collections.abc import Callable
 from dataclasses import dataclass
-import enum
 import functools
 import linecache
 import logging
@@ -145,72 +144,24 @@ def report(
     If error_if_integration is True, raise instead of log if an integration is found
     when unwinding the stack frame.
     """
-    core_behavior = ReportBehavior.ERROR if error_if_core else ReportBehavior.LOG
-    core_integration_behavior = (
-        ReportBehavior.ERROR if error_if_integration else ReportBehavior.LOG
-    )
-    custom_integration_behavior = core_integration_behavior
-
-    if log_custom_component_only:
-        if core_behavior is ReportBehavior.LOG:
-            core_behavior = ReportBehavior.IGNORE
-        if core_integration_behavior is ReportBehavior.LOG:
-            core_integration_behavior = ReportBehavior.IGNORE
-
-    report_usage(
-        what,
-        core_behavior=core_behavior,
-        core_integration_behavior=core_integration_behavior,
-        custom_integration_behavior=custom_integration_behavior,
-        exclude_integrations=exclude_integrations,
-        level=level,
-    )
-
-
-class ReportBehavior(enum.Enum):
-    """Enum for behavior on code usage."""
-
-    IGNORE = enum.auto()
-    """Ignore the code usage."""
-    LOG = enum.auto()
-    """Log the code usage."""
-    ERROR = enum.auto()
-    """Raise an error on code usage."""
-
-
-def report_usage(
-    what: str,
-    *,
-    core_behavior: ReportBehavior = ReportBehavior.ERROR,
-    core_integration_behavior: ReportBehavior = ReportBehavior.LOG,
-    custom_integration_behavior: ReportBehavior = ReportBehavior.LOG,
-    exclude_integrations: set[str] | None = None,
-    level: int = logging.WARNING,
-) -> None:
-    """Report incorrect code usage.
-
-    Similar to `report` but allows more fine-grained reporting.
-    """
     try:
         integration_frame = get_integration_frame(
             exclude_integrations=exclude_integrations
         )
     except MissingIntegrationFrame as err:
         msg = f"Detected code that {what}. Please report this issue."
-        if core_behavior is ReportBehavior.ERROR:
+        if error_if_core:
             raise RuntimeError(msg) from err
-        if core_behavior is ReportBehavior.LOG:
+        if not log_custom_component_only:
             _LOGGER.warning(msg, stack_info=True)
         return
 
-    integration_behavior = core_integration_behavior
-    if integration_frame.custom_integration:
-        integration_behavior = custom_integration_behavior
-
-    if integration_behavior is not ReportBehavior.IGNORE:
-        _report_integration(
-            what, integration_frame, level, integration_behavior is ReportBehavior.ERROR
-        )
+    if (
+        error_if_integration
+        or not log_custom_component_only
+        or integration_frame.custom_integration
+    ):
+        _report_integration(what, integration_frame, level, error_if_integration)
 
 
 def _report_integration(
diff --git a/homeassistant/helpers/hassio.py b/homeassistant/helpers/hassio.py
deleted file mode 100644
index 51503f709d6..00000000000
--- a/homeassistant/helpers/hassio.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""Hass.io helper."""
-
-import os
-
-from homeassistant.core import HomeAssistant, callback
-
-
-@callback
-def is_hassio(hass: HomeAssistant) -> bool:
-    """Return true if Hass.io is loaded.
-
-    Async friendly.
-    """
-    return "hassio" in hass.config.components
-
-
-@callback
-def get_supervisor_ip() -> str | None:
-    """Return the supervisor ip address."""
-    if "SUPERVISOR" not in os.environ:
-        return None
-    return os.environ["SUPERVISOR"].partition(":")[0]
diff --git a/homeassistant/helpers/intent.py b/homeassistant/helpers/intent.py
index b38f769b302..6bd02b8660a 100644
--- a/homeassistant/helpers/intent.py
+++ b/homeassistant/helpers/intent.py
@@ -56,7 +56,6 @@ INTENT_UNPAUSE_TIMER = "HassUnpauseTimer"
 INTENT_TIMER_STATUS = "HassTimerStatus"
 INTENT_GET_CURRENT_DATE = "HassGetCurrentDate"
 INTENT_GET_CURRENT_TIME = "HassGetCurrentTime"
-INTENT_RESPOND = "HassRespond"
 
 SLOT_SCHEMA = vol.Schema({}, extra=vol.ALLOW_EXTRA)
 
diff --git a/homeassistant/helpers/llm.py b/homeassistant/helpers/llm.py
index d322810b0ef..8b2e0660687 100644
--- a/homeassistant/helpers/llm.py
+++ b/homeassistant/helpers/llm.py
@@ -177,6 +177,11 @@ class APIInstance:
         else:
             raise HomeAssistantError(f'Tool "{tool_input.tool_name}" not found')
 
+        tool_input = ToolInput(
+            tool_name=tool_input.tool_name,
+            tool_args=tool.parameters(tool_input.tool_args),
+        )
+
         return await tool.async_call(self.api.hass, tool_input, self.llm_context)
 
 
@@ -279,7 +284,6 @@ class AssistAPI(API):
         intent.INTENT_TOGGLE,
         intent.INTENT_GET_CURRENT_DATE,
         intent.INTENT_GET_CURRENT_TIME,
-        intent.INTENT_RESPOND,
     }
 
     def __init__(self, hass: HomeAssistant) -> None:
@@ -416,9 +420,7 @@ class AssistAPI(API):
                 ):
                     continue
 
-                script_tool = ScriptTool(self.hass, state.entity_id)
-                if script_tool.parameters.schema:
-                    tools.append(script_tool)
+                tools.append(ScriptTool(self.hass, state.entity_id))
 
         return tools
 
@@ -449,16 +451,11 @@ def _get_exposed_entities(
     entities = {}
 
     for state in hass.states.async_all():
-        if not async_should_expose(hass, assistant, state.entity_id):
+        if state.domain == SCRIPT_DOMAIN:
             continue
 
-        description: str | None = None
-        if state.domain == SCRIPT_DOMAIN:
-            description, parameters = _get_cached_script_parameters(
-                hass, state.entity_id
-            )
-            if parameters.schema:  # Only list scripts without input fields here
-                continue
+        if not async_should_expose(hass, assistant, state.entity_id):
+            continue
 
         entity_entry = entity_registry.async_get(state.entity_id)
         names = [state.name]
@@ -488,9 +485,6 @@ def _get_exposed_entities(
             "state": state.state,
         }
 
-        if description:
-            info["description"] = description
-
         if area_names:
             info["areas"] = ", ".join(area_names)
 
@@ -616,83 +610,6 @@ def _selector_serializer(schema: Any) -> Any:  # noqa: C901
     return {"type": "string"}
 
 
-def _get_cached_script_parameters(
-    hass: HomeAssistant, entity_id: str
-) -> tuple[str | None, vol.Schema]:
-    """Get script description and schema."""
-    entity_registry = er.async_get(hass)
-
-    description = None
-    parameters = vol.Schema({})
-    entity_entry = entity_registry.async_get(entity_id)
-    if entity_entry and entity_entry.unique_id:
-        parameters_cache = hass.data.get(SCRIPT_PARAMETERS_CACHE)
-
-        if parameters_cache is None:
-            parameters_cache = hass.data[SCRIPT_PARAMETERS_CACHE] = {}
-
-            @callback
-            def clear_cache(event: Event) -> None:
-                """Clear script parameter cache on script reload or delete."""
-                if (
-                    event.data[ATTR_DOMAIN] == SCRIPT_DOMAIN
-                    and event.data[ATTR_SERVICE] in parameters_cache
-                ):
-                    parameters_cache.pop(event.data[ATTR_SERVICE])
-
-            cancel = hass.bus.async_listen(EVENT_SERVICE_REMOVED, clear_cache)
-
-            @callback
-            def on_homeassistant_close(event: Event) -> None:
-                """Cleanup."""
-                cancel()
-
-            hass.bus.async_listen_once(
-                EVENT_HOMEASSISTANT_CLOSE, on_homeassistant_close
-            )
-
-        if entity_entry.unique_id in parameters_cache:
-            return parameters_cache[entity_entry.unique_id]
-
-        if service_desc := service.async_get_cached_service_description(
-            hass, SCRIPT_DOMAIN, entity_entry.unique_id
-        ):
-            description = service_desc.get("description")
-            schema: dict[vol.Marker, Any] = {}
-            fields = service_desc.get("fields", {})
-
-            for field, config in fields.items():
-                field_description = config.get("description")
-                if not field_description:
-                    field_description = config.get("name")
-                key: vol.Marker
-                if config.get("required"):
-                    key = vol.Required(field, description=field_description)
-                else:
-                    key = vol.Optional(field, description=field_description)
-                if "selector" in config:
-                    schema[key] = selector.selector(config["selector"])
-                else:
-                    schema[key] = cv.string
-
-            parameters = vol.Schema(schema)
-
-            aliases: list[str] = []
-            if entity_entry.name:
-                aliases.append(entity_entry.name)
-            if entity_entry.aliases:
-                aliases.extend(entity_entry.aliases)
-            if aliases:
-                if description:
-                    description = description + ". Aliases: " + str(list(aliases))
-                else:
-                    description = "Aliases: " + str(list(aliases))
-
-            parameters_cache[entity_entry.unique_id] = (description, parameters)
-
-    return description, parameters
-
-
 class ScriptTool(Tool):
     """LLM Tool representing a Script."""
 
@@ -702,14 +619,86 @@ class ScriptTool(Tool):
         script_entity_id: str,
     ) -> None:
         """Init the class."""
+        entity_registry = er.async_get(hass)
+
         self.name = split_entity_id(script_entity_id)[1]
         if self.name[0].isdigit():
             self.name = "_" + self.name
         self._entity_id = script_entity_id
+        self.parameters = vol.Schema({})
+        entity_entry = entity_registry.async_get(script_entity_id)
+        if entity_entry and entity_entry.unique_id:
+            parameters_cache = hass.data.get(SCRIPT_PARAMETERS_CACHE)
 
-        self.description, self.parameters = _get_cached_script_parameters(
-            hass, script_entity_id
-        )
+            if parameters_cache is None:
+                parameters_cache = hass.data[SCRIPT_PARAMETERS_CACHE] = {}
+
+                @callback
+                def clear_cache(event: Event) -> None:
+                    """Clear script parameter cache on script reload or delete."""
+                    if (
+                        event.data[ATTR_DOMAIN] == SCRIPT_DOMAIN
+                        and event.data[ATTR_SERVICE] in parameters_cache
+                    ):
+                        parameters_cache.pop(event.data[ATTR_SERVICE])
+
+                cancel = hass.bus.async_listen(EVENT_SERVICE_REMOVED, clear_cache)
+
+                @callback
+                def on_homeassistant_close(event: Event) -> None:
+                    """Cleanup."""
+                    cancel()
+
+                hass.bus.async_listen_once(
+                    EVENT_HOMEASSISTANT_CLOSE, on_homeassistant_close
+                )
+
+            if entity_entry.unique_id in parameters_cache:
+                self.description, self.parameters = parameters_cache[
+                    entity_entry.unique_id
+                ]
+                return
+
+            if service_desc := service.async_get_cached_service_description(
+                hass, SCRIPT_DOMAIN, entity_entry.unique_id
+            ):
+                self.description = service_desc.get("description")
+                schema: dict[vol.Marker, Any] = {}
+                fields = service_desc.get("fields", {})
+
+                for field, config in fields.items():
+                    description = config.get("description")
+                    if not description:
+                        description = config.get("name")
+                    key: vol.Marker
+                    if config.get("required"):
+                        key = vol.Required(field, description=description)
+                    else:
+                        key = vol.Optional(field, description=description)
+                    if "selector" in config:
+                        schema[key] = selector.selector(config["selector"])
+                    else:
+                        schema[key] = cv.string
+
+                self.parameters = vol.Schema(schema)
+
+                aliases: list[str] = []
+                if entity_entry.name:
+                    aliases.append(entity_entry.name)
+                if entity_entry.aliases:
+                    aliases.extend(entity_entry.aliases)
+                if aliases:
+                    if self.description:
+                        self.description = (
+                            self.description + ". Aliases: " + str(list(aliases))
+                        )
+                    else:
+                        self.description = "Aliases: " + str(list(aliases))
+
+                parameters_cache[entity_entry.unique_id] = (
+                    self.description,
+                    self.parameters,
+                )
 
     async def async_call(
         self, hass: HomeAssistant, tool_input: ToolInput, llm_context: LLMContext
diff --git a/homeassistant/helpers/network.py b/homeassistant/helpers/network.py
index e39cc2de547..fa7fec9faea 100644
--- a/homeassistant/helpers/network.py
+++ b/homeassistant/helpers/network.py
@@ -16,8 +16,6 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import bind_hass
 from homeassistant.util.network import is_ip_address, is_loopback, normalize_url
 
-from .hassio import is_hassio
-
 TYPE_URL_INTERNAL = "internal_url"
 TYPE_URL_EXTERNAL = "external_url"
 SUPERVISOR_NETWORK_HOST = "homeassistant"
@@ -44,6 +42,10 @@ def get_supervisor_network_url(
     hass: HomeAssistant, *, allow_ssl: bool = False
 ) -> str | None:
     """Get URL for home assistant within supervisor network."""
+    # Local import to avoid circular dependencies
+    # pylint: disable-next=import-outside-toplevel
+    from homeassistant.components.hassio import is_hassio
+
     if hass.config.api is None or not is_hassio(hass):
         return None
 
@@ -178,21 +180,20 @@ def get_url(
         and request_host is not None
         and hass.config.api is not None
     ):
+        # Local import to avoid circular dependencies
+        # pylint: disable-next=import-outside-toplevel
+        from homeassistant.components.hassio import get_host_info, is_hassio
+
         scheme = "https" if hass.config.api.use_ssl else "http"
         current_url = yarl.URL.build(
             scheme=scheme, host=request_host, port=hass.config.api.port
         )
 
         known_hostnames = ["localhost"]
-        if is_hassio(hass):
-            # Local import to avoid circular dependencies
-            # pylint: disable-next=import-outside-toplevel
-            from homeassistant.components.hassio import get_host_info
-
-            if host_info := get_host_info(hass):
-                known_hostnames.extend(
-                    [host_info["hostname"], f"{host_info['hostname']}.local"]
-                )
+        if is_hassio(hass) and (host_info := get_host_info(hass)):
+            known_hostnames.extend(
+                [host_info["hostname"], f"{host_info['hostname']}.local"]
+            )
 
         if (
             (
diff --git a/homeassistant/helpers/schema_config_entry_flow.py b/homeassistant/helpers/schema_config_entry_flow.py
index af8c4c6402d..7463c9945b2 100644
--- a/homeassistant/helpers/schema_config_entry_flow.py
+++ b/homeassistant/helpers/schema_config_entry_flow.py
@@ -16,6 +16,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
+    OptionsFlowWithConfigEntry,
 )
 from homeassistant.core import HomeAssistant, callback, split_entity_id
 from homeassistant.data_entry_flow import UnknownHandler
@@ -402,7 +403,7 @@ class SchemaConfigFlowHandler(ConfigFlow, ABC):
         )
 
 
-class SchemaOptionsFlowHandler(OptionsFlow):
+class SchemaOptionsFlowHandler(OptionsFlowWithConfigEntry):
     """Handle a schema based options flow."""
 
     def __init__(
@@ -421,8 +422,10 @@ class SchemaOptionsFlowHandler(OptionsFlow):
         options, which is the union of stored options and user input from the options
         flow steps.
         """
-        self._options = copy.deepcopy(dict(config_entry.options))
-        self._common_handler = SchemaCommonFlowHandler(self, options_flow, self.options)
+        super().__init__(config_entry)
+        self._common_handler = SchemaCommonFlowHandler(
+            self, options_flow, self._options
+        )
         self._async_options_flow_finished = async_options_flow_finished
 
         for step in options_flow:
@@ -435,11 +438,6 @@ class SchemaOptionsFlowHandler(OptionsFlow):
         if async_setup_preview:
             setattr(self, "async_setup_preview", async_setup_preview)
 
-    @property
-    def options(self) -> dict[str, Any]:
-        """Return a mutable copy of the config entry options."""
-        return self._options
-
     @staticmethod
     def _async_step(
         step_id: str,
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 86dcd858c1b..ee2c4c64773 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -1133,11 +1133,7 @@ class _ScriptRun:
         self._step_log("wait for trigger", timeout)
 
         variables = {**self._variables}
-        self._variables["wait"] = {
-            "remaining": timeout,
-            "completed": False,
-            "trigger": None,
-        }
+        self._variables["wait"] = {"remaining": timeout, "trigger": None}
         trace_set_result(wait=self._variables["wait"])
 
         if timeout == 0:
@@ -1155,7 +1151,6 @@ class _ScriptRun:
             variables: dict[str, Any], context: Context | None = None
         ) -> None:
             self._async_set_remaining_time_var(timeout_handle)
-            self._variables["wait"]["completed"] = True
             self._variables["wait"]["trigger"] = variables["trigger"]
             _set_result_unless_done(done)
 
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index e3da52604cb..ac21f1da3fc 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -571,31 +571,19 @@ def async_extract_referenced_entity_ids(  # noqa: C901
             for area_entry in area_reg.areas.get_areas_for_floor(floor_id)
         )
 
-    selected.referenced_areas.update(selector.area_ids)
+    # Find devices for targeted areas
     selected.referenced_devices.update(selector.device_ids)
 
-    if not selected.referenced_areas and not selected.referenced_devices:
-        return selected
-
-    # Add indirectly referenced by device
-    selected.indirectly_referenced.update(
-        entry.entity_id
-        for device_id in selected.referenced_devices
-        for entry in entities.get_entries_for_device_id(device_id)
-        # Do not add entities which are hidden or which are config
-        # or diagnostic entities.
-        if (entry.entity_category is None and entry.hidden_by is None)
-    )
-
-    # Find devices for targeted areas
-    referenced_devices_by_area: set[str] = set()
+    selected.referenced_areas.update(selector.area_ids)
     if selected.referenced_areas:
         for area_id in selected.referenced_areas:
-            referenced_devices_by_area.update(
+            selected.referenced_devices.update(
                 device_entry.id
                 for device_entry in dev_reg.devices.get_devices_for_area_id(area_id)
             )
-    selected.referenced_devices.update(referenced_devices_by_area)
+
+    if not selected.referenced_areas and not selected.referenced_devices:
+        return selected
 
     # Add indirectly referenced by area
     selected.indirectly_referenced.update(
@@ -607,10 +595,10 @@ def async_extract_referenced_entity_ids(  # noqa: C901
         # or diagnostic entities.
         if entry.entity_category is None and entry.hidden_by is None
     )
-    # Add indirectly referenced by area through device
+    # Add indirectly referenced by device
     selected.indirectly_referenced.update(
         entry.entity_id
-        for device_id in referenced_devices_by_area
+        for device_id in selected.referenced_devices
         for entry in entities.get_entries_for_device_id(device_id)
         # Do not add entities which are hidden or which are config
         # or diagnostic entities.
@@ -622,10 +610,11 @@ def async_extract_referenced_entity_ids(  # noqa: C901
                 # by an area and the entity
                 # has no explicitly set area
                 not entry.area_id
+                # The entity's device matches a targeted device
+                or device_id in selector.device_ids
             )
         )
     )
-
     return selected
 
 
@@ -1277,14 +1266,14 @@ def async_register_entity_service(
         schema = cv.make_entity_service_schema(schema)
     elif not cv.is_entity_service_schema(schema):
         # pylint: disable-next=import-outside-toplevel
-        from .frame import ReportBehavior, report_usage
+        from .frame import report
 
-        report_usage(
+        report(
             (
                 "registers an entity service with a non entity service schema "
                 "which will stop working in HA Core 2025.9"
             ),
-            core_behavior=ReportBehavior.LOG,
+            error_if_core=False,
         )
 
     service_func: str | HassJob[..., Any]
diff --git a/homeassistant/helpers/service_info/hassio.py b/homeassistant/helpers/service_info/hassio.py
deleted file mode 100644
index 0125fef3017..00000000000
--- a/homeassistant/helpers/service_info/hassio.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""Hassio Discovery data."""
-
-from dataclasses import dataclass
-from typing import Any
-
-from homeassistant.data_entry_flow import BaseServiceInfo
-
-
-@dataclass(slots=True)
-class HassioServiceInfo(BaseServiceInfo):
-    """Prepared info from hassio entries."""
-
-    config: dict[str, Any]
-    name: str
-    slug: str
-    uuid: str
diff --git a/homeassistant/helpers/system_info.py b/homeassistant/helpers/system_info.py
index df4c45cd5ed..69e03904caa 100644
--- a/homeassistant/helpers/system_info.py
+++ b/homeassistant/helpers/system_info.py
@@ -14,7 +14,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.loader import bind_hass
 from homeassistant.util.package import is_docker_env, is_virtual_env
 
-from .hassio import is_hassio
 from .importlib import async_import_module
 from .singleton import singleton
 
@@ -53,13 +52,13 @@ async def async_get_system_info(hass: HomeAssistant) -> dict[str, Any]:
     else:
         hassio = await async_import_module(hass, "homeassistant.components.hassio")
 
-    is_hassio_ = is_hassio(hass)
+    is_hassio = hassio.is_hassio(hass)
 
     info_object = {
         "installation_type": "Unknown",
         "version": current_version,
         "dev": "dev" in current_version,
-        "hassio": is_hassio_,
+        "hassio": is_hassio,
         "virtualenv": is_virtual_env(),
         "python_version": platform.python_version(),
         "docker": False,
@@ -90,7 +89,7 @@ async def async_get_system_info(hass: HomeAssistant) -> dict[str, Any]:
         info_object["installation_type"] = "Home Assistant Core"
 
     # Enrich with Supervisor information
-    if is_hassio_:
+    if is_hassio:
         if not (info := hassio.get_info(hass)):
             _LOGGER.warning("No Home Assistant Supervisor info available")
             info = {}
diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index 2eab666bbd4..928ef2e791d 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -515,18 +515,18 @@ class Template:
         will be non optional in Home Assistant Core 2025.10.
         """
         # pylint: disable-next=import-outside-toplevel
-        from .frame import ReportBehavior, report_usage
+        from .frame import report
 
         if not isinstance(template, str):
             raise TypeError("Expected template to be a string")
 
         if not hass:
-            report_usage(
+            report(
                 (
                     "creates a template object without passing hass, "
                     "which will stop working in HA Core 2025.10"
                 ),
-                core_behavior=ReportBehavior.LOG,
+                error_if_core=False,
             )
 
         self.template: str = template.strip()
@@ -1281,7 +1281,7 @@ def result_as_boolean(template_result: Any | None) -> bool:
 
     True/not 0/'1'/'true'/'yes'/'on'/'enable' are considered truthy
     False/0/None/'0'/'false'/'no'/'off'/'disable' are considered falsy
-    All other values are falsy
+
     """
     if template_result is None:
         return False
diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py
index 87d55891e90..f5c2a2a1288 100644
--- a/homeassistant/helpers/update_coordinator.py
+++ b/homeassistant/helpers/update_coordinator.py
@@ -29,7 +29,7 @@ from homeassistant.util.dt import utcnow
 
 from . import entity, event
 from .debounce import Debouncer
-from .frame import report_usage
+from .frame import report
 from .typing import UNDEFINED, UndefinedType
 
 REQUEST_REFRESH_DEFAULT_COOLDOWN = 10
@@ -286,20 +286,24 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
         to ensure that multiple retries do not cause log spam.
         """
         if self.config_entry is None:
-            report_usage(
+            report(
                 "uses `async_config_entry_first_refresh`, which is only supported "
                 "for coordinators with a config entry and will stop working in "
-                "Home Assistant 2025.11"
+                "Home Assistant 2025.11",
+                error_if_core=True,
+                error_if_integration=False,
             )
         elif (
             self.config_entry.state
             is not config_entries.ConfigEntryState.SETUP_IN_PROGRESS
         ):
-            report_usage(
+            report(
                 "uses `async_config_entry_first_refresh`, which is only supported "
                 f"when entry state is {config_entries.ConfigEntryState.SETUP_IN_PROGRESS}, "
                 f"but it is in state {self.config_entry.state}, "
                 "This will stop working in Home Assistant 2025.11",
+                error_if_core=True,
+                error_if_integration=False,
             )
         if await self.__wrap_async_setup():
             await self._async_refresh(
diff --git a/homeassistant/loader.py b/homeassistant/loader.py
index d2e04df04c4..221a2c7ce19 100644
--- a/homeassistant/loader.py
+++ b/homeassistant/loader.py
@@ -1556,18 +1556,16 @@ class Components:
             raise ImportError(f"Unable to load {comp_name}")
 
         # Local import to avoid circular dependencies
-        # pylint: disable-next=import-outside-toplevel
-        from .helpers.frame import ReportBehavior, report_usage
+        from .helpers.frame import report  # pylint: disable=import-outside-toplevel
 
-        report_usage(
+        report(
             (
                 f"accesses hass.components.{comp_name}."
                 " This is deprecated and will stop working in Home Assistant 2025.3, it"
                 f" should be updated to import functions used from {comp_name} directly"
             ),
-            core_behavior=ReportBehavior.IGNORE,
-            core_integration_behavior=ReportBehavior.IGNORE,
-            custom_integration_behavior=ReportBehavior.LOG,
+            error_if_core=False,
+            log_custom_component_only=True,
         )
 
         wrapped = ModuleWrapper(self._hass, component)
@@ -1587,18 +1585,16 @@ class Helpers:
         helper = importlib.import_module(f"homeassistant.helpers.{helper_name}")
 
         # Local import to avoid circular dependencies
-        # pylint: disable-next=import-outside-toplevel
-        from .helpers.frame import ReportBehavior, report_usage
+        from .helpers.frame import report  # pylint: disable=import-outside-toplevel
 
-        report_usage(
+        report(
             (
                 f"accesses hass.helpers.{helper_name}."
                 " This is deprecated and will stop working in Home Assistant 2025.5, it"
                 f" should be updated to import functions used from {helper_name} directly"
             ),
-            core_behavior=ReportBehavior.IGNORE,
-            core_integration_behavior=ReportBehavior.IGNORE,
-            custom_integration_behavior=ReportBehavior.LOG,
+            error_if_core=False,
+            log_custom_component_only=True,
         )
 
         wrapped = ModuleWrapper(self._hass, helper)
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 5bc539beb86..f1e993a9c99 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -3,9 +3,9 @@
 aiodhcpwatcher==1.0.2
 aiodiscover==2.1.0
 aiodns==3.2.0
-aiohasupervisor==0.2.1
+aiohasupervisor==0.2.0b0
 aiohttp-fast-zlib==0.1.1
-aiohttp==3.11.0
+aiohttp==3.10.10
 aiohttp_cors==0.7.0
 aiozoneinfo==0.2.1
 astral==2.2
@@ -13,8 +13,6 @@ async-interrupt==1.2.0
 async-upnp-client==0.41.0
 atomicwrites-homeassistant==1.4.1
 attrs==24.2.0
-audioop-lts==0.2.1;python_version>='3.13'
-av==13.1.0
 awesomeversion==24.6.0
 bcrypt==4.2.0
 bleak-retry-connector==3.6.0
@@ -28,23 +26,23 @@ ciso8601==2.3.1
 cryptography==43.0.1
 dbus-fast==2.24.3
 fnv-hash-fast==1.0.2
-go2rtc-client==0.1.1
-ha-ffmpeg==3.2.2
+ha-av==10.1.1
+ha-ffmpeg==3.2.1
 habluetooth==3.6.0
-hass-nabucasa==0.84.0
-hassil==2.0.1
+hass-nabucasa==0.81.1
+hassil==1.7.4
 home-assistant-bluetooth==1.13.0
-home-assistant-frontend==20241106.2
-home-assistant-intents==2024.11.13
+home-assistant-frontend==20241002.3
+home-assistant-intents==2024.10.2
 httpx==0.27.2
 ifaddr==0.2.0
 Jinja2==3.1.4
 lru-dict==1.3.0
 mutagen==1.47.0
-orjson==3.10.11
+orjson==3.10.7
 packaging>=23.1
 paho-mqtt==1.6.1
-Pillow==11.0.0
+Pillow==10.4.0
 propcache==0.2.0
 psutil-home-assistant==0.0.1
 PyJWT==2.9.0
@@ -58,20 +56,16 @@ PyTurboJPEG==1.7.5
 pyudev==0.24.1
 PyYAML==6.0.2
 requests==2.32.3
-securetar==2024.2.1
 SQLAlchemy==2.0.31
-standard-aifc==3.13.0;python_version>='3.13'
-standard-telnetlib==3.13.0;python_version>='3.13'
 typing-extensions>=4.12.2,<5.0
 ulid-transform==1.0.2
 urllib3>=1.26.5,<2
-uv==0.5.0
+uv==0.4.22
 voluptuous-openapi==0.0.5
 voluptuous-serialize==2.6.0
 voluptuous==0.15.2
-webrtc-models==0.2.0
-yarl==1.17.1
-zeroconf==0.136.0
+yarl==1.15.5
+zeroconf==0.135.0
 
 # Constrain pycryptodome to avoid vulnerability
 # see https://github.com/home-assistant/core/pull/16238
@@ -84,9 +78,9 @@ httplib2>=0.19.0
 # gRPC is an implicit dependency that we want to make explicit so we manage
 # upgrades intentionally. It is a large package to build from source and we
 # want to ensure we have wheels built.
-grpcio==1.67.1
-grpcio-status==1.67.1
-grpcio-reflection==1.67.1
+grpcio==1.66.2
+grpcio-status==1.66.2
+grpcio-reflection==1.66.2
 
 # This is a old unmaintained library and is replaced with pycryptodome
 pycrypto==1000000000.0.0
@@ -106,7 +100,7 @@ uuid==1000000000.0.0
 # 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==4.6.2.post1
+anyio==4.6.0
 h11==0.14.0
 httpcore==1.0.5
 
@@ -115,8 +109,7 @@ httpcore==1.0.5
 hyperframe>=5.2.0
 
 # Ensure we run compatible with musllinux build env
-numpy==2.1.3
-pandas~=2.2.3
+numpy==1.26.4
 
 # Constrain multidict to avoid typing issues
 # https://github.com/home-assistant/core/pull/67046
@@ -127,7 +120,7 @@ backoff>=2.0
 
 # Required to avoid breaking (#101042).
 # v2 has breaking changes (#99218).
-pydantic==1.10.19
+pydantic==1.10.18
 
 # Required for Python 3.12.4 compatibility (#119223).
 mashumaro>=3.13.1
@@ -146,7 +139,7 @@ pyOpenSSL>=24.0.0
 
 # protobuf must be in package constraints for the wheel
 # builder to build binary wheels
-protobuf==5.28.3
+protobuf==5.28.2
 
 # faust-cchardet: Ensure we have a version we can build wheels
 # 2.1.18 is the first version that works with our wheel builder
@@ -168,12 +161,15 @@ get-mac==1000000000.0.0
 # We want to skip the binary wheels for the 'charset-normalizer' packages.
 # They are build with mypyc, but causes issues with our wheel builder.
 # In order to do so, we need to constrain the version.
-charset-normalizer==3.4.0
+charset-normalizer==3.2.0
 
 # dacite: Ensure we have a version that is able to handle type unions for
-# NAM, Brother, and GIOS.
+# Roborock, NAM, Brother, and GIOS.
 dacite>=1.7.0
 
+# Musle wheels for pandas 2.2.0 cannot be build for any architecture.
+pandas==2.1.4
+
 # chacha20poly1305-reuseable==0.12.x is incompatible with cryptography==43.0.x
 chacha20poly1305-reuseable>=0.13.0
 
@@ -181,8 +177,8 @@ chacha20poly1305-reuseable>=0.13.0
 # https://github.com/pycountry/pycountry/blob/ea69bab36f00df58624a0e490fdad4ccdc14268b/HISTORY.txt#L39
 pycountry>=23.12.11
 
-# scapy==2.6.0 causes CI failures due to a race condition
-scapy>=2.6.1
+# scapy<2.5.0 will not work with python3.12
+scapy>=2.5.0
 
 # tuf isn't updated to deal with breaking changes in securesystemslib==1.0.
 # Only tuf>=4 includes a constraint to <1.0.
@@ -191,7 +187,3 @@ tuf>=4.0.0
 
 # https://github.com/jd/tenacity/issues/471
 tenacity!=8.4.0
-
-# 5.0.0 breaks Timeout as a context manager
-# TypeError: 'Timeout' object does not support the context manager protocol
-async-timeout==4.0.3
diff --git a/homeassistant/runner.py b/homeassistant/runner.py
index 59775655854..102dbafe147 100644
--- a/homeassistant/runner.py
+++ b/homeassistant/runner.py
@@ -3,8 +3,10 @@
 from __future__ import annotations
 
 import asyncio
+from asyncio import events
 import dataclasses
 import logging
+import os
 import subprocess
 import threading
 from time import monotonic
@@ -56,6 +58,22 @@ class RuntimeConfig:
     safe_mode: bool = False
 
 
+def can_use_pidfd() -> bool:
+    """Check if pidfd_open is available.
+
+    Back ported from cpython 3.12
+    """
+    if not hasattr(os, "pidfd_open"):
+        return False
+    try:
+        pid = os.getpid()
+        os.close(os.pidfd_open(pid, 0))
+    except OSError:
+        # blocked by security policy like SECCOMP
+        return False
+    return True
+
+
 class HassEventLoopPolicy(asyncio.DefaultEventLoopPolicy):
     """Event loop policy for Home Assistant."""
 
@@ -63,6 +81,23 @@ class HassEventLoopPolicy(asyncio.DefaultEventLoopPolicy):
         """Init the event loop policy."""
         super().__init__()
         self.debug = debug
+        self._watcher: asyncio.AbstractChildWatcher | None = None
+
+    def _init_watcher(self) -> None:
+        """Initialize the watcher for child processes.
+
+        Back ported from cpython 3.12
+        """
+        with events._lock:  # type: ignore[attr-defined] # noqa: SLF001
+            if self._watcher is None:  # pragma: no branch
+                if can_use_pidfd():
+                    self._watcher = asyncio.PidfdChildWatcher()
+                else:
+                    self._watcher = asyncio.ThreadedChildWatcher()
+                if threading.current_thread() is threading.main_thread():
+                    self._watcher.attach_loop(
+                        self._local._loop  # type: ignore[attr-defined] # noqa: SLF001
+                    )
 
     @property
     def loop_name(self) -> str:
diff --git a/homeassistant/util/dt.py b/homeassistant/util/dt.py
index ee2b6c762d8..30cf7222f3a 100644
--- a/homeassistant/util/dt.py
+++ b/homeassistant/util/dt.py
@@ -95,7 +95,7 @@ def set_default_time_zone(time_zone: dt.tzinfo) -> None:
     get_default_time_zone.cache_clear()
 
 
-def get_time_zone(time_zone_str: str) -> zoneinfo.ZoneInfo | None:
+def get_time_zone(time_zone_str: str) -> dt.tzinfo | None:
     """Get time zone from string. Return None if unable to determine.
 
     Must be run in the executor if the ZoneInfo is not already
@@ -107,7 +107,7 @@ def get_time_zone(time_zone_str: str) -> zoneinfo.ZoneInfo | None:
         return None
 
 
-async def async_get_time_zone(time_zone_str: str) -> zoneinfo.ZoneInfo | None:
+async def async_get_time_zone(time_zone_str: str) -> dt.tzinfo | None:
     """Get time zone from string. Return None if unable to determine.
 
     Async friendly.
diff --git a/homeassistant/util/timeout.py b/homeassistant/util/timeout.py
index ddabdf2746d..821f502694b 100644
--- a/homeassistant/util/timeout.py
+++ b/homeassistant/util/timeout.py
@@ -16,7 +16,7 @@ from .async_ import run_callback_threadsafe
 ZONE_GLOBAL = "global"
 
 
-class _State(enum.Enum):
+class _State(str, enum.Enum):
     """States of a task."""
 
     INIT = "INIT"
@@ -160,16 +160,11 @@ class _GlobalTaskContext:
         self._wait_zone: asyncio.Event = asyncio.Event()
         self._state: _State = _State.INIT
         self._cool_down: float = cool_down
-        self._cancelling = 0
 
     async def __aenter__(self) -> Self:
         self._manager.global_tasks.append(self)
         self._start_timer()
         self._state = _State.ACTIVE
-        # Remember if the task was already cancelling
-        # so when we __aexit__ we can decide if we should
-        # raise asyncio.TimeoutError or let the cancellation propagate
-        self._cancelling = self._task.cancelling()
         return self
 
     async def __aexit__(
@@ -182,15 +177,7 @@ class _GlobalTaskContext:
         self._manager.global_tasks.remove(self)
 
         # Timeout on exit
-        if exc_type is asyncio.CancelledError and self.state is _State.TIMEOUT:
-            # The timeout was hit, and the task was cancelled
-            # so we need to uncancel the task since the cancellation
-            # should not leak out of the context manager
-            if self._task.uncancel() > self._cancelling:
-                # If the task was already cancelling don't raise
-                # asyncio.TimeoutError and instead return None
-                # to allow the cancellation to propagate
-                return None
+        if exc_type is asyncio.CancelledError and self.state == _State.TIMEOUT:
             raise TimeoutError
 
         self._state = _State.EXIT
@@ -279,7 +266,6 @@ class _ZoneTaskContext:
         self._time_left: float = timeout
         self._expiration_time: float | None = None
         self._timeout_handler: asyncio.Handle | None = None
-        self._cancelling = 0
 
     @property
     def state(self) -> _State:
@@ -294,11 +280,6 @@ class _ZoneTaskContext:
         if self._zone.freezes_done:
             self._start_timer()
 
-        # Remember if the task was already cancelling
-        # so when we __aexit__ we can decide if we should
-        # raise asyncio.TimeoutError or let the cancellation propagate
-        self._cancelling = self._task.cancelling()
-
         return self
 
     async def __aexit__(
@@ -311,15 +292,7 @@ class _ZoneTaskContext:
         self._stop_timer()
 
         # Timeout on exit
-        if exc_type is asyncio.CancelledError and self.state is _State.TIMEOUT:
-            # The timeout was hit, and the task was cancelled
-            # so we need to uncancel the task since the cancellation
-            # should not leak out of the context manager
-            if self._task.uncancel() > self._cancelling:
-                # If the task was already cancelling don't raise
-                # asyncio.TimeoutError and instead return None
-                # to allow the cancellation to propagate
-                return None
+        if exc_type is asyncio.CancelledError and self.state == _State.TIMEOUT:
             raise TimeoutError
 
         self._state = _State.EXIT
diff --git a/homeassistant/util/unit_conversion.py b/homeassistant/util/unit_conversion.py
index 1bf3561e66a..6bc595bd487 100644
--- a/homeassistant/util/unit_conversion.py
+++ b/homeassistant/util/unit_conversion.py
@@ -10,7 +10,6 @@ from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
     UNIT_NOT_RECOGNIZED_TEMPLATE,
-    UnitOfBloodGlucoseConcentration,
     UnitOfConductivity,
     UnitOfDataRate,
     UnitOfElectricCurrent,
@@ -174,17 +173,6 @@ class DistanceConverter(BaseUnitConverter):
     }
 
 
-class BloodGlucoseConcentrationConverter(BaseUnitConverter):
-    """Utility to convert blood glucose concentration values."""
-
-    UNIT_CLASS = "blood_glucose_concentration"
-    _UNIT_CONVERSION: dict[str | None, float] = {
-        UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER: 18,
-        UnitOfBloodGlucoseConcentration.MILLIMOLE_PER_LITER: 1,
-    }
-    VALID_UNITS = set(UnitOfBloodGlucoseConcentration)
-
-
 class ConductivityConverter(BaseUnitConverter):
     """Utility to convert electric current values."""
 
@@ -234,8 +222,6 @@ class EnergyConverter(BaseUnitConverter):
         UnitOfEnergy.WATT_HOUR: 1e3,
         UnitOfEnergy.KILO_WATT_HOUR: 1,
         UnitOfEnergy.MEGA_WATT_HOUR: 1 / 1e3,
-        UnitOfEnergy.GIGA_WATT_HOUR: 1 / 1e6,
-        UnitOfEnergy.TERA_WATT_HOUR: 1 / 1e9,
         UnitOfEnergy.CALORIE: _WH_TO_CAL * 1e3,
         UnitOfEnergy.KILO_CALORIE: _WH_TO_CAL,
         UnitOfEnergy.MEGA_CALORIE: _WH_TO_CAL / 1e3,
@@ -306,16 +292,10 @@ class PowerConverter(BaseUnitConverter):
     _UNIT_CONVERSION: dict[str | None, float] = {
         UnitOfPower.WATT: 1,
         UnitOfPower.KILO_WATT: 1 / 1000,
-        UnitOfPower.MEGA_WATT: 1 / 1e6,
-        UnitOfPower.GIGA_WATT: 1 / 1e9,
-        UnitOfPower.TERA_WATT: 1 / 1e12,
     }
     VALID_UNITS = {
         UnitOfPower.WATT,
         UnitOfPower.KILO_WATT,
-        UnitOfPower.MEGA_WATT,
-        UnitOfPower.GIGA_WATT,
-        UnitOfPower.TERA_WATT,
     }
 
 
diff --git a/homeassistant/util/yaml/loader.py b/homeassistant/util/yaml/loader.py
index 39d38a8f47d..39ac17d94f9 100644
--- a/homeassistant/util/yaml/loader.py
+++ b/homeassistant/util/yaml/loader.py
@@ -25,6 +25,7 @@ except ImportError:
 from propcache import cached_property
 
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.frame import report
 
 from .const import SECRET_YAML
 from .objects import Input, NodeDictClass, NodeListClass, NodeStrClass
@@ -143,6 +144,37 @@ class FastSafeLoader(FastestAvailableSafeLoader, _LoaderMixin):
         self.secrets = secrets
 
 
+class SafeLoader(FastSafeLoader):
+    """Provided for backwards compatibility. Logs when instantiated."""
+
+    def __init__(*args: Any, **kwargs: Any) -> None:
+        """Log a warning and call super."""
+        SafeLoader.__report_deprecated()
+        FastSafeLoader.__init__(*args, **kwargs)
+
+    @classmethod
+    def add_constructor(cls, tag: str, constructor: Callable) -> None:
+        """Log a warning and call super."""
+        SafeLoader.__report_deprecated()
+        FastSafeLoader.add_constructor(tag, constructor)
+
+    @classmethod
+    def add_multi_constructor(
+        cls, tag_prefix: str, multi_constructor: Callable
+    ) -> None:
+        """Log a warning and call super."""
+        SafeLoader.__report_deprecated()
+        FastSafeLoader.add_multi_constructor(tag_prefix, multi_constructor)
+
+    @staticmethod
+    def __report_deprecated() -> None:
+        """Log deprecation warning."""
+        report(
+            "uses deprecated 'SafeLoader' instead of 'FastSafeLoader', "
+            "which will stop working in HA Core 2024.6,"
+        )
+
+
 class PythonSafeLoader(yaml.SafeLoader, _LoaderMixin):
     """Python safe loader."""
 
@@ -152,6 +184,37 @@ class PythonSafeLoader(yaml.SafeLoader, _LoaderMixin):
         self.secrets = secrets
 
 
+class SafeLineLoader(PythonSafeLoader):
+    """Provided for backwards compatibility. Logs when instantiated."""
+
+    def __init__(*args: Any, **kwargs: Any) -> None:
+        """Log a warning and call super."""
+        SafeLineLoader.__report_deprecated()
+        PythonSafeLoader.__init__(*args, **kwargs)
+
+    @classmethod
+    def add_constructor(cls, tag: str, constructor: Callable) -> None:
+        """Log a warning and call super."""
+        SafeLineLoader.__report_deprecated()
+        PythonSafeLoader.add_constructor(tag, constructor)
+
+    @classmethod
+    def add_multi_constructor(
+        cls, tag_prefix: str, multi_constructor: Callable
+    ) -> None:
+        """Log a warning and call super."""
+        SafeLineLoader.__report_deprecated()
+        PythonSafeLoader.add_multi_constructor(tag_prefix, multi_constructor)
+
+    @staticmethod
+    def __report_deprecated() -> None:
+        """Log deprecation warning."""
+        report(
+            "uses deprecated 'SafeLineLoader' instead of 'PythonSafeLoader', "
+            "which will stop working in HA Core 2024.6,"
+        )
+
+
 type LoaderType = FastSafeLoader | PythonSafeLoader
 
 
diff --git a/mypy.ini b/mypy.ini
index 4d33f16d968..3216947b448 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -11,7 +11,6 @@ follow_imports = normal
 local_partial_types = true
 strict_equality = true
 no_implicit_optional = true
-report_deprecated_as_error = true
 warn_incomplete_stub = true
 warn_redundant_casts = true
 warn_unused_configs = true
@@ -995,16 +994,6 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
-[mypy-homeassistant.components.cambridge_audio.*]
-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.camera.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -1846,16 +1835,6 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
-[mypy-homeassistant.components.go2rtc.*]
-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.goalzero.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2996,16 +2975,6 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
-[mypy-homeassistant.components.music_assistant.*]
-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.my.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -3056,16 +3025,6 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
-[mypy-homeassistant.components.nasweb.*]
-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.neato.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -3156,16 +3115,6 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
-[mypy-homeassistant.components.nordpool.*]
-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.notify.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
diff --git a/pyproject.toml b/pyproject.toml
index ebf22a93d7d..66b71a68791 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "homeassistant"
-version     = "2024.12.0.dev0"
+version     = "2024.11.0.dev0"
 license     = {text = "Apache-2.0"}
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.rst"
@@ -19,17 +19,15 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
     "Topic :: Home Automation",
 ]
 requires-python = ">=3.12.0"
 dependencies    = [
     "aiodns==3.2.0",
     # Integrations may depend on hassio integration without listing it to
-    # change behavior based on presence of supervisor. Deprecated with #127228
-    # Lib can be removed with 2025.11
-    "aiohasupervisor==0.2.1",
-    "aiohttp==3.11.0",
+    # change behavior based on presence of supervisor
+    "aiohasupervisor==0.2.0b0",
+    "aiohttp==3.10.10",
     "aiohttp_cors==0.7.0",
     "aiohttp-fast-zlib==0.1.1",
     "aiozoneinfo==0.2.1",
@@ -37,7 +35,6 @@ dependencies    = [
     "async-interrupt==1.2.0",
     "attrs==24.2.0",
     "atomicwrites-homeassistant==1.4.1",
-    "audioop-lts==0.2.1;python_version>='3.13'",
     "awesomeversion==24.6.0",
     "bcrypt==4.2.0",
     "certifi>=2021.5.30",
@@ -45,7 +42,7 @@ dependencies    = [
     "fnv-hash-fast==1.0.2",
     # hass-nabucasa is imported by helpers which don't depend on the cloud
     # integration
-    "hass-nabucasa==0.84.0",
+    "hass-nabucasa==0.81.1",
     # When bumping httpx, please check the version pins of
     # httpcore, anyio, and h11 in gen_requirements_all
     "httpx==0.27.2",
@@ -56,31 +53,27 @@ dependencies    = [
     "PyJWT==2.9.0",
     # PyJWT has loose dependency. We want the latest one.
     "cryptography==43.0.1",
-    "Pillow==11.0.0",
+    "Pillow==10.4.0",
     "propcache==0.2.0",
     "pyOpenSSL==24.2.1",
-    "orjson==3.10.11",
+    "orjson==3.10.7",
     "packaging>=23.1",
     "psutil-home-assistant==0.0.1",
     "python-slugify==8.0.4",
     "PyYAML==6.0.2",
     "requests==2.32.3",
-    "securetar==2024.2.1",
     "SQLAlchemy==2.0.31",
-    "standard-aifc==3.13.0;python_version>='3.13'",
-    "standard-telnetlib==3.13.0;python_version>='3.13'",
     "typing-extensions>=4.12.2,<5.0",
     "ulid-transform==1.0.2",
     # Constrain urllib3 to ensure we deal with CVE-2020-26137 and CVE-2021-33503
     # Temporary setting an upper bound, to prevent compat issues with urllib3>=2
     # https://github.com/home-assistant/core/issues/97248
     "urllib3>=1.26.5,<2",
-    "uv==0.5.0",
+    "uv==0.4.22",
     "voluptuous==0.15.2",
     "voluptuous-serialize==2.6.0",
     "voluptuous-openapi==0.0.5",
-    "yarl==1.17.1",
-    "webrtc-models==0.2.0",
+    "yarl==1.15.5",
 ]
 
 [project.urls]
@@ -471,14 +464,14 @@ filterwarnings = [
     # Ignore custom pytest marks
     "ignore:Unknown pytest.mark.disable_autouse_fixture:pytest.PytestUnknownMarkWarning:tests.components.met",
     "ignore:Unknown pytest.mark.dataset:pytest.PytestUnknownMarkWarning:tests.components.screenlogic",
-    # https://github.com/rokam/sunweg/blob/3.1.0/sunweg/plant.py#L96 - v3.1.0 - 2024-10-02
+    # https://github.com/rokam/sunweg/blob/3.0.2/sunweg/plant.py#L96 - v3.0.2 - 2024-07-10
     "ignore:The '(kwh_per_kwp|performance_rate)' property is deprecated and will return 0:DeprecationWarning:tests.components.sunweg.test_init",
 
     # -- design choice 3rd party
-    # https://github.com/gwww/elkm1/blob/2.2.10/elkm1_lib/util.py#L8-L19
+    # https://github.com/gwww/elkm1/blob/2.2.7/elkm1_lib/util.py#L8-L19
     "ignore:ssl.TLSVersion.TLSv1 is deprecated:DeprecationWarning:elkm1_lib.util",
     # https://github.com/allenporter/ical/pull/215
-    # https://github.com/allenporter/ical/blob/8.2.0/ical/util.py#L21-L23
+    # https://github.com/allenporter/ical/blob/8.1.1/ical/util.py#L21-L23
     "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:ical.util",
     # https://github.com/bachya/regenmaschine/blob/2024.03.0/regenmaschine/client.py#L52
     "ignore:ssl.TLSVersion.SSLv3 is deprecated:DeprecationWarning:regenmaschine.client",
@@ -490,13 +483,10 @@ filterwarnings = [
     "ignore:Deprecated call to `pkg_resources.declare_namespace\\(('azure'|'google.*'|'pywinusb'|'repoze'|'xbox'|'zope')\\)`:DeprecationWarning:pkg_resources",
 
     # -- tracked upstream / open PRs
-    # - pyOpenSSL v24.2.1
     # https://github.com/certbot/certbot/issues/9828 - v2.11.0
-    # https://github.com/certbot/certbot/issues/9992
     "ignore:X509Extension support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
-    "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
-    "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:josepy.util",
-    # - other
+    # https://github.com/beetbox/mediafile/issues/67 - v0.12.0
+    "ignore:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning:mediafile",
     # https://github.com/foxel/python_ndms2_client/issues/6 - v0.1.3
     # https://github.com/foxel/python_ndms2_client/pull/8
     "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:ndms2_client.connection",
@@ -533,8 +523,8 @@ filterwarnings = [
     "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:onvif.client",
     # https://github.com/okunishinishi/python-stringcase/commit/6a5c5bbd3fe5337862abc7fd0853a0f36e18b2e1 - >1.2.0
     "ignore:invalid escape sequence:SyntaxWarning:.*stringcase",
-    # https://github.com/cereal2nd/velbus-aio/pull/126 - >2024.10.0
-    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:velbusaio.handler",
+    # https://github.com/mvantellingen/python-zeep/pull/1364 - >4.2.1
+    "ignore:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning:zeep.utils",
 
     # -- fixed for Python 3.13
     # https://github.com/rhasspy/wyoming/commit/e34af30d455b6f2bb9e5cfb25fad8d276914bc54 - >=1.4.2
@@ -542,9 +532,8 @@ filterwarnings = [
 
     # -- other
     # Locale changes might take some time to resolve upstream
-    # https://github.com/Squachen/micloud/blob/v_0.6/micloud/micloud.py#L35 - v0.6 - 2022-12-08
     "ignore:'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15:DeprecationWarning:micloud.micloud",
-    # https://github.com/MatsNl/pyatag/issues/11 - v0.3.7.1 - 2023-10-09
+    # https://github.com/MatsNl/pyatag/issues/11 - v0.3.7.1
     "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:pyatag.gateway",
     # https://github.com/lidatong/dataclasses-json/issues/328
     # https://github.com/lidatong/dataclasses-json/pull/351
@@ -552,19 +541,14 @@ filterwarnings = [
     # https://pypi.org/project/emulated-roku/ - v0.3.0 - 2023-12-19
     # https://github.com/martonperei/emulated_roku
     "ignore:loop argument is deprecated:DeprecationWarning:emulated_roku",
-    # https://github.com/w1ll1am23/pyeconet/blob/v0.1.23/src/pyeconet/api.py#L38 - v0.1.23 - 2024-10-08
-    "ignore:ssl.PROTOCOL_TLS is deprecated:DeprecationWarning:pyeconet.api",
-    # https://github.com/thecynic/pylutron - v0.2.16 - 2024-10-22
+    # https://github.com/thecynic/pylutron - v0.2.15
     "ignore:setDaemon\\(\\) is deprecated, set the daemon attribute instead:DeprecationWarning:pylutron",
-    # https://github.com/pschmitt/pynuki/blob/1.6.3/pynuki/utils.py#L21 - v1.6.3 - 2024-02-24
+    # https://github.com/pschmitt/pynuki/blob/1.6.3/pynuki/utils.py#L21 - v1.6.3
     "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:pynuki.utils",
-    # https://github.com/lextudio/pysnmp/blob/v7.1.10/pysnmp/smi/compiler.py#L23-L31 - v7.1.10 - 2024-11-04
-    "ignore:smiV1Relaxed is deprecated. Please use smi_v1_relaxed instead:DeprecationWarning:pysnmp.smi.compiler",
-    "ignore:getReadersFromUrls is deprecated. Please use get_readers_from_urls instead:DeprecationWarning:pysmi.reader.url",  # wrong stacklevel
     # https://github.com/briis/pyweatherflowudp/blob/v1.4.5/pyweatherflowudp/const.py#L20 - v1.4.5 - 2023-10-10
     "ignore:This function will be removed in future versions of pint:DeprecationWarning:pyweatherflowudp.const",
     # Wrong stacklevel
-    # https://bugs.launchpad.net/beautifulsoup/+bug/2034451 fixed in >4.12.3
+    # https://bugs.launchpad.net/beautifulsoup/+bug/2034451
     "ignore:It looks like you're parsing an XML document using an HTML parser:UserWarning:html.parser",
     # New in aiohttp - v3.9.0
     "ignore:It is recommended to use web.AppKey instances for keys:UserWarning:(homeassistant|tests|aiohttp_cors)",
@@ -585,10 +569,13 @@ filterwarnings = [
     "ignore:invalid escape sequence:SyntaxWarning:.*sanix",
     # https://pypi.org/project/sleekxmppfs/ - v1.4.1 - 2022-08-18
     "ignore:invalid escape sequence:SyntaxWarning:.*sleekxmppfs.thirdparty.mini_dateutil",  # codespell:ignore thirdparty
+    # https://pypi.org/project/vobject/ - v0.9.7 - 2024-03-25
+    # https://github.com/py-vobject/vobject
+    "ignore:invalid escape sequence:SyntaxWarning:.*vobject.base",
     # - pkg_resources
     # https://pypi.org/project/aiomusiccast/ - v0.14.8 - 2023-03-20
     "ignore:pkg_resources is deprecated as an API:DeprecationWarning:aiomusiccast",
-    # https://pypi.org/project/habitipy/ - v0.3.3 - 2024-10-28
+    # https://pypi.org/project/habitipy/ - v0.3.1 - 2019-01-14 / 2024-04-28
     "ignore:pkg_resources is deprecated as an API:DeprecationWarning:habitipy.api",
     # https://github.com/eavanvalkenburg/pysiaalarm/blob/v3.1.1/src/pysiaalarm/data/data.py#L7 - v3.1.1 - 2023-04-17
     "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pysiaalarm.data.data",
@@ -596,6 +583,14 @@ filterwarnings = [
     "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pybotvac.version",
     # https://github.com/home-assistant-ecosystem/python-mystrom/blob/2.2.0/pymystrom/__init__.py#L10 - v2.2.0 - 2023-05-21
     "ignore:pkg_resources is deprecated as an API:DeprecationWarning:pymystrom",
+    # https://pypi.org/project/velbus-aio/ - v2024.7.6 - 2024-07-31
+    # https://github.com/Cereal2nd/velbus-aio/blob/2024.7.6/velbusaio/handler.py#L22
+    "ignore:pkg_resources is deprecated as an API:DeprecationWarning:velbusaio.handler",
+    # - pyOpenSSL v24.2.1
+    # https://pypi.org/project/acme/ - v2.11.0 - 2024-06-06
+    "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
+    # https://pypi.org/project/josepy/ - v1.14.0 - 2023-11-01
+    "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:josepy.util",
 
     # -- Python 3.13
     # HomeAssistant
@@ -605,11 +600,11 @@ filterwarnings = [
     # https://github.com/nextcord/nextcord/issues/1174
     # https://github.com/nextcord/nextcord/blob/v2.6.1/nextcord/player.py#L5
     "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:nextcord.player",
-    # https://pypi.org/project/SpeechRecognition/ - v3.11.0 - 2024-05-05
-    # https://github.com/Uberi/speech_recognition/blob/3.11.0/speech_recognition/__init__.py#L7
+    # https://pypi.org/project/SpeechRecognition/ - v3.10.4 - 2024-05-05
+    # https://github.com/Uberi/speech_recognition/blob/3.10.4/speech_recognition/__init__.py#L7
     "ignore:'aifc' is deprecated and slated for removal in Python 3.13:DeprecationWarning:speech_recognition",
     # https://pypi.org/project/voip-utils/ - v0.2.0 - 2024-09-06
-    # https://github.com/home-assistant-libs/voip-utils/blob/0.2.0/voip_utils/rtp_audio.py#L3
+    # https://github.com/home-assistant-libs/voip-utils/blob/v0.2.0/voip_utils/rtp_audio.py#L3
     "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:voip_utils.rtp_audio",
 
     # -- Python 3.13 - unmaintained projects, last release about 2+ years
@@ -621,17 +616,6 @@ filterwarnings = [
     # https://github.com/ssaenger/pyws66i/blob/v1.1/pyws66i/__init__.py#L2
     "ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:pyws66i",
 
-    # -- New in Python 3.13
-    # https://github.com/kurtmckee/feedparser/pull/389 - >6.0.11
-    # https://github.com/kurtmckee/feedparser/issues/481
-    "ignore:'count' is passed as positional argument:DeprecationWarning:feedparser.html",
-    # https://github.com/youknowone/python-deadlib - Backports for aifc, telnetlib
-    "ignore:aifc was removed in Python 3.13.*'standard-aifc':DeprecationWarning:speech_recognition",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:homeassistant.components.hddtemp.sensor",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:ndms2_client.connection",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:plumlightpad.lightpad",
-    "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:pyws66i",
-
     # -- unmaintained projects, last release about 2+ years
     # https://pypi.org/project/agent-py/ - v0.0.23 - 2020-06-04
     "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:agent.a",
@@ -642,7 +626,7 @@ filterwarnings = [
     # https://pypi.org/project/directv/ - v0.4.0 - 2020-09-12
     "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:directv.directv",
     "ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:directv.models",
-    # https://pypi.org/project/foobot_async/ - v1.0.1 - 2024-08-16
+    # https://pypi.org/project/foobot_async/ - v1.0.0 - 2020-11-24
     "ignore:with timeout\\(\\) is deprecated:DeprecationWarning:foobot_async",
     # https://pypi.org/project/httpsig/ - v1.3.0 - 2018-11-28
     "ignore:pkg_resources is deprecated as an API:DeprecationWarning:httpsig",
diff --git a/requirements.txt b/requirements.txt
index b97c8dc57a0..b1c3842cd1d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,8 +4,8 @@
 
 # Home Assistant Core
 aiodns==3.2.0
-aiohasupervisor==0.2.1
-aiohttp==3.11.0
+aiohasupervisor==0.2.0b0
+aiohttp==3.10.10
 aiohttp_cors==0.7.0
 aiohttp-fast-zlib==0.1.1
 aiozoneinfo==0.2.1
@@ -13,13 +13,12 @@ astral==2.2
 async-interrupt==1.2.0
 attrs==24.2.0
 atomicwrites-homeassistant==1.4.1
-audioop-lts==0.2.1;python_version>='3.13'
 awesomeversion==24.6.0
 bcrypt==4.2.0
 certifi>=2021.5.30
 ciso8601==2.3.1
 fnv-hash-fast==1.0.2
-hass-nabucasa==0.84.0
+hass-nabucasa==0.81.1
 httpx==0.27.2
 home-assistant-bluetooth==1.13.0
 ifaddr==0.2.0
@@ -27,25 +26,21 @@ Jinja2==3.1.4
 lru-dict==1.3.0
 PyJWT==2.9.0
 cryptography==43.0.1
-Pillow==11.0.0
+Pillow==10.4.0
 propcache==0.2.0
 pyOpenSSL==24.2.1
-orjson==3.10.11
+orjson==3.10.7
 packaging>=23.1
 psutil-home-assistant==0.0.1
 python-slugify==8.0.4
 PyYAML==6.0.2
 requests==2.32.3
-securetar==2024.2.1
 SQLAlchemy==2.0.31
-standard-aifc==3.13.0;python_version>='3.13'
-standard-telnetlib==3.13.0;python_version>='3.13'
 typing-extensions>=4.12.2,<5.0
 ulid-transform==1.0.2
 urllib3>=1.26.5,<2
-uv==0.5.0
+uv==0.4.22
 voluptuous==0.15.2
 voluptuous-serialize==2.6.0
 voluptuous-openapi==0.0.5
-yarl==1.17.1
-webrtc-models==0.2.0
+yarl==1.15.5
diff --git a/requirements_all.txt b/requirements_all.txt
index 65ef5f1ebf2..69e3ed97e74 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -13,10 +13,10 @@ AIOSomecomfort==0.0.25
 Adax-local==0.1.5
 
 # homeassistant.components.doorbird
-DoorBirdPy==3.0.8
+DoorBirdPy==3.0.4
 
 # homeassistant.components.homekit
-HAP-python==4.9.2
+HAP-python==4.9.1
 
 # homeassistant.components.tasmota
 HATasmota==0.9.2
@@ -33,7 +33,7 @@ Mastodon.py==1.8.1
 # homeassistant.components.seven_segments
 # homeassistant.components.sighthound
 # homeassistant.components.tensorflow
-Pillow==11.0.0
+Pillow==10.4.0
 
 # homeassistant.components.plex
 PlexAPI==4.15.16
@@ -45,7 +45,7 @@ ProgettiHWSW==0.1.3
 # PyBluez==0.22
 
 # homeassistant.components.cast
-PyChromecast==14.0.5
+PyChromecast==14.0.4
 
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
@@ -84,7 +84,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.switchbot
-PySwitchbot==0.51.0
+PySwitchbot==0.48.2
 
 # homeassistant.components.switchmate
 PySwitchmate==0.5.1
@@ -100,7 +100,7 @@ PyTransportNSW==0.1.1
 PyTurboJPEG==1.7.5
 
 # homeassistant.components.vicare
-PyViCare==2.35.0
+PyViCare==2.34.0
 
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
@@ -152,7 +152,7 @@ advantage-air==0.4.4
 afsapi==0.2.7
 
 # homeassistant.components.agent_dvr
-agent-py==0.0.24
+agent-py==0.0.23
 
 # homeassistant.components.geo_json_events
 aio-geojson-generic-client==0.4
@@ -172,17 +172,14 @@ aio-geojson-usgs-earthquakes==0.3
 # homeassistant.components.gdacs
 aio-georss-gdacs==0.10
 
-# homeassistant.components.acaia
-aioacaia==0.1.6
-
 # homeassistant.components.airq
 aioairq==0.3.2
 
 # homeassistant.components.airzone_cloud
-aioairzone-cloud==0.6.10
+aioairzone-cloud==0.6.7
 
 # homeassistant.components.airzone
-aioairzone==0.9.6
+aioairzone==0.9.5
 
 # homeassistant.components.ambient_network
 # homeassistant.components.ambient_station
@@ -201,7 +198,7 @@ aioaseko==1.0.0
 aioasuswrt==1.4.0
 
 # homeassistant.components.husqvarna_automower
-aioautomower==2024.10.3
+aioautomower==2024.10.0
 
 # homeassistant.components.azure_devops
 aioazuredevops==2.2.1
@@ -213,7 +210,7 @@ aiobafi6==0.9.0
 aiobotocore==2.13.1
 
 # homeassistant.components.comelit
-aiocomelit==0.9.1
+aiocomelit==0.9.0
 
 # homeassistant.components.dhcp
 aiodhcpwatcher==1.0.2
@@ -243,7 +240,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==27.0.1
+aioesphomeapi==27.0.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -262,10 +259,10 @@ aioguardian==2022.07.0
 aioharmony==0.2.10
 
 # homeassistant.components.hassio
-aiohasupervisor==0.2.1
+aiohasupervisor==0.2.0b0
 
 # homeassistant.components.homekit_controller
-aiohomekit==3.2.6
+aiohomekit==3.2.3
 
 # homeassistant.components.hue
 aiohue==4.7.3
@@ -319,10 +316,10 @@ aionut==4.3.3
 aiooncue==0.3.7
 
 # homeassistant.components.openexchangerates
-aioopenexchangerates==0.6.8
+aioopenexchangerates==0.6.2
 
 # homeassistant.components.nmap_tracker
-aiooui==0.1.7
+aiooui==0.1.6
 
 # homeassistant.components.pegel_online
 aiopegelonline==0.0.10
@@ -357,10 +354,10 @@ aiorecollect==2023.09.0
 aioridwell==2024.01.0
 
 # homeassistant.components.ruckus_unleashed
-aioruckus==0.42
+aioruckus==0.41
 
 # homeassistant.components.russound_rio
-aiorussound==4.1.0
+aiorussound==4.0.5
 
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
@@ -369,7 +366,7 @@ aioruuvigateway==0.1.0
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==12.0.1
+aioshelly==12.0.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
@@ -384,10 +381,10 @@ aiosolaredge==0.2.0
 aiosteamist==1.0.0
 
 # homeassistant.components.cambridge_audio
-aiostreammagic==2.8.5
+aiostreammagic==2.8.1
 
 # homeassistant.components.switcher_kis
-aioswitcher==4.4.0
+aioswitcher==4.0.3
 
 # homeassistant.components.syncthing
 aiosyncthing==0.5.1
@@ -395,9 +392,6 @@ aiosyncthing==0.5.1
 # homeassistant.components.tankerkoenig
 aiotankerkoenig==0.4.2
 
-# homeassistant.components.tedee
-aiotedee==0.2.20
-
 # homeassistant.components.tractive
 aiotractive==0.6.0
 
@@ -408,7 +402,7 @@ aiounifi==80
 aiovlc==0.5.1
 
 # homeassistant.components.vodafone_station
-aiovodafone==0.6.1
+aiovodafone==0.6.0
 
 # homeassistant.components.waqi
 aiowaqi==3.1.0
@@ -420,7 +414,7 @@ aiowatttime==0.1.1
 aiowebostv==0.4.2
 
 # homeassistant.components.withings
-aiowithings==3.1.3
+aiowithings==3.1.0
 
 # homeassistant.components.yandex_transport
 aioymaps==1.2.5
@@ -432,7 +426,7 @@ airgradient==0.9.1
 airly==1.1.0
 
 # homeassistant.components.airthings_ble
-airthings-ble==0.9.2
+airthings-ble==0.9.1
 
 # homeassistant.components.airthings
 airthings-cloud==0.2.0
@@ -471,7 +465,7 @@ anthemav==1.4.1
 anthropic==0.31.2
 
 # homeassistant.components.weatherkit
-apple_weatherkit==1.1.3
+apple_weatherkit==1.1.2
 
 # homeassistant.components.apprise
 apprise==1.9.0
@@ -527,14 +521,7 @@ auroranoaa==0.0.5
 aurorapy==0.2.7
 
 # homeassistant.components.autarco
-autarco==3.1.0
-
-# homeassistant.components.husqvarna_automower_ble
-automower-ble==0.2.0
-
-# homeassistant.components.generic
-# homeassistant.components.stream
-av==13.1.0
+autarco==3.0.0
 
 # homeassistant.components.avea
 # avea==1.5.1
@@ -543,10 +530,10 @@ av==13.1.0
 # avion==0.10
 
 # homeassistant.components.axis
-axis==63
+axis==62
 
 # homeassistant.components.fujitsu_fglair
-ayla-iot-unofficial==1.4.3
+ayla-iot-unofficial==1.4.2
 
 # homeassistant.components.azure_event_hub
 azure-eventhub==5.11.1
@@ -582,7 +569,7 @@ beautifulsoup4==4.12.3
 # beewi-smartclim==0.0.10
 
 # homeassistant.components.bmw_connected_drive
-bimmer-connected[china]==0.16.4
+bimmer-connected[china]==0.16.3
 
 # homeassistant.components.bizkaibus
 bizkaibus==0.1.1
@@ -642,7 +629,7 @@ boto3==1.34.131
 botocore==1.34.131
 
 # homeassistant.components.bring
-bring-api==0.9.1
+bring-api==0.9.0
 
 # homeassistant.components.broadlink
 broadlink==0.19.0
@@ -708,7 +695,7 @@ connect-box==0.3.1
 construct==2.10.68
 
 # homeassistant.components.utility_meter
-cronsim==2.6
+croniter==2.0.2
 
 # homeassistant.components.crownstone
 crownstone-cloud==1.4.11
@@ -738,7 +725,7 @@ debugpy==1.8.6
 # decora==0.6
 
 # homeassistant.components.ecovacs
-deebot-client==8.4.1
+deebot-client==8.4.0
 
 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
@@ -863,7 +850,7 @@ epion==0.0.3
 epson-projector==0.5.1
 
 # homeassistant.components.eq3btsmart
-eq3btsmart==1.4.1
+eq3btsmart==1.2.0
 
 # homeassistant.components.esphome
 esphome-dashboard-api==1.2.3
@@ -947,19 +934,19 @@ freesms==0.2.0
 fritzconnection[qr]==1.14.0
 
 # homeassistant.components.fyta
-fyta_cli==0.6.10
+fyta_cli==0.6.7
 
 # homeassistant.components.google_translate
 gTTS==2.2.4
 
 # homeassistant.components.gardena_bluetooth
-gardena-bluetooth==1.4.4
+gardena-bluetooth==1.4.3
 
 # homeassistant.components.google_assistant_sdk
 gassist-text==0.0.11
 
 # homeassistant.components.google
-gcal-sync==6.2.0
+gcal-sync==6.1.6
 
 # homeassistant.components.geniushub
 geniushub-client==0.7.1
@@ -996,7 +983,7 @@ gitterpy==0.1.7
 glances-api==0.8.0
 
 # homeassistant.components.go2rtc
-go2rtc-client==0.1.1
+go2rtc-client==0.0.1b0
 
 # homeassistant.components.goalzero
 goalzero==0.2.2
@@ -1021,7 +1008,7 @@ google-cloud-texttospeech==2.17.2
 google-generativeai==0.8.2
 
 # homeassistant.components.nest
-google-nest-sdm==6.1.5
+google-nest-sdm==6.1.3
 
 # homeassistant.components.google_photos
 google-photos-library-api==0.12.1
@@ -1030,7 +1017,7 @@ google-photos-library-api==0.12.1
 googlemaps==2.5.1
 
 # homeassistant.components.slide
-goslide-api==0.7.0
+goslide-api==0.5.1
 
 # homeassistant.components.tailwind
 gotailwind==0.2.4
@@ -1039,7 +1026,7 @@ gotailwind==0.2.4
 govee-ble==0.40.0
 
 # homeassistant.components.govee_light_local
-govee-local-api==1.5.3
+govee-local-api==1.5.2
 
 # homeassistant.components.remote_rpi_gpio
 gpiozero==1.6.2
@@ -1069,13 +1056,17 @@ gspread==5.5.0
 gstreamer-player==1.1.2
 
 # homeassistant.components.profiler
-guppy3==3.1.4.post1;python_version<'3.13'
+guppy3==3.1.4.post1
 
 # homeassistant.components.iaqualink
 h2==4.1.0
 
+# homeassistant.components.generic
+# homeassistant.components.stream
+ha-av==10.1.1
+
 # homeassistant.components.ffmpeg
-ha-ffmpeg==3.2.2
+ha-ffmpeg==3.2.1
 
 # homeassistant.components.iotawatt
 ha-iotawattpy==0.1.2
@@ -1084,25 +1075,25 @@ ha-iotawattpy==0.1.2
 ha-philipsjs==3.2.2
 
 # homeassistant.components.habitica
-habitipy==0.3.3
+habitipy==0.3.1
 
 # homeassistant.components.bluetooth
 habluetooth==3.6.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.84.0
+hass-nabucasa==0.81.1
 
 # homeassistant.components.splunk
 hass-splunk==0.1.1
 
 # homeassistant.components.conversation
-hassil==2.0.1
+hassil==1.7.4
 
 # homeassistant.components.jewish_calendar
 hdate==0.10.9
 
 # homeassistant.components.heatmiser
-heatmiserV3==2.0.3
+heatmiserV3==1.1.18
 
 # homeassistant.components.here_travel_time
 here-routing==1.0.1
@@ -1127,13 +1118,13 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.60
+holidays==0.58
 
 # homeassistant.components.frontend
-home-assistant-frontend==20241106.2
+home-assistant-frontend==20241002.3
 
 # homeassistant.components.conversation
-home-assistant-intents==2024.11.13
+home-assistant-intents==2024.10.2
 
 # homeassistant.components.home_connect
 homeconnect==0.8.0
@@ -1148,10 +1139,10 @@ horimote==0.4.1
 httplib2==0.20.4
 
 # homeassistant.components.huawei_lte
-huawei-lte-api==1.10.0
+huawei-lte-api==1.9.3
 
 # homeassistant.components.huum
-huum==0.7.12
+huum==0.7.10
 
 # homeassistant.components.hyperion
 hyperion-py==0.7.5
@@ -1259,10 +1250,10 @@ knx-frontend==2024.9.10.221729
 konnected==1.2.0
 
 # homeassistant.components.kraken
-krakenex==2.2.2
+krakenex==2.1.0
 
 # homeassistant.components.lacrosse_view
-lacrosse-view==1.0.3
+lacrosse-view==1.0.2
 
 # homeassistant.components.eufy
 lakeside==0.13
@@ -1271,7 +1262,7 @@ lakeside==0.13
 laundrify-aio==1.2.2
 
 # homeassistant.components.lcn
-lcn-frontend==0.2.2
+lcn-frontend==0.1.6
 
 # homeassistant.components.ld2410_ble
 ld2410-ble==0.1.1
@@ -1283,7 +1274,7 @@ leaone-ble==0.1.0
 led-ble==1.0.2
 
 # homeassistant.components.lektrico
-lektricowifi==0.0.43
+lektricowifi==0.0.42
 
 # homeassistant.components.foscam
 libpyfoscam==1.2.2
@@ -1312,6 +1303,9 @@ linear-garage-door==0.2.9
 # homeassistant.components.linode
 linode-api==4.1.9b1
 
+# homeassistant.components.lamarzocco
+lmcloud==1.2.3
+
 # homeassistant.components.google_maps
 locationsharinglib==5.0.1
 
@@ -1376,7 +1370,7 @@ microBeesPy==0.3.2
 mill-local==0.3.0
 
 # homeassistant.components.mill
-millheater==0.12.2
+millheater==0.11.8
 
 # homeassistant.components.minio
 minio==7.1.12
@@ -1388,7 +1382,7 @@ moat-ble==0.1.1
 moehlenhoff-alpha2==1.3.1
 
 # homeassistant.components.monzo
-monzopy==1.4.2
+monzopy==1.3.2
 
 # homeassistant.components.mopeka
 mopeka-iot-ble==0.8.0
@@ -1408,9 +1402,6 @@ mozart-api==4.1.1.116.0
 # homeassistant.components.mullvad
 mullvad-api==1.0.0
 
-# homeassistant.components.music_assistant
-music-assistant-client==1.0.5
-
 # homeassistant.components.tts
 mutagen==1.47.0
 
@@ -1460,7 +1451,7 @@ nextdns==3.3.0
 nibe==2.11.0
 
 # homeassistant.components.nice_go
-nice-go==0.3.10
+nice-go==0.3.9
 
 # homeassistant.components.niko_home_control
 niko-home-control==0.2.1
@@ -1494,10 +1485,10 @@ numato-gpio==0.13.0
 # homeassistant.components.stream
 # homeassistant.components.tensorflow
 # homeassistant.components.trend
-numpy==2.1.3
+numpy==1.26.4
 
 # homeassistant.components.nyt_games
-nyt_games==0.4.4
+nyt_games==0.4.3
 
 # homeassistant.components.oasa_telematics
 oasatelematics==0.3
@@ -1557,7 +1548,7 @@ openwrt-luci-rpc==1.1.17
 openwrt-ubus-rpc==0.0.2
 
 # homeassistant.components.opower
-opower==0.8.6
+opower==0.8.4
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -1622,7 +1613,7 @@ plexauth==0.0.6
 plexwebsocket==0.0.14
 
 # homeassistant.components.plugwise
-plugwise==1.5.0
+plugwise==1.4.3
 
 # homeassistant.components.plum_lightpad
 plumlightpad==0.0.11
@@ -1654,7 +1645,7 @@ proxmoxer==2.0.1
 psutil-home-assistant==0.0.1
 
 # homeassistant.components.systemmonitor
-psutil==6.1.0
+psutil==6.0.0
 
 # homeassistant.components.pulseaudio_loopback
 pulsectl==23.5.2
@@ -1723,7 +1714,7 @@ pyCEC==0.5.2
 pyControl4==1.2.0
 
 # homeassistant.components.duotecno
-pyDuotecno==2024.10.1
+pyDuotecno==2024.10.0
 
 # homeassistant.components.electrasmart
 pyElectra==1.2.4
@@ -1741,7 +1732,7 @@ pyRFXtrx==0.31.1
 pySDCP==1
 
 # homeassistant.components.tibber
-pyTibber==0.30.8
+pyTibber==0.30.3
 
 # homeassistant.components.dlink
 pyW215==0.7.0
@@ -1826,7 +1817,7 @@ pycomfoconnect==0.5.1
 pycoolmasternet-async==0.2.2
 
 # homeassistant.components.radio_browser
-pycountry==24.6.1
+pycountry==23.12.11
 
 # homeassistant.components.microsoft
 pycsspeechtts==1.0.8
@@ -1841,7 +1832,7 @@ pydaikin==2.13.7
 pydanfossair==0.1.0
 
 # homeassistant.components.deako
-pydeako==0.5.4
+pydeako==0.4.0
 
 # homeassistant.components.deconz
 pydeconz==118
@@ -1889,7 +1880,7 @@ pyegps==0.2.5
 pyeiscp==0.0.7
 
 # homeassistant.components.emoncms
-pyemoncms==0.1.1
+pyemoncms==0.0.7
 
 # homeassistant.components.enphase_envoy
 pyenphase==1.22.0
@@ -1910,7 +1901,7 @@ pyevilgenius==2.0.0
 pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
-pyfibaro==0.8.0
+pyfibaro==0.7.8
 
 # homeassistant.components.fido
 pyfido==2.1.2
@@ -2026,9 +2017,6 @@ pykwb==0.0.8
 # homeassistant.components.lacrosse
 pylacrosse==0.4
 
-# homeassistant.components.lamarzocco
-pylamarzocco==1.2.3
-
 # homeassistant.components.lastfm
 pylast==5.1.0
 
@@ -2051,7 +2039,7 @@ pylitterbot==2023.5.0
 pylutron-caseta==0.21.1
 
 # homeassistant.components.lutron
-pylutron==0.2.16
+pylutron==0.2.15
 
 # homeassistant.components.mailgun
 pymailgunner==1.4
@@ -2090,7 +2078,7 @@ pymsteams==0.1.12
 pymysensors==0.24.0
 
 # homeassistant.components.iron_os
-pynecil==0.2.1
+pynecil==0.2.0
 
 # homeassistant.components.netgear
 pynetgear==0.10.10
@@ -2101,9 +2089,6 @@ pynetio==0.1.9.1
 # homeassistant.components.nobo_hub
 pynobo==1.8.1
 
-# homeassistant.components.nordpool
-pynordpool==0.2.2
-
 # homeassistant.components.nuki
 pynuki==1.6.3
 
@@ -2154,9 +2139,6 @@ pyoverkiz==1.14.1
 # homeassistant.components.onewire
 pyownet==0.10.0.post1
 
-# homeassistant.components.palazzetti
-pypalazzetti==0.1.11
-
 # homeassistant.components.elv
 pypca==0.0.7
 
@@ -2293,7 +2275,7 @@ pysqueezebox==0.10.0
 pystiebeleltron==0.0.1.dev2
 
 # homeassistant.components.suez_water
-pysuezV2==1.3.1
+pysuez==0.2.0
 
 # homeassistant.components.switchbee
 pyswitchbee==1.8.3
@@ -2301,6 +2283,9 @@ pyswitchbee==1.8.3
 # homeassistant.components.tautulli
 pytautulli==23.1.1
 
+# homeassistant.components.tedee
+pytedee-async==0.2.20
+
 # homeassistant.components.thinkingcleaner
 pythinkingcleaner==0.0.3
 
@@ -2314,7 +2299,7 @@ python-awair==0.2.4
 python-blockchain-api==0.0.2
 
 # homeassistant.components.bsblan
-python-bsblan==1.2.1
+python-bsblan==0.6.2
 
 # homeassistant.components.clementine
 python-clementine-remote==1.0.1
@@ -2362,10 +2347,10 @@ python-join-api==0.0.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa[speedups]==0.7.7
+python-kasa[speedups]==0.7.5
 
 # homeassistant.components.linkplay
-python-linkplay==0.0.20
+python-linkplay==0.0.15
 
 # homeassistant.components.lirc
 # python-lirc==1.2.3
@@ -2402,7 +2387,7 @@ python-rabbitair==0.0.8
 python-ripple-api==0.0.3
 
 # homeassistant.components.roborock
-python-roborock==2.7.2
+python-roborock==2.6.0
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.36
@@ -2411,7 +2396,7 @@ python-smarttub==0.0.36
 python-songpal==0.16.2
 
 # homeassistant.components.tado
-python-tado==0.17.7
+python-tado==0.17.6
 
 # homeassistant.components.technove
 python-technove==1.3.1
@@ -2505,7 +2490,7 @@ pywmspro==0.2.1
 pyws66i==1.1
 
 # homeassistant.components.xeoma
-pyxeoma==1.4.2
+pyxeoma==1.4.1
 
 # homeassistant.components.yardian
 pyyardian==1.1.1
@@ -2529,7 +2514,7 @@ qnapstats==0.4.0
 quantum-gateway==0.0.8
 
 # homeassistant.components.radio_browser
-radios==0.3.2
+radios==0.3.1
 
 # homeassistant.components.radiotherm
 radiotherm==2.1.0
@@ -2556,7 +2541,7 @@ renault-api==0.2.7
 renson-endura-delta==1.7.1
 
 # homeassistant.components.reolink
-reolink-aio==0.11.1
+reolink-aio==0.10.0
 
 # homeassistant.components.idteck_prox
 rfk101py==0.0.1
@@ -2565,7 +2550,7 @@ rfk101py==0.0.1
 rflink==0.0.66
 
 # homeassistant.components.ring
-ring-doorbell==0.9.12
+ring-doorbell==0.9.8
 
 # homeassistant.components.fleetgo
 ritassist==0.9.2
@@ -2632,7 +2617,7 @@ sendgrid==6.8.2
 
 # homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense-energy==0.13.3
+sense-energy==0.12.4
 
 # homeassistant.components.sensirion_ble
 sensirion-ble==0.1.1
@@ -2641,7 +2626,7 @@ sensirion-ble==0.1.1
 sensorpro-ble==0.5.3
 
 # homeassistant.components.sensorpush
-sensorpush-ble==1.7.1
+sensorpush-ble==1.6.2
 
 # homeassistant.components.sensoterra
 sensoterra==2.0.1
@@ -2676,9 +2661,6 @@ simplisafe-python==2024.01.0
 # homeassistant.components.sisyphus
 sisyphus-control==3.1.4
 
-# homeassistant.components.sky_remote
-skyboxremote==0.0.6
-
 # homeassistant.components.slack
 slackclient==2.5.0
 
@@ -2695,7 +2677,7 @@ smhi-pkg==1.0.18
 snapcast==2.3.6
 
 # homeassistant.components.sonos
-soco==0.30.6
+soco==0.30.4
 
 # homeassistant.components.solaredge_local
 solaredge-local==0.2.3
@@ -2719,7 +2701,7 @@ speak2mary==1.4.0
 speedtest-cli==2.1.3
 
 # homeassistant.components.spotify
-spotifyaio==0.8.8
+spotifyaio==0.7.1
 
 # homeassistant.components.sql
 sqlparse==0.5.0
@@ -2818,9 +2800,6 @@ tesla-powerwall==0.5.2
 # homeassistant.components.tesla_wall_connector
 tesla-wall-connector==1.0.2
 
-# homeassistant.components.teslemetry
-teslemetry-stream==0.4.2
-
 # homeassistant.components.tessie
 tessie-api==0.1.1
 
@@ -2836,9 +2815,6 @@ thermopro-ble==0.10.0
 # homeassistant.components.thingspeak
 thingspeak==1.0.0
 
-# homeassistant.components.lg_thinq
-thinqconnect==1.0.0
-
 # homeassistant.components.tikteck
 tikteck==0.4
 
@@ -2864,7 +2840,7 @@ total-connect-client==2024.5
 tp-connected==0.0.4
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.4.3
+tplink-omada-client==1.4.2
 
 # homeassistant.components.transmission
 transmission-rpc==7.0.3
@@ -2879,7 +2855,7 @@ ttls==1.8.3
 ttn_client==1.2.0
 
 # homeassistant.components.tuya
-tuya-device-sharing-sdk==0.2.1
+tuya-device-sharing-sdk==0.1.9
 
 # homeassistant.components.twentemilieu
 twentemilieu==2.0.1
@@ -2897,7 +2873,7 @@ typedmonarchmoney==0.3.1
 uasiren==0.0.1
 
 # homeassistant.components.unifiprotect
-uiprotect==6.4.0
+uiprotect==6.3.1
 
 # homeassistant.components.landisgyr_heat_meter
 ultraheat-api==0.5.7
@@ -2912,7 +2888,7 @@ unifi_ap==0.0.1
 unifiled==0.11
 
 # homeassistant.components.zha
-universal-silabs-flasher==0.0.24
+universal-silabs-flasher==0.0.23
 
 # homeassistant.components.upb
 upb-lib==0.5.8
@@ -2938,7 +2914,7 @@ vallox-websocket-api==5.3.0
 vehicle==2.2.2
 
 # homeassistant.components.velbus
-velbus-aio==2024.10.0
+velbus-aio==2024.7.6
 
 # homeassistant.components.venstar
 venstarcolortouch==0.19
@@ -2986,14 +2962,11 @@ weatherflow4py==1.0.6
 # homeassistant.components.cisco_webex_teams
 webexpythonsdk==2.0.1
 
-# homeassistant.components.nasweb
-webio-api==0.1.8
-
 # homeassistant.components.webmin
 webmin-xmlrpc==0.0.2
 
 # homeassistant.components.weheat
-weheat==2024.11.02
+weheat==2024.09.23
 
 # homeassistant.components.whirlpool
 whirlpool-sixth-sense==0.18.8
@@ -3020,7 +2993,7 @@ wyoming==1.5.4
 xbox-webapi==2.0.11
 
 # homeassistant.components.xiaomi_ble
-xiaomi-ble==0.33.0
+xiaomi-ble==0.32.0
 
 # homeassistant.components.knx
 xknx==3.3.0
@@ -3066,7 +3039,7 @@ youless-api==2.1.2
 youtubeaio==1.1.5
 
 # homeassistant.components.media_extractor
-yt-dlp[default]==2024.11.04
+yt-dlp==2024.10.07
 
 # homeassistant.components.zamg
 zamg==0.3.6
@@ -3075,13 +3048,13 @@ zamg==0.3.6
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.136.0
+zeroconf==0.135.0
 
 # homeassistant.components.zeversolar
-zeversolar==0.3.2
+zeversolar==0.3.1
 
 # homeassistant.components.zha
-zha==0.0.37
+zha==0.0.35
 
 # homeassistant.components.zhong_hong
 zhong-hong-hvac==1.0.13
@@ -3093,7 +3066,7 @@ ziggo-mediabox-xl==1.1.0
 zm-py==0.5.4
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.59.1
+zwave-js-server-python==0.58.1
 
 # homeassistant.components.zwave_me
 zwave-me-ws==0.4.3
diff --git a/requirements_test.txt b/requirements_test.txt
index 166fd965e2c..f87dd156e48 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -7,17 +7,17 @@
 
 -c homeassistant/package_constraints.txt
 -r requirements_test_pre_commit.txt
-astroid==3.3.5
+astroid==3.3.4
 coverage==7.6.1
 freezegun==1.5.1
-license-expression==30.4.0
 mock-open==1.4.0
-mypy-dev==1.14.0a2
+mypy-dev==1.13.0a1
 pre-commit==4.0.0
-pydantic==1.10.19
+pydantic==1.10.18
 pylint==3.3.1
 pylint-per-file-ignores==1.3.2
 pipdeptree==2.23.4
+pip-licenses==5.0.0
 pytest-asyncio==0.24.0
 pytest-aiohttp==1.0.5
 pytest-cov==5.0.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index b61e65f3c68..5a1daaad5d6 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -13,10 +13,10 @@ AIOSomecomfort==0.0.25
 Adax-local==0.1.5
 
 # homeassistant.components.doorbird
-DoorBirdPy==3.0.8
+DoorBirdPy==3.0.4
 
 # homeassistant.components.homekit
-HAP-python==4.9.2
+HAP-python==4.9.1
 
 # homeassistant.components.tasmota
 HATasmota==0.9.2
@@ -33,7 +33,7 @@ Mastodon.py==1.8.1
 # homeassistant.components.seven_segments
 # homeassistant.components.sighthound
 # homeassistant.components.tensorflow
-Pillow==11.0.0
+Pillow==10.4.0
 
 # homeassistant.components.plex
 PlexAPI==4.15.16
@@ -42,7 +42,7 @@ PlexAPI==4.15.16
 ProgettiHWSW==0.1.3
 
 # homeassistant.components.cast
-PyChromecast==14.0.5
+PyChromecast==14.0.4
 
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
@@ -81,7 +81,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.switchbot
-PySwitchbot==0.51.0
+PySwitchbot==0.48.2
 
 # homeassistant.components.syncthru
 PySyncThru==0.7.10
@@ -94,7 +94,7 @@ PyTransportNSW==0.1.1
 PyTurboJPEG==1.7.5
 
 # homeassistant.components.vicare
-PyViCare==2.35.0
+PyViCare==2.34.0
 
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
@@ -140,7 +140,7 @@ advantage-air==0.4.4
 afsapi==0.2.7
 
 # homeassistant.components.agent_dvr
-agent-py==0.0.24
+agent-py==0.0.23
 
 # homeassistant.components.geo_json_events
 aio-geojson-generic-client==0.4
@@ -160,17 +160,14 @@ aio-geojson-usgs-earthquakes==0.3
 # homeassistant.components.gdacs
 aio-georss-gdacs==0.10
 
-# homeassistant.components.acaia
-aioacaia==0.1.6
-
 # homeassistant.components.airq
 aioairq==0.3.2
 
 # homeassistant.components.airzone_cloud
-aioairzone-cloud==0.6.10
+aioairzone-cloud==0.6.7
 
 # homeassistant.components.airzone
-aioairzone==0.9.6
+aioairzone==0.9.5
 
 # homeassistant.components.ambient_network
 # homeassistant.components.ambient_station
@@ -189,7 +186,7 @@ aioaseko==1.0.0
 aioasuswrt==1.4.0
 
 # homeassistant.components.husqvarna_automower
-aioautomower==2024.10.3
+aioautomower==2024.10.0
 
 # homeassistant.components.azure_devops
 aioazuredevops==2.2.1
@@ -201,7 +198,7 @@ aiobafi6==0.9.0
 aiobotocore==2.13.1
 
 # homeassistant.components.comelit
-aiocomelit==0.9.1
+aiocomelit==0.9.0
 
 # homeassistant.components.dhcp
 aiodhcpwatcher==1.0.2
@@ -231,7 +228,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==27.0.1
+aioesphomeapi==27.0.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -247,10 +244,10 @@ aioguardian==2022.07.0
 aioharmony==0.2.10
 
 # homeassistant.components.hassio
-aiohasupervisor==0.2.1
+aiohasupervisor==0.2.0b0
 
 # homeassistant.components.homekit_controller
-aiohomekit==3.2.6
+aiohomekit==3.2.3
 
 # homeassistant.components.hue
 aiohue==4.7.3
@@ -301,10 +298,10 @@ aionut==4.3.3
 aiooncue==0.3.7
 
 # homeassistant.components.openexchangerates
-aioopenexchangerates==0.6.8
+aioopenexchangerates==0.6.2
 
 # homeassistant.components.nmap_tracker
-aiooui==0.1.7
+aiooui==0.1.6
 
 # homeassistant.components.pegel_online
 aiopegelonline==0.0.10
@@ -339,10 +336,10 @@ aiorecollect==2023.09.0
 aioridwell==2024.01.0
 
 # homeassistant.components.ruckus_unleashed
-aioruckus==0.42
+aioruckus==0.41
 
 # homeassistant.components.russound_rio
-aiorussound==4.1.0
+aiorussound==4.0.5
 
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
@@ -351,7 +348,7 @@ aioruuvigateway==0.1.0
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==12.0.1
+aioshelly==12.0.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
@@ -366,10 +363,10 @@ aiosolaredge==0.2.0
 aiosteamist==1.0.0
 
 # homeassistant.components.cambridge_audio
-aiostreammagic==2.8.5
+aiostreammagic==2.8.1
 
 # homeassistant.components.switcher_kis
-aioswitcher==4.4.0
+aioswitcher==4.0.3
 
 # homeassistant.components.syncthing
 aiosyncthing==0.5.1
@@ -377,9 +374,6 @@ aiosyncthing==0.5.1
 # homeassistant.components.tankerkoenig
 aiotankerkoenig==0.4.2
 
-# homeassistant.components.tedee
-aiotedee==0.2.20
-
 # homeassistant.components.tractive
 aiotractive==0.6.0
 
@@ -390,7 +384,7 @@ aiounifi==80
 aiovlc==0.5.1
 
 # homeassistant.components.vodafone_station
-aiovodafone==0.6.1
+aiovodafone==0.6.0
 
 # homeassistant.components.waqi
 aiowaqi==3.1.0
@@ -402,7 +396,7 @@ aiowatttime==0.1.1
 aiowebostv==0.4.2
 
 # homeassistant.components.withings
-aiowithings==3.1.3
+aiowithings==3.1.0
 
 # homeassistant.components.yandex_transport
 aioymaps==1.2.5
@@ -414,7 +408,7 @@ airgradient==0.9.1
 airly==1.1.0
 
 # homeassistant.components.airthings_ble
-airthings-ble==0.9.2
+airthings-ble==0.9.1
 
 # homeassistant.components.airthings
 airthings-cloud==0.2.0
@@ -444,7 +438,7 @@ anthemav==1.4.1
 anthropic==0.31.2
 
 # homeassistant.components.weatherkit
-apple_weatherkit==1.1.3
+apple_weatherkit==1.1.2
 
 # homeassistant.components.apprise
 apprise==1.9.0
@@ -482,20 +476,13 @@ auroranoaa==0.0.5
 aurorapy==0.2.7
 
 # homeassistant.components.autarco
-autarco==3.1.0
-
-# homeassistant.components.husqvarna_automower_ble
-automower-ble==0.2.0
-
-# homeassistant.components.generic
-# homeassistant.components.stream
-av==13.1.0
+autarco==3.0.0
 
 # homeassistant.components.axis
-axis==63
+axis==62
 
 # homeassistant.components.fujitsu_fglair
-ayla-iot-unofficial==1.4.3
+ayla-iot-unofficial==1.4.2
 
 # homeassistant.components.azure_event_hub
 azure-eventhub==5.11.1
@@ -516,7 +503,7 @@ base36==0.1.1
 beautifulsoup4==4.12.3
 
 # homeassistant.components.bmw_connected_drive
-bimmer-connected[china]==0.16.4
+bimmer-connected[china]==0.16.3
 
 # homeassistant.components.eq3btsmart
 # homeassistant.components.esphome
@@ -562,7 +549,7 @@ boschshcpy==0.2.91
 botocore==1.34.131
 
 # homeassistant.components.bring
-bring-api==0.9.1
+bring-api==0.9.0
 
 # homeassistant.components.broadlink
 broadlink==0.19.0
@@ -604,7 +591,7 @@ colorthief==0.2.1
 construct==2.10.68
 
 # homeassistant.components.utility_meter
-cronsim==2.6
+croniter==2.0.2
 
 # homeassistant.components.crownstone
 crownstone-cloud==1.4.11
@@ -628,7 +615,7 @@ dbus-fast==2.24.3
 debugpy==1.8.6
 
 # homeassistant.components.ecovacs
-deebot-client==8.4.1
+deebot-client==8.4.0
 
 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
@@ -732,7 +719,7 @@ epion==0.0.3
 epson-projector==0.5.1
 
 # homeassistant.components.eq3btsmart
-eq3btsmart==1.4.1
+eq3btsmart==1.2.0
 
 # homeassistant.components.esphome
 esphome-dashboard-api==1.2.3
@@ -800,19 +787,19 @@ freebox-api==1.1.0
 fritzconnection[qr]==1.14.0
 
 # homeassistant.components.fyta
-fyta_cli==0.6.10
+fyta_cli==0.6.7
 
 # homeassistant.components.google_translate
 gTTS==2.2.4
 
 # homeassistant.components.gardena_bluetooth
-gardena-bluetooth==1.4.4
+gardena-bluetooth==1.4.3
 
 # homeassistant.components.google_assistant_sdk
 gassist-text==0.0.11
 
 # homeassistant.components.google
-gcal-sync==6.2.0
+gcal-sync==6.1.6
 
 # homeassistant.components.geniushub
 geniushub-client==0.7.1
@@ -846,7 +833,7 @@ gios==5.0.0
 glances-api==0.8.0
 
 # homeassistant.components.go2rtc
-go2rtc-client==0.1.1
+go2rtc-client==0.0.1b0
 
 # homeassistant.components.goalzero
 goalzero==0.2.2
@@ -871,7 +858,7 @@ google-cloud-texttospeech==2.17.2
 google-generativeai==0.8.2
 
 # homeassistant.components.nest
-google-nest-sdm==6.1.5
+google-nest-sdm==6.1.3
 
 # homeassistant.components.google_photos
 google-photos-library-api==0.12.1
@@ -886,7 +873,7 @@ gotailwind==0.2.4
 govee-ble==0.40.0
 
 # homeassistant.components.govee_light_local
-govee-local-api==1.5.3
+govee-local-api==1.5.2
 
 # homeassistant.components.gpsd
 gps3==0.33.3
@@ -907,13 +894,17 @@ growattServer==1.5.0
 gspread==5.5.0
 
 # homeassistant.components.profiler
-guppy3==3.1.4.post1;python_version<'3.13'
+guppy3==3.1.4.post1
 
 # homeassistant.components.iaqualink
 h2==4.1.0
 
+# homeassistant.components.generic
+# homeassistant.components.stream
+ha-av==10.1.1
+
 # homeassistant.components.ffmpeg
-ha-ffmpeg==3.2.2
+ha-ffmpeg==3.2.1
 
 # homeassistant.components.iotawatt
 ha-iotawattpy==0.1.2
@@ -922,16 +913,16 @@ ha-iotawattpy==0.1.2
 ha-philipsjs==3.2.2
 
 # homeassistant.components.habitica
-habitipy==0.3.3
+habitipy==0.3.1
 
 # homeassistant.components.bluetooth
 habluetooth==3.6.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.84.0
+hass-nabucasa==0.81.1
 
 # homeassistant.components.conversation
-hassil==2.0.1
+hassil==1.7.4
 
 # homeassistant.components.jewish_calendar
 hdate==0.10.9
@@ -953,13 +944,13 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.60
+holidays==0.58
 
 # homeassistant.components.frontend
-home-assistant-frontend==20241106.2
+home-assistant-frontend==20241002.3
 
 # homeassistant.components.conversation
-home-assistant-intents==2024.11.13
+home-assistant-intents==2024.10.2
 
 # homeassistant.components.home_connect
 homeconnect==0.8.0
@@ -971,10 +962,10 @@ homematicip==1.1.2
 httplib2==0.20.4
 
 # homeassistant.components.huawei_lte
-huawei-lte-api==1.10.0
+huawei-lte-api==1.9.3
 
 # homeassistant.components.huum
-huum==0.7.12
+huum==0.7.10
 
 # homeassistant.components.hyperion
 hyperion-py==0.7.5
@@ -1058,16 +1049,16 @@ knx-frontend==2024.9.10.221729
 konnected==1.2.0
 
 # homeassistant.components.kraken
-krakenex==2.2.2
+krakenex==2.1.0
 
 # homeassistant.components.lacrosse_view
-lacrosse-view==1.0.3
+lacrosse-view==1.0.2
 
 # homeassistant.components.laundrify
 laundrify-aio==1.2.2
 
 # homeassistant.components.lcn
-lcn-frontend==0.2.2
+lcn-frontend==0.1.6
 
 # homeassistant.components.ld2410_ble
 ld2410-ble==0.1.1
@@ -1079,7 +1070,7 @@ leaone-ble==0.1.0
 led-ble==1.0.2
 
 # homeassistant.components.lektrico
-lektricowifi==0.0.43
+lektricowifi==0.0.42
 
 # homeassistant.components.foscam
 libpyfoscam==1.2.2
@@ -1093,6 +1084,9 @@ libsoundtouch==0.8
 # homeassistant.components.linear_garage_door
 linear-garage-door==0.2.9
 
+# homeassistant.components.lamarzocco
+lmcloud==1.2.3
+
 # homeassistant.components.london_underground
 london-tube-status==0.5
 
@@ -1145,7 +1139,7 @@ microBeesPy==0.3.2
 mill-local==0.3.0
 
 # homeassistant.components.mill
-millheater==0.12.2
+millheater==0.11.8
 
 # homeassistant.components.minio
 minio==7.1.12
@@ -1157,7 +1151,7 @@ moat-ble==0.1.1
 moehlenhoff-alpha2==1.3.1
 
 # homeassistant.components.monzo
-monzopy==1.4.2
+monzopy==1.3.2
 
 # homeassistant.components.mopeka
 mopeka-iot-ble==0.8.0
@@ -1177,9 +1171,6 @@ mozart-api==4.1.1.116.0
 # homeassistant.components.mullvad
 mullvad-api==1.0.0
 
-# homeassistant.components.music_assistant
-music-assistant-client==1.0.5
-
 # homeassistant.components.tts
 mutagen==1.47.0
 
@@ -1220,7 +1211,7 @@ nextdns==3.3.0
 nibe==2.11.0
 
 # homeassistant.components.nice_go
-nice-go==0.3.10
+nice-go==0.3.9
 
 # homeassistant.components.nfandroidtv
 notifications-android-tv==0.1.5
@@ -1242,10 +1233,10 @@ numato-gpio==0.13.0
 # homeassistant.components.stream
 # homeassistant.components.tensorflow
 # homeassistant.components.trend
-numpy==2.1.3
+numpy==1.26.4
 
 # homeassistant.components.nyt_games
-nyt_games==0.4.4
+nyt_games==0.4.3
 
 # homeassistant.components.google
 oauth2client==4.1.3
@@ -1287,7 +1278,7 @@ openhomedevice==2.2.0
 openwebifpy==4.2.7
 
 # homeassistant.components.opower
-opower==0.8.6
+opower==0.8.4
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -1329,7 +1320,7 @@ plexauth==0.0.6
 plexwebsocket==0.0.14
 
 # homeassistant.components.plugwise
-plugwise==1.5.0
+plugwise==1.4.3
 
 # homeassistant.components.plum_lightpad
 plumlightpad==0.0.11
@@ -1352,7 +1343,7 @@ prometheus-client==0.21.0
 psutil-home-assistant==0.0.1
 
 # homeassistant.components.systemmonitor
-psutil==6.1.0
+psutil==6.0.0
 
 # homeassistant.components.androidtv
 pure-python-adb[async]==0.3.0.dev0
@@ -1409,7 +1400,7 @@ pyCEC==0.5.2
 pyControl4==1.2.0
 
 # homeassistant.components.duotecno
-pyDuotecno==2024.10.1
+pyDuotecno==2024.10.0
 
 # homeassistant.components.electrasmart
 pyElectra==1.2.4
@@ -1418,7 +1409,7 @@ pyElectra==1.2.4
 pyRFXtrx==0.31.1
 
 # homeassistant.components.tibber
-pyTibber==0.30.8
+pyTibber==0.30.3
 
 # homeassistant.components.dlink
 pyW215==0.7.0
@@ -1479,7 +1470,7 @@ pycomfoconnect==0.5.1
 pycoolmasternet-async==0.2.2
 
 # homeassistant.components.radio_browser
-pycountry==24.6.1
+pycountry==23.12.11
 
 # homeassistant.components.microsoft
 pycsspeechtts==1.0.8
@@ -1488,7 +1479,7 @@ pycsspeechtts==1.0.8
 pydaikin==2.13.7
 
 # homeassistant.components.deako
-pydeako==0.5.4
+pydeako==0.4.0
 
 # homeassistant.components.deconz
 pydeconz==118
@@ -1520,11 +1511,8 @@ pyefergy==22.5.0
 # homeassistant.components.energenie_power_sockets
 pyegps==0.2.5
 
-# homeassistant.components.onkyo
-pyeiscp==0.0.7
-
 # homeassistant.components.emoncms
-pyemoncms==0.1.1
+pyemoncms==0.0.7
 
 # homeassistant.components.enphase_envoy
 pyenphase==1.22.0
@@ -1539,7 +1527,7 @@ pyevilgenius==2.0.0
 pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
-pyfibaro==0.8.0
+pyfibaro==0.7.8
 
 # homeassistant.components.fido
 pyfido==2.1.2
@@ -1631,9 +1619,6 @@ pykrakenapi==0.1.8
 # homeassistant.components.kulersky
 pykulersky==0.5.2
 
-# homeassistant.components.lamarzocco
-pylamarzocco==1.2.3
-
 # homeassistant.components.lastfm
 pylast==5.1.0
 
@@ -1656,7 +1641,7 @@ pylitterbot==2023.5.0
 pylutron-caseta==0.21.1
 
 # homeassistant.components.lutron
-pylutron==0.2.16
+pylutron==0.2.15
 
 # homeassistant.components.mailgun
 pymailgunner==1.4
@@ -1686,7 +1671,7 @@ pymonoprice==0.4
 pymysensors==0.24.0
 
 # homeassistant.components.iron_os
-pynecil==0.2.1
+pynecil==0.2.0
 
 # homeassistant.components.netgear
 pynetgear==0.10.10
@@ -1694,9 +1679,6 @@ pynetgear==0.10.10
 # homeassistant.components.nobo_hub
 pynobo==1.8.1
 
-# homeassistant.components.nordpool
-pynordpool==0.2.2
-
 # homeassistant.components.nuki
 pynuki==1.6.3
 
@@ -1741,9 +1723,6 @@ pyoverkiz==1.14.1
 # homeassistant.components.onewire
 pyownet==0.10.0.post1
 
-# homeassistant.components.palazzetti
-pypalazzetti==0.1.11
-
 # homeassistant.components.lcn
 pypck==0.7.24
 
@@ -1822,9 +1801,6 @@ pysmartapp==0.3.5
 # homeassistant.components.smartthings
 pysmartthings==0.7.8
 
-# homeassistant.components.smarty
-pysmarty2==0.10.1
-
 # homeassistant.components.edl21
 pysml==0.0.12
 
@@ -1850,7 +1826,7 @@ pyspeex-noise==1.0.2
 pysqueezebox==0.10.0
 
 # homeassistant.components.suez_water
-pysuezV2==1.3.1
+pysuez==0.2.0
 
 # homeassistant.components.switchbee
 pyswitchbee==1.8.3
@@ -1858,6 +1834,9 @@ pyswitchbee==1.8.3
 # homeassistant.components.tautulli
 pytautulli==23.1.1
 
+# homeassistant.components.tedee
+pytedee-async==0.2.20
+
 # homeassistant.components.motionmount
 python-MotionMount==2.2.0
 
@@ -1865,7 +1844,7 @@ python-MotionMount==2.2.0
 python-awair==0.2.4
 
 # homeassistant.components.bsblan
-python-bsblan==1.2.1
+python-bsblan==0.6.2
 
 # homeassistant.components.ecobee
 python-ecobee-api==0.2.20
@@ -1889,10 +1868,10 @@ python-izone==1.2.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa[speedups]==0.7.7
+python-kasa[speedups]==0.7.5
 
 # homeassistant.components.linkplay
-python-linkplay==0.0.20
+python-linkplay==0.0.15
 
 # homeassistant.components.matter
 python-matter-server==6.6.0
@@ -1923,7 +1902,7 @@ python-picnic-api==1.1.0
 python-rabbitair==0.0.8
 
 # homeassistant.components.roborock
-python-roborock==2.7.2
+python-roborock==2.6.0
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.36
@@ -1932,7 +1911,7 @@ python-smarttub==0.0.36
 python-songpal==0.16.2
 
 # homeassistant.components.tado
-python-tado==0.17.7
+python-tado==0.17.6
 
 # homeassistant.components.technove
 python-technove==1.3.1
@@ -2026,7 +2005,7 @@ qingping-ble==0.10.0
 qnapstats==0.4.0
 
 # homeassistant.components.radio_browser
-radios==0.3.2
+radios==0.3.1
 
 # homeassistant.components.radiotherm
 radiotherm==2.1.0
@@ -2047,13 +2026,13 @@ renault-api==0.2.7
 renson-endura-delta==1.7.1
 
 # homeassistant.components.reolink
-reolink-aio==0.11.1
+reolink-aio==0.10.0
 
 # homeassistant.components.rflink
 rflink==0.0.66
 
 # homeassistant.components.ring
-ring-doorbell==0.9.12
+ring-doorbell==0.9.8
 
 # homeassistant.components.roku
 rokuecp==0.19.3
@@ -2099,7 +2078,7 @@ securetar==2024.2.1
 
 # homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense-energy==0.13.3
+sense-energy==0.12.4
 
 # homeassistant.components.sensirion_ble
 sensirion-ble==0.1.1
@@ -2108,7 +2087,7 @@ sensirion-ble==0.1.1
 sensorpro-ble==0.5.3
 
 # homeassistant.components.sensorpush
-sensorpush-ble==1.7.1
+sensorpush-ble==1.6.2
 
 # homeassistant.components.sensoterra
 sensoterra==2.0.1
@@ -2134,9 +2113,6 @@ simplepush==2.2.3
 # homeassistant.components.simplisafe
 simplisafe-python==2024.01.0
 
-# homeassistant.components.sky_remote
-skyboxremote==0.0.6
-
 # homeassistant.components.slack
 slackclient==2.5.0
 
@@ -2150,7 +2126,7 @@ smhi-pkg==1.0.18
 snapcast==2.3.6
 
 # homeassistant.components.sonos
-soco==0.30.6
+soco==0.30.4
 
 # homeassistant.components.solarlog
 solarlog_cli==0.3.2
@@ -2171,7 +2147,7 @@ speak2mary==1.4.0
 speedtest-cli==2.1.3
 
 # homeassistant.components.spotify
-spotifyaio==0.8.8
+spotifyaio==0.7.1
 
 # homeassistant.components.sql
 sqlparse==0.5.0
@@ -2246,9 +2222,6 @@ tesla-powerwall==0.5.2
 # homeassistant.components.tesla_wall_connector
 tesla-wall-connector==1.0.2
 
-# homeassistant.components.teslemetry
-teslemetry-stream==0.4.2
-
 # homeassistant.components.tessie
 tessie-api==0.1.1
 
@@ -2258,9 +2231,6 @@ thermobeacon-ble==0.7.0
 # homeassistant.components.thermopro
 thermopro-ble==0.10.0
 
-# homeassistant.components.lg_thinq
-thinqconnect==1.0.0
-
 # homeassistant.components.tilt_ble
 tilt-ble==0.2.3
 
@@ -2277,7 +2247,7 @@ toonapi==0.3.0
 total-connect-client==2024.5
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.4.3
+tplink-omada-client==1.4.2
 
 # homeassistant.components.transmission
 transmission-rpc==7.0.3
@@ -2292,7 +2262,7 @@ ttls==1.8.3
 ttn_client==1.2.0
 
 # homeassistant.components.tuya
-tuya-device-sharing-sdk==0.2.1
+tuya-device-sharing-sdk==0.1.9
 
 # homeassistant.components.twentemilieu
 twentemilieu==2.0.1
@@ -2310,7 +2280,7 @@ typedmonarchmoney==0.3.1
 uasiren==0.0.1
 
 # homeassistant.components.unifiprotect
-uiprotect==6.4.0
+uiprotect==6.3.1
 
 # homeassistant.components.landisgyr_heat_meter
 ultraheat-api==0.5.7
@@ -2319,7 +2289,7 @@ ultraheat-api==0.5.7
 unifi-discovery==1.2.0
 
 # homeassistant.components.zha
-universal-silabs-flasher==0.0.24
+universal-silabs-flasher==0.0.23
 
 # homeassistant.components.upb
 upb-lib==0.5.8
@@ -2345,7 +2315,7 @@ vallox-websocket-api==5.3.0
 vehicle==2.2.2
 
 # homeassistant.components.velbus
-velbus-aio==2024.10.0
+velbus-aio==2024.7.6
 
 # homeassistant.components.venstar
 venstarcolortouch==0.19
@@ -2381,14 +2351,11 @@ watchdog==2.3.1
 # homeassistant.components.weatherflow_cloud
 weatherflow4py==1.0.6
 
-# homeassistant.components.nasweb
-webio-api==0.1.8
-
 # homeassistant.components.webmin
 webmin-xmlrpc==0.0.2
 
 # homeassistant.components.weheat
-weheat==2024.11.02
+weheat==2024.09.23
 
 # homeassistant.components.whirlpool
 whirlpool-sixth-sense==0.18.8
@@ -2412,7 +2379,7 @@ wyoming==1.5.4
 xbox-webapi==2.0.11
 
 # homeassistant.components.xiaomi_ble
-xiaomi-ble==0.33.0
+xiaomi-ble==0.32.0
 
 # homeassistant.components.knx
 xknx==3.3.0
@@ -2452,22 +2419,22 @@ youless-api==2.1.2
 youtubeaio==1.1.5
 
 # homeassistant.components.media_extractor
-yt-dlp[default]==2024.11.04
+yt-dlp==2024.10.07
 
 # homeassistant.components.zamg
 zamg==0.3.6
 
 # homeassistant.components.zeroconf
-zeroconf==0.136.0
+zeroconf==0.135.0
 
 # homeassistant.components.zeversolar
-zeversolar==0.3.2
+zeversolar==0.3.1
 
 # homeassistant.components.zha
-zha==0.0.37
+zha==0.0.35
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.59.1
+zwave-js-server-python==0.58.1
 
 # homeassistant.components.zwave_me
 zwave-me-ws==0.4.3
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index 23f584dd0de..6ba279c3c5e 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -1,5 +1,5 @@
 # Automatically generated from .pre-commit-config.yaml by gen_requirements_all.py, do not edit
 
 codespell==2.3.0
-ruff==0.7.3
+ruff==0.7.0
 yamllint==1.35.1
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 7d53741c661..4641d4ac12a 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -58,16 +58,8 @@ INCLUDED_REQUIREMENTS_WHEELS = {
 # will be included in requirements_all_{action}.txt
 
 OVERRIDDEN_REQUIREMENTS_ACTIONS = {
-    "pytest": {
-        "exclude": set(),
-        "include": {"python-gammu"},
-        "markers": {},
-    },
-    "wheels_aarch64": {
-        "exclude": set(),
-        "include": INCLUDED_REQUIREMENTS_WHEELS,
-        "markers": {},
-    },
+    "pytest": {"exclude": set(), "include": {"python-gammu"}},
+    "wheels_aarch64": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
     # Pandas has issues building on armhf, it is expected they
     # will drop the platform in the near future (they consider it
     # "flimsy" on 386). The following packages depend on pandas,
@@ -75,23 +67,10 @@ OVERRIDDEN_REQUIREMENTS_ACTIONS = {
     "wheels_armhf": {
         "exclude": {"env-canada", "noaa-coops", "pyezviz", "pykrakenapi"},
         "include": INCLUDED_REQUIREMENTS_WHEELS,
-        "markers": {},
-    },
-    "wheels_armv7": {
-        "exclude": set(),
-        "include": INCLUDED_REQUIREMENTS_WHEELS,
-        "markers": {},
-    },
-    "wheels_amd64": {
-        "exclude": set(),
-        "include": INCLUDED_REQUIREMENTS_WHEELS,
-        "markers": {},
-    },
-    "wheels_i386": {
-        "exclude": set(),
-        "include": INCLUDED_REQUIREMENTS_WHEELS,
-        "markers": {},
     },
+    "wheels_armv7": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
+    "wheels_amd64": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
+    "wheels_i386": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
 }
 
 IGNORE_PIN = ("colorlog>2.1,<3", "urllib3")
@@ -117,9 +96,9 @@ httplib2>=0.19.0
 # gRPC is an implicit dependency that we want to make explicit so we manage
 # upgrades intentionally. It is a large package to build from source and we
 # want to ensure we have wheels built.
-grpcio==1.67.1
-grpcio-status==1.67.1
-grpcio-reflection==1.67.1
+grpcio==1.66.2
+grpcio-status==1.66.2
+grpcio-reflection==1.66.2
 
 # This is a old unmaintained library and is replaced with pycryptodome
 pycrypto==1000000000.0.0
@@ -139,7 +118,7 @@ uuid==1000000000.0.0
 # 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==4.6.2.post1
+anyio==4.6.0
 h11==0.14.0
 httpcore==1.0.5
 
@@ -148,8 +127,7 @@ httpcore==1.0.5
 hyperframe>=5.2.0
 
 # Ensure we run compatible with musllinux build env
-numpy==2.1.3
-pandas~=2.2.3
+numpy==1.26.4
 
 # Constrain multidict to avoid typing issues
 # https://github.com/home-assistant/core/pull/67046
@@ -160,7 +138,7 @@ backoff>=2.0
 
 # Required to avoid breaking (#101042).
 # v2 has breaking changes (#99218).
-pydantic==1.10.19
+pydantic==1.10.18
 
 # Required for Python 3.12.4 compatibility (#119223).
 mashumaro>=3.13.1
@@ -179,7 +157,7 @@ pyOpenSSL>=24.0.0
 
 # protobuf must be in package constraints for the wheel
 # builder to build binary wheels
-protobuf==5.28.3
+protobuf==5.28.2
 
 # faust-cchardet: Ensure we have a version we can build wheels
 # 2.1.18 is the first version that works with our wheel builder
@@ -201,12 +179,15 @@ get-mac==1000000000.0.0
 # We want to skip the binary wheels for the 'charset-normalizer' packages.
 # They are build with mypyc, but causes issues with our wheel builder.
 # In order to do so, we need to constrain the version.
-charset-normalizer==3.4.0
+charset-normalizer==3.2.0
 
 # dacite: Ensure we have a version that is able to handle type unions for
-# NAM, Brother, and GIOS.
+# Roborock, NAM, Brother, and GIOS.
 dacite>=1.7.0
 
+# Musle wheels for pandas 2.2.0 cannot be build for any architecture.
+pandas==2.1.4
+
 # chacha20poly1305-reuseable==0.12.x is incompatible with cryptography==43.0.x
 chacha20poly1305-reuseable>=0.13.0
 
@@ -214,8 +195,8 @@ chacha20poly1305-reuseable>=0.13.0
 # https://github.com/pycountry/pycountry/blob/ea69bab36f00df58624a0e490fdad4ccdc14268b/HISTORY.txt#L39
 pycountry>=23.12.11
 
-# scapy==2.6.0 causes CI failures due to a race condition
-scapy>=2.6.1
+# scapy<2.5.0 will not work with python3.12
+scapy>=2.5.0
 
 # tuf isn't updated to deal with breaking changes in securesystemslib==1.0.
 # Only tuf>=4 includes a constraint to <1.0.
@@ -224,10 +205,6 @@ tuf>=4.0.0
 
 # https://github.com/jd/tenacity/issues/471
 tenacity!=8.4.0
-
-# 5.0.0 breaks Timeout as a context manager
-# TypeError: 'Timeout' object does not support the context manager protocol
-async-timeout==4.0.3
 """
 
 GENERATED_MESSAGE = (
@@ -332,10 +309,6 @@ def process_action_requirement(req: str, action: str) -> str:
         return req
     if normalized_package_name in EXCLUDED_REQUIREMENTS_ALL:
         return f"# {req}"
-    if markers := OVERRIDDEN_REQUIREMENTS_ACTIONS[action]["markers"].get(
-        normalized_package_name, None
-    ):
-        return f"{req};{markers}"
     return req
 
 
diff --git a/script/hassfest/config_schema.py b/script/hassfest/config_schema.py
index 6b863ab9ecd..06ef2065127 100644
--- a/script/hassfest/config_schema.py
+++ b/script/hassfest/config_schema.py
@@ -10,7 +10,7 @@ from .model import Config, Integration
 
 CONFIG_SCHEMA_IGNORE = {
     # Configuration under the homeassistant key is a special case, it's handled by
-    # core_config.async_process_ha_core_config already during bootstrapping, not by
+    # conf_util.async_process_ha_core_config already during bootstrapping, not by
     # a schema in the homeassistant integration.
     HOMEASSISTANT_DOMAIN,
 }
diff --git a/script/hassfest/dependencies.py b/script/hassfest/dependencies.py
index 0c7f4f11a8c..66796d4dd0d 100644
--- a/script/hassfest/dependencies.py
+++ b/script/hassfest/dependencies.py
@@ -44,15 +44,6 @@ class ImportCollector(ast.NodeVisitor):
         assert self._cur_fil_dir
         self.referenced[self._cur_fil_dir].add(reference_domain)
 
-    def visit_If(self, node: ast.If) -> None:
-        """Visit If node."""
-        if isinstance(node.test, ast.Name) and node.test.id == "TYPE_CHECKING":
-            # Ignore TYPE_CHECKING block
-            return
-
-        # Have it visit other kids
-        self.generic_visit(node)
-
     def visit_ImportFrom(self, node: ast.ImportFrom) -> None:
         """Visit ImportFrom node."""
         if node.module is None:
@@ -121,10 +112,10 @@ ALLOWED_USED_COMPONENTS = {
     "alert",
     "automation",
     "conversation",
-    "default_config",
     "device_automation",
     "frontend",
     "group",
+    "hassio",
     "homeassistant",
     "input_boolean",
     "input_button",
diff --git a/script/hassfest/docker.py b/script/hassfest/docker.py
index 57d86bc4def..213f21a7a3e 100644
--- a/script/hassfest/docker.py
+++ b/script/hassfest/docker.py
@@ -4,7 +4,6 @@ from dataclasses import dataclass
 from pathlib import Path
 
 from homeassistant import core
-from homeassistant.components.go2rtc.const import RECOMMENDED_VERSION as GO2RTC_VERSION
 from homeassistant.const import Platform
 from homeassistant.util import executor, thread
 from script.gen_requirements_all import gather_recursive_requirements
@@ -21,8 +20,7 @@ FROM ${{BUILD_FROM}}
 # Synchronize with homeassistant/core.py:async_stop
 ENV \
     S6_SERVICES_GRACETIME={timeout} \
-    UV_SYSTEM_PYTHON=true \
-    UV_NO_CACHE=true
+    UV_SYSTEM_PYTHON=true
 
 ARG QEMU_CPU
 
@@ -80,7 +78,7 @@ WORKDIR /config
 _HASSFEST_TEMPLATE = r"""# Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
-FROM python:3.13-alpine
+FROM python:alpine
 
 ENV \
     UV_SYSTEM_PYTHON=true \
@@ -113,6 +111,8 @@ LABEL "com.github.actions.icon"="terminal"
 LABEL "com.github.actions.color"="gray-dark"
 """
 
+_GO2RTC_VERSION = "1.9.4"
+
 
 def _get_package_versions(file: Path, packages: set[str]) -> dict[str, str]:
     package_versions: dict[str, str] = {}
@@ -161,8 +161,6 @@ def _generate_hassfest_dockerimage(
         packages.update(
             gather_recursive_requirements(platform.value, already_checked_domains)
         )
-    # Add go2rtc requirements as this file needs the go2rtc integration
-    packages.update(gather_recursive_requirements("go2rtc", already_checked_domains))
 
     return File(
         _HASSFEST_TEMPLATE.format(
@@ -198,7 +196,7 @@ def _generate_files(config: Config) -> list[File]:
             DOCKERFILE_TEMPLATE.format(
                 timeout=timeout,
                 **package_versions,
-                go2rtc=GO2RTC_VERSION,
+                go2rtc=_GO2RTC_VERSION,
             ),
             config.root / "Dockerfile",
         ),
diff --git a/script/hassfest/docker/Dockerfile b/script/hassfest/docker/Dockerfile
index 0fa0a1a89fa..a20fd814f16 100644
--- a/script/hassfest/docker/Dockerfile
+++ b/script/hassfest/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
-FROM python:3.13-alpine
+FROM python:alpine
 
 ENV \
     UV_SYSTEM_PYTHON=true \
@@ -14,7 +14,7 @@ WORKDIR "/github/workspace"
 COPY . /usr/src/homeassistant
 
 # Uv is only needed during build
-RUN --mount=from=ghcr.io/astral-sh/uv:0.5.0,source=/uv,target=/bin/uv \
+RUN --mount=from=ghcr.io/astral-sh/uv:0.4.22,source=/uv,target=/bin/uv \
     # Required for PyTurboJPEG
     apk add --no-cache libturbojpeg \
     && uv pip install \
@@ -22,8 +22,8 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.5.0,source=/uv,target=/bin/uv \
         --no-cache \
         -c /usr/src/homeassistant/homeassistant/package_constraints.txt \
         -r /usr/src/homeassistant/requirements.txt \
-        stdlib-list==0.10.0 pipdeptree==2.23.4 tqdm==4.66.5 ruff==0.7.3 \
-        PyTurboJPEG==1.7.5 go2rtc-client==0.1.1 ha-ffmpeg==3.2.2 hassil==2.0.1 home-assistant-intents==2024.11.13 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
+        stdlib-list==0.10.0 pipdeptree==2.23.4 tqdm==4.66.5 ruff==0.7.0 \
+        PyTurboJPEG==1.7.5 ha-ffmpeg==3.2.1 hassil==1.7.4 home-assistant-intents==2024.10.2 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
 
 LABEL "name"="hassfest"
 LABEL "maintainer"="Home Assistant <hello@home-assistant.io>"
diff --git a/script/hassfest/manifest.py b/script/hassfest/manifest.py
index 4013c8a6c19..6d2f4087f59 100644
--- a/script/hassfest/manifest.py
+++ b/script/hassfest/manifest.py
@@ -268,6 +268,7 @@ INTEGRATION_MANIFEST_SCHEMA = vol.Schema(
             )
         ],
         vol.Required("documentation"): vol.All(vol.Url(), documentation_url),
+        vol.Optional("issue_tracker"): vol.Url(),
         vol.Optional("quality_scale"): vol.In(SUPPORTED_QUALITY_SCALES),
         vol.Optional("requirements"): [str],
         vol.Optional("dependencies"): [str],
@@ -303,7 +304,6 @@ def manifest_schema(value: dict[str, Any]) -> vol.Schema:
 CUSTOM_INTEGRATION_MANIFEST_SCHEMA = INTEGRATION_MANIFEST_SCHEMA.extend(
     {
         vol.Optional("version"): vol.All(str, verify_version),
-        vol.Optional("issue_tracker"): vol.Url(),
         vol.Optional("import_executor"): bool,
     }
 )
diff --git a/script/hassfest/mypy_config.py b/script/hassfest/mypy_config.py
index 25fe875e437..de42c964ddf 100644
--- a/script/hassfest/mypy_config.py
+++ b/script/hassfest/mypy_config.py
@@ -43,7 +43,6 @@ GENERAL_SETTINGS: Final[dict[str, str]] = {
     "local_partial_types": "true",
     "strict_equality": "true",
     "no_implicit_optional": "true",
-    "report_deprecated_as_error": "true",
     "warn_incomplete_stub": "true",
     "warn_redundant_casts": "true",
     "warn_unused_configs": "true",
diff --git a/script/hassfest/requirements.py b/script/hassfest/requirements.py
index 998593d20ec..3df25f3284a 100644
--- a/script/hassfest/requirements.py
+++ b/script/hassfest/requirements.py
@@ -28,6 +28,12 @@ PACKAGE_REGEX = re.compile(
 PIP_REGEX = re.compile(r"^(--.+\s)?([-_\.\w\d]+.*(?:==|>=|<=|~=|!=|<|>|===)?.*$)")
 PIP_VERSION_RANGE_SEPARATOR = re.compile(r"^(==|>=|<=|~=|!=|<|>|===)?(.*)$")
 
+IGNORE_STANDARD_LIBRARY_VIOLATIONS = {
+    # Integrations which have standard library requirements.
+    "slide",
+    "suez_water",
+}
+
 
 def validate(integrations: dict[str, Integration], config: Config) -> None:
     """Handle requirements for integrations."""
@@ -138,7 +144,10 @@ def validate_requirements(integration: Integration) -> None:
         if req in sys.stdlib_module_names:
             standard_library_violations.add(req)
 
-    if standard_library_violations:
+    if (
+        standard_library_violations
+        and integration.domain not in IGNORE_STANDARD_LIBRARY_VIOLATIONS
+    ):
         integration.add_error(
             "requirements",
             (
@@ -146,6 +155,18 @@ def validate_requirements(integration: Integration) -> None:
                 "are not compatible with the Python standard library"
             ),
         )
+    elif (
+        not standard_library_violations
+        and integration.domain in IGNORE_STANDARD_LIBRARY_VIOLATIONS
+    ):
+        integration.add_error(
+            "requirements",
+            (
+                f"Integration {integration.domain} no longer has requirements which are"
+                " incompatible with the Python standard library, remove it from "
+                "IGNORE_STANDARD_LIBRARY_VIOLATIONS"
+            ),
+        )
 
 
 @cache
diff --git a/script/hassfest/services.py b/script/hassfest/services.py
index 8c9ab5c0c0b..92fca14d373 100644
--- a/script/hassfest/services.py
+++ b/script/hassfest/services.py
@@ -75,14 +75,6 @@ CUSTOM_INTEGRATION_FIELD_SCHEMA = CORE_INTEGRATION_FIELD_SCHEMA.extend(
     }
 )
 
-CUSTOM_INTEGRATION_SECTION_SCHEMA = vol.Schema(
-    {
-        vol.Optional("collapsed"): bool,
-        vol.Required("fields"): vol.Schema({str: CUSTOM_INTEGRATION_FIELD_SCHEMA}),
-    }
-)
-
-
 CORE_INTEGRATION_SERVICE_SCHEMA = vol.Any(
     vol.Schema(
         {
@@ -113,17 +105,7 @@ CUSTOM_INTEGRATION_SERVICE_SCHEMA = vol.Any(
             vol.Optional("target"): vol.Any(
                 selector.TargetSelector.CONFIG_SCHEMA, None
             ),
-            vol.Optional("fields"): vol.All(
-                vol.Schema(
-                    {
-                        str: vol.Any(
-                            CUSTOM_INTEGRATION_FIELD_SCHEMA,
-                            CUSTOM_INTEGRATION_SECTION_SCHEMA,
-                        )
-                    }
-                ),
-                unique_field_validator,
-            ),
+            vol.Optional("fields"): vol.Schema({str: CUSTOM_INTEGRATION_FIELD_SCHEMA}),
         }
     ),
     None,
diff --git a/script/json_schemas/manifest_schema.json b/script/json_schemas/manifest_schema.json
deleted file mode 100644
index 40f08fd2c85..00000000000
--- a/script/json_schemas/manifest_schema.json
+++ /dev/null
@@ -1,391 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Home Assistant integration manifest",
-  "description": "The manifest for a Home Assistant integration",
-  "type": "object",
-  "if": {
-    "properties": { "integration_type": { "const": "virtual" } },
-    "required": ["integration_type"]
-  },
-  "then": {
-    "oneOf": [
-      {
-        "properties": {
-          "domain": {
-            "description": "The domain identifier of the integration.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#domain",
-            "examples": ["mobile_app"],
-            "type": "string",
-            "pattern": "[0-9a-z_]+"
-          },
-          "name": {
-            "description": "The friendly name of the integration.",
-            "type": "string"
-          },
-          "integration_type": {
-            "description": "The integration type.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#integration-type",
-            "const": "virtual"
-          },
-          "iot_standards": {
-            "description": "The IoT standards which supports devices or services of this virtual integration.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#iot-standards",
-            "type": "array",
-            "minItems": 1,
-            "items": {
-              "type": "string",
-              "enum": ["homekit", "zigbee", "zwave"]
-            }
-          }
-        },
-        "additionalProperties": false,
-        "required": ["domain", "name", "integration_type", "iot_standards"]
-      },
-      {
-        "properties": {
-          "domain": {
-            "description": "The domain identifier of the integration.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#domain",
-            "examples": ["mobile_app"],
-            "type": "string",
-            "pattern": "[0-9a-z_]+"
-          },
-          "name": {
-            "description": "The friendly name of the integration.",
-            "type": "string"
-          },
-          "integration_type": {
-            "description": "The integration type.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#integration-type",
-            "const": "virtual"
-          },
-          "supported_by": {
-            "description": "The integration which supports devices or services of this virtual integration.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#supported-by",
-            "type": "string"
-          }
-        },
-        "additionalProperties": false,
-        "required": ["domain", "name", "integration_type", "supported_by"]
-      }
-    ]
-  },
-  "else": {
-    "properties": {
-      "domain": {
-        "description": "The domain identifier of the integration.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#domain",
-        "examples": ["mobile_app"],
-        "type": "string",
-        "pattern": "[0-9a-z_]+"
-      },
-      "name": {
-        "description": "The friendly name of the integration.",
-        "type": "string"
-      },
-      "integration_type": {
-        "description": "The integration type.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#integration-type",
-        "type": "string",
-        "default": "hub",
-        "enum": [
-          "device",
-          "entity",
-          "hardware",
-          "helper",
-          "hub",
-          "service",
-          "system"
-        ]
-      },
-      "config_flow": {
-        "description": "Whether the integration is configurable from the UI.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#config-flow",
-        "type": "boolean"
-      },
-      "mqtt": {
-        "description": "A list of topics to subscribe for the discovery of devices via MQTT.\nThis requires to specify \"mqtt\" in either the \"dependencies\" or \"after_dependencies\".\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#mqtt",
-        "type": "array",
-        "items": {
-          "type": "string"
-        },
-        "uniqueItems": true
-      },
-      "zeroconf": {
-        "description": "A list containing service domains to search for devices to discover via Zeroconf. Items can either be strings, which discovers all devices in the specific service domain, and/or objects which include filters. (useful for generic service domains like _http._tcp.local.)\nA device is discovered if it matches one of the items, but inside the individual item all properties have to be matched.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#zeroconf",
-        "type": "array",
-        "minItems": 1,
-        "items": {
-          "anyOf": [
-            {
-              "type": "string",
-              "pattern": "^.*\\.local\\.$",
-              "description": "Service domain to search for devices."
-            },
-            {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "description": "The service domain to search for devices.",
-                  "examples": ["_http._tcp.local."],
-                  "type": "string",
-                  "pattern": "^.*\\.local\\.$"
-                },
-                "name": {
-                  "description": "The name or name pattern of the devices to filter.",
-                  "type": "string"
-                },
-                "properties": {
-                  "description": "The properties of the Zeroconf advertisement to filter.",
-                  "type": "object",
-                  "additionalProperties": { "type": "string" }
-                }
-              },
-              "required": ["type"],
-              "additionalProperties": false
-            }
-          ]
-        },
-        "uniqueItems": true
-      },
-      "ssdp": {
-        "description": "A list of matchers to find devices discoverable via SSDP/UPnP. In order to be discovered, the device has to match all properties of any of the matchers.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#ssdp",
-        "type": "array",
-        "minItems": 1,
-        "items": {
-          "description": "A matcher for the SSDP discovery.",
-          "type": "object",
-          "properties": {
-            "st": {
-              "type": "string"
-            },
-            "deviceType": {
-              "type": "string"
-            },
-            "manufacturer": {
-              "type": "string"
-            },
-            "modelDescription": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": { "type": "string" }
-        }
-      },
-      "bluetooth": {
-        "description": "A list of matchers to find devices discoverable via Bluetooth. In order to be discovered, the device has to match all properties of any of the matchers.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#bluetooth",
-        "type": "array",
-        "minItems": 1,
-        "items": {
-          "description": "A matcher for the bluetooth discovery",
-          "type": "object",
-          "properties": {
-            "connectable": {
-              "description": "Whether the device needs to be connected to or it works with just advertisement data.",
-              "type": "boolean"
-            },
-            "local_name": {
-              "description": "The name or a name pattern of the device to match.",
-              "type": "string",
-              "pattern": "^([^*]+|[^*]{3,}[*].*)$"
-            },
-            "service_uuid": {
-              "description": "The 128-bit service data UUID to match.",
-              "type": "string",
-              "pattern": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
-            },
-            "service_data_uuid": {
-              "description": "The 16-bit service data UUID to match, converted into the corresponding 128-bit UUID by replacing the 3rd and 4th byte of `00000000-0000-1000-8000-00805f9b34fb` with the 16-bit UUID.",
-              "examples": ["0000fd3d-0000-1000-8000-00805f9b34fb"],
-              "type": "string",
-              "pattern": "0000[0-9a-f]{4}-0000-1000-8000-00805f9b34fb"
-            },
-            "manufacturer_id": {
-              "description": "The Manufacturer ID to match.",
-              "type": "integer"
-            },
-            "manufacturer_data_start": {
-              "description": "The start bytes of the manufacturer data to match.",
-              "type": "array",
-              "minItems": 1,
-              "items": {
-                "type": "integer",
-                "minimum": 0,
-                "maximum": 255
-              }
-            }
-          },
-          "additionalProperties": false
-        },
-        "uniqueItems": true
-      },
-      "homekit": {
-        "description": "A list of model names to find devices which are discoverable via HomeKit. A device is discovered if the model name of the device starts with any of the specified model names.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#homekit",
-        "type": "object",
-        "properties": {
-          "models": {
-            "description": "The model names to search for.",
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "uniqueItems": true
-          }
-        },
-        "required": ["models"],
-        "additionalProperties": false
-      },
-      "dhcp": {
-        "description": "A list of matchers to find devices discoverable via DHCP. In order to be discovered, the device has to match all properties of any of the matchers.\nYou can specify an item with \"registered_devices\" set to true to check for devices with MAC addresses specified in the device registry.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#dhcp",
-        "type": "array",
-        "items": {
-          "anyOf": [
-            {
-              "type": "object",
-              "properties": {
-                "registered_devices": {
-                  "description": "Whether the MAC addresses of devices in the device registry should be used for discovery, useful if the discovery is used to update the IP address of already registered devices.",
-                  "const": true
-                }
-              },
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "hostname": {
-                  "description": "The hostname or hostname pattern to match.",
-                  "type": "string"
-                },
-                "macaddress": {
-                  "description": "The MAC address or MAC address pattern to match.",
-                  "type": "string",
-                  "maxLength": 12
-                }
-              },
-              "additionalProperties": false
-            }
-          ]
-        },
-        "uniqueItems": true
-      },
-      "usb": {
-        "description": "A list of matchers to find devices discoverable via USB. In order to be discovered, the device has to match all properties of any of the matchers.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#usb",
-        "type": "array",
-        "uniqueItems": true,
-        "items": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "vid": {
-              "description": "The vendor ID to match.",
-              "type": "string",
-              "pattern": "[0-9A-F]{4}"
-            },
-            "pid": {
-              "description": "The product ID to match.",
-              "type": "string",
-              "pattern": "[0-9A-F]{4}"
-            },
-            "description": {
-              "description": "The USB device description to match.",
-              "type": "string"
-            },
-            "manufacturer": {
-              "description": "The manufacturer to match.",
-              "type": "string"
-            },
-            "serial_number": {
-              "description": "The serial number to match.",
-              "type": "string"
-            },
-            "known_devices": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      },
-      "documentation": {
-        "description": "The website containing the documentation for the integration. It has to be in the format \"https://www.home-assistant.io/integrations/[domain]\"\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#documentation",
-        "type": "string",
-        "pattern": "^https://www.home-assistant.io/integrations/[0-9a-z_]+$",
-        "format": "uri"
-      },
-      "quality_scale": {
-        "description": "The quality scale of the integration.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#integration-quality-scale",
-        "type": "string",
-        "enum": ["internal", "silver", "gold", "platinum"]
-      },
-      "requirements": {
-        "description": "The PyPI package requirements for the integration. The package has to be pinned to a specific version.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#requirements",
-        "type": "array",
-        "items": {
-          "type": "string",
-          "pattern": ".+==.+"
-        },
-        "uniqueItems": true
-      },
-      "dependencies": {
-        "description": "A list of integrations which need to be loaded before this integration can be set up.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#dependencies",
-        "type": "array",
-        "items": {
-          "type": "string"
-        },
-        "minItems": 1,
-        "uniqueItems": true
-      },
-      "after_dependencies": {
-        "description": "A list of integrations which need to be loaded before this integration is set up when it is configured. The integration will still be set up when the \"after_dependencies\" are not configured.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#after-dependencies",
-        "type": "array",
-        "items": {
-          "type": "string"
-        },
-        "minItems": 1,
-        "uniqueItems": true
-      },
-      "codeowners": {
-        "description": "A list of GitHub usernames or GitHub team names of the integration owners.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#code-owners",
-        "type": "array",
-        "minItems": 0,
-        "items": {
-          "type": "string",
-          "pattern": "^@.+$"
-        },
-        "uniqueItems": true
-      },
-      "loggers": {
-        "description": "A list of logger names used by the requirements.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#loggers",
-        "type": "array",
-        "minItems": 1,
-        "items": {
-          "type": "string"
-        },
-        "uniqueItems": true
-      },
-      "disabled": {
-        "description": "The reason for the integration being disabled.",
-        "type": "string"
-      },
-      "iot_class": {
-        "description": "The IoT class of the integration, describing how the integration connects to the device or service.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#iot-class",
-        "type": "string",
-        "enum": [
-          "assumed_state",
-          "cloud_polling",
-          "cloud_push",
-          "local_polling",
-          "local_push",
-          "calculated"
-        ]
-      },
-      "single_config_entry": {
-        "description": "Whether the integration only supports a single config entry.\nhttps://developers.home-assistant.io/docs/creating_integration_manifest/#single-config-entry-only",
-        "const": true
-      }
-    },
-    "additionalProperties": false,
-    "required": ["domain", "name", "codeowners", "documentation"],
-    "dependencies": {
-      "mqtt": {
-        "anyOf": [
-          { "required": ["dependencies"] },
-          { "required": ["after_dependencies"] }
-        ]
-      }
-    }
-  }
-}
diff --git a/script/licenses.py b/script/licenses.py
index 464a2fc456b..cdbd0273242 100644
--- a/script/licenses.py
+++ b/script/licenses.py
@@ -2,36 +2,14 @@
 
 from __future__ import annotations
 
-from argparse import ArgumentParser, Namespace
+from argparse import ArgumentParser
 from collections.abc import Sequence
 from dataclasses import dataclass
-from importlib import metadata
 import json
 from pathlib import Path
 import sys
-from typing import TypedDict, cast
 
 from awesomeversion import AwesomeVersion
-from license_expression import (
-    AND,
-    OR,
-    ExpressionError,
-    LicenseExpression,
-    LicenseSymbol,
-    get_spdx_licensing,
-)
-
-licensing = get_spdx_licensing()
-
-
-class PackageMetadata(TypedDict):
-    """Package metadata."""
-
-    name: str
-    version: str
-    license_expression: str | None
-    license_metadata: str | None
-    license_classifier: list[str]
 
 
 @dataclass
@@ -39,60 +17,19 @@ class PackageDefinition:
     """Package definition."""
 
     license: str
-    license_expression: str | None
-    license_metadata: str | None
-    license_classifier: list[str]
     name: str
     version: AwesomeVersion
 
     @classmethod
-    def from_dict(cls, data: PackageMetadata) -> PackageDefinition:
-        """Create a package definition from PackageMetadata."""
-        if not (license_str := "; ".join(data["license_classifier"])):
-            license_str = data["license_metadata"] or "UNKNOWN"
+    def from_dict(cls, data: dict[str, str]) -> PackageDefinition:
+        """Create a package definition from a dictionary."""
         return cls(
-            license=license_str,
-            license_expression=data["license_expression"],
-            license_metadata=data["license_metadata"],
-            license_classifier=data["license_classifier"],
-            name=data["name"],
-            version=AwesomeVersion(data["version"]),
+            license=data["License"],
+            name=data["Name"],
+            version=AwesomeVersion(data["Version"]),
         )
 
 
-# Incomplete list of OSI approved SPDX identifiers
-# Add more as needed, see https://spdx.org/licenses/
-OSI_APPROVED_LICENSES_SPDX = {
-    "0BSD",
-    "AFL-2.1",
-    "AGPL-3.0-only",
-    "AGPL-3.0-or-later",
-    "Apache-2.0",
-    "BSD-1-Clause",
-    "BSD-2-Clause",
-    "BSD-3-Clause",
-    "EPL-1.0",
-    "EPL-2.0",
-    "GPL-2.0-only",
-    "GPL-2.0-or-later",
-    "GPL-3.0-only",
-    "GPL-3.0-or-later",
-    "HPND",
-    "ISC",
-    "LGPL-2.1-only",
-    "LGPL-2.1-or-later",
-    "LGPL-3.0-only",
-    "LGPL-3.0-or-later",
-    "MIT",
-    "MIT-CMU",
-    "MPL-1.1",
-    "MPL-2.0",
-    "PSF-2.0",
-    "Unlicense",
-    "Zlib",
-    "ZPL-2.1",
-}
-
 OSI_APPROVED_LICENSES = {
     "Academic Free License (AFL)",
     "Apache Software License",
@@ -161,10 +98,13 @@ OSI_APPROVED_LICENSES = {
     "Zero-Clause BSD (0BSD)",
     "Zope Public License",
     "zlib/libpng License",
-    # End license classifier
     "Apache License",
     "MIT",
+    "apache-2.0",
+    "GPL-3.0",
+    "GPLv3+",
     "MPL2",
+    "MPL-2.0",
     "Apache 2",
     "LGPL v3",
     "BSD",
@@ -172,16 +112,29 @@ OSI_APPROVED_LICENSES = {
     "GPLv3",
     "Eclipse Public License v2.0",
     "ISC",
+    "GPL-2.0-only",
+    "mit",
     "GNU General Public License v3",
+    "Unlicense",
+    "Apache-2",
     "GPLv2",
+    "Python-2.0.1",
 }
 
 EXCEPTIONS = {
     "PyMicroBot",  # https://github.com/spycle/pyMicroBot/pull/3
     "PySwitchmate",  # https://github.com/Danielhiversen/pySwitchmate/pull/16
     "PyXiaomiGateway",  # https://github.com/Danielhiversen/PyXiaomiGateway/pull/201
+    "aiocomelit",  # https://github.com/chemelli74/aiocomelit/pull/138
     "aioecowitt",  # https://github.com/home-assistant-libs/aioecowitt/pull/180
+    "aioopenexchangerates",  # https://github.com/MartinHjelmare/aioopenexchangerates/pull/94
+    "aiooui",  # https://github.com/Bluetooth-Devices/aiooui/pull/8
+    "aioruuvigateway",  # https://github.com/akx/aioruuvigateway/pull/6
+    "aiovodafone",  # https://github.com/chemelli74/aiovodafone/pull/131
+    "apple_weatherkit",  # https://github.com/tjhorner/python-weatherkit/pull/3
+    "asyncio",  # PSF License
     "chacha20poly1305",  # LGPL
+    "chacha20poly1305-reuseable",  # Apache 2.0 or BSD 3-Clause
     "commentjson",  # https://github.com/vaidik/commentjson/pull/55
     "crownstone-cloud",  # https://github.com/crownstone/crownstone-lib-python-cloud/pull/5
     "crownstone-core",  # https://github.com/crownstone/crownstone-lib-python-core/pull/6
@@ -189,9 +142,13 @@ EXCEPTIONS = {
     "crownstone-uart",  # https://github.com/crownstone/crownstone-lib-python-uart/pull/12
     "eliqonline",  # https://github.com/molobrakos/eliqonline/pull/17
     "enocean",  # https://github.com/kipe/enocean/pull/142
+    "gardena-bluetooth",  # https://github.com/elupus/gardena-bluetooth/pull/11
+    "heatmiserV3",  # https://github.com/andylockran/heatmiserV3/pull/94
+    "huum",  # https://github.com/frwickst/pyhuum/pull/8
     "imutils",  # https://github.com/PyImageSearch/imutils/pull/292
     "iso4217",  # Public domain
     "kiwiki_client",  # https://github.com/c7h/kiwiki_client/pull/6
+    "krakenex",  # https://github.com/veox/python3-krakenex/pull/145
     "ld2410-ble",  # https://github.com/930913/ld2410-ble/pull/7
     "maxcube-api",  # https://github.com/uebelack/python-maxcube-api/pull/48
     "neurio",  # https://github.com/jordanh/neurio-python/pull/13
@@ -202,9 +159,16 @@ EXCEPTIONS = {
     "pyeconet",  # https://github.com/w1ll1am23/pyeconet/pull/41
     "pysabnzbd",  # https://github.com/jeradM/pysabnzbd/pull/6
     "pyvera",  # https://github.com/maximvelichko/pyvera/pull/164
+    "pyxeoma",  # https://github.com/jeradM/pyxeoma/pull/11
     "repoze.lru",
+    "ruuvitag-ble",  # https://github.com/Bluetooth-Devices/ruuvitag-ble/pull/10
+    "sensirion-ble",  # https://github.com/akx/sensirion-ble/pull/9
     "sharp_aquos_rc",  # https://github.com/jmoore987/sharp_aquos_rc/pull/14
     "tapsaff",  # https://github.com/bazwilliams/python-taps-aff/pull/5
+    "vincenty",  # Public domain
+    "zeversolar",  # https://github.com/kvanzuijlen/zeversolar/pull/46
+    # Using License-Expression (with hatchling)
+    "ftfy",  # Apache-2.0
 }
 
 TODO = {
@@ -213,181 +177,13 @@ TODO = {
     ),  # https://github.com/aio-libs/aiocache/blob/master/LICENSE all rights reserved?
 }
 
-EXCEPTIONS_AND_TODOS = EXCEPTIONS.union(TODO)
-
-
-def check_licenses(args: CheckArgs) -> int:
-    """Check licenses are OSI approved."""
-    exit_code = 0
-    raw_licenses = json.loads(Path(args.path).read_text())
-    license_status = {
-        pkg.name: (pkg, check_license_status(pkg))
-        for data in raw_licenses
-        if (pkg := PackageDefinition.from_dict(data))
-    }
-
-    for name, version in TODO.items():
-        pkg, status = license_status.get(name, (None, None))
-        if pkg is None or not (version < pkg.version):
-            continue
-        assert status is not None
-
-        if status is True:
-            print(
-                "Approved license detected for "
-                f"{pkg.name}@{pkg.version}: {get_license_str(pkg)}\n"
-                "Please remove the package from the TODO list.\n"
-            )
-        else:
-            print(
-                "We could not detect an OSI-approved license for "
-                f"{pkg.name}@{pkg.version}: {get_license_str(pkg)}\n"
-                "Please update the package version on the TODO list.\n"
-            )
-        exit_code = 1
-
-    for pkg, status in license_status.values():
-        if status is False and pkg.name not in EXCEPTIONS_AND_TODOS:
-            print(
-                "We could not detect an OSI-approved license for "
-                f"{pkg.name}@{pkg.version}: {get_license_str(pkg)}\n"
-            )
-            exit_code = 1
-        if status is True and pkg.name in EXCEPTIONS:
-            print(
-                "Approved license detected for "
-                f"{pkg.name}@{pkg.version}: {get_license_str(pkg)}\n"
-                "Please remove the package from the EXCEPTIONS list.\n"
-            )
-            exit_code = 1
-
-    for name in EXCEPTIONS_AND_TODOS.difference(license_status):
-        print(
-            f"Package {name} is tracked, but not used. "
-            "Please remove it from the licenses.py file.\n"
-        )
-        exit_code = 1
-
-    return exit_code
-
-
-def check_license_status(package: PackageDefinition) -> bool:
-    """Check if package licenses is OSI approved."""
-    if package.license_expression:
-        # Prefer 'License-Expression' if it exists
-        return check_license_expression(package.license_expression) or False
-
-    if (
-        package.license_metadata
-        and (check := check_license_expression(package.license_metadata)) is not None
-    ):
-        # Check license metadata if it's a valid SPDX license expression
-        return check
-
-    for approved_license in OSI_APPROVED_LICENSES:
-        if approved_license in package.license:
-            return True
-    return False
-
-
-def check_license_expression(license_str: str) -> bool | None:
-    """Check if license expression is a valid and approved SPDX license string."""
-    if license_str == "UNKNOWN" or "\n" in license_str:
-        # Ignore common errors for license metadata values
-        return None
-
-    try:
-        expr = licensing.parse(license_str, validate=True)
-    except ExpressionError:
-        return None
-    return check_spdx_license(expr)
-
-
-def check_spdx_license(expr: LicenseExpression) -> bool:
-    """Check a SPDX license expression."""
-    if isinstance(expr, LicenseSymbol):
-        return expr.key in OSI_APPROVED_LICENSES_SPDX
-    if isinstance(expr, OR):
-        return any(check_spdx_license(arg) for arg in expr.args)
-    if isinstance(expr, AND):
-        return all(check_spdx_license(arg) for arg in expr.args)
-    return False
-
-
-def get_license_str(package: PackageDefinition) -> str:
-    """Return license string."""
-    return (
-        f"{package.license_expression} -- {package.license_metadata} "
-        f"-- {package.license_classifier}"
-    )
-
-
-def extract_licenses(args: ExtractArgs) -> int:
-    """Extract license data for installed packages."""
-    licenses = sorted(
-        [get_package_metadata(dist) for dist in list(metadata.distributions())],
-        key=lambda dist: dist["name"],
-    )
-    Path(args.output_file).write_text(json.dumps(licenses, indent=2))
-    return 0
-
-
-def get_package_metadata(dist: metadata.Distribution) -> PackageMetadata:
-    """Get package metadata for distribution."""
-    return {
-        "name": dist.name,
-        "version": dist.version,
-        "license_expression": dist.metadata.get("License-Expression"),
-        "license_metadata": dist.metadata.get("License"),
-        "license_classifier": extract_license_classifier(
-            dist.metadata.get_all("Classifier")
-        ),
-    }
-
-
-def extract_license_classifier(classifiers: list[str] | None) -> list[str]:
-    """Extract license from list of classifiers.
-
-    E.g. 'License :: OSI Approved :: MIT License' -> 'MIT License'.
-    Filter out bare 'License :: OSI Approved'.
-    """
-    return [
-        license_classifier
-        for classifier in classifiers or ()
-        if classifier.startswith("License")
-        and (license_classifier := classifier.rpartition(" :: ")[2])
-        and license_classifier != "OSI Approved"
-    ]
-
-
-class ExtractArgs(Namespace):
-    """Extract arguments."""
-
-    output_file: str
-
-
-class CheckArgs(Namespace):
-    """Check arguments."""
-
-    path: str
-
 
 def main(argv: Sequence[str] | None = None) -> int:
     """Run the main script."""
+    exit_code = 0
+
     parser = ArgumentParser()
-    subparsers = parser.add_subparsers(title="Subcommands", required=True)
-
-    parser_extract = subparsers.add_parser("extract")
-    parser_extract.set_defaults(action="extract")
-    parser_extract.add_argument(
-        "--output-file",
-        default="licenses.json",
-        help="Path to store the licenses file",
-    )
-
-    parser_check = subparsers.add_parser("check")
-    parser_check.set_defaults(action="check")
-    parser_check.add_argument(
+    parser.add_argument(
         "path",
         nargs="?",
         metavar="PATH",
@@ -398,16 +194,60 @@ def main(argv: Sequence[str] | None = None) -> int:
     argv = argv or sys.argv[1:]
     args = parser.parse_args(argv)
 
-    if args.action == "extract":
-        args = cast(ExtractArgs, args)
-        return extract_licenses(args)
-    if args.action == "check":
-        args = cast(CheckArgs, args)
-        if (exit_code := check_licenses(args)) == 0:
-            print("All licenses are approved!")
-        return exit_code
-    return 0
+    raw_licenses = json.loads(Path(args.path).read_text())
+    package_definitions = [PackageDefinition.from_dict(data) for data in raw_licenses]
+    for package in package_definitions:
+        previous_unapproved_version = TODO.get(package.name)
+        approved = False
+        for approved_license in OSI_APPROVED_LICENSES:
+            if approved_license in package.license:
+                approved = True
+                break
+        if previous_unapproved_version is not None:
+            if previous_unapproved_version < package.version:
+                if approved:
+                    print(
+                        "Approved license detected for "
+                        f"{package.name}@{package.version}: {package.license}"
+                    )
+                    print("Please remove the package from the TODO list.")
+                    print()
+                else:
+                    print(
+                        "We could not detect an OSI-approved license for "
+                        f"{package.name}@{package.version}: {package.license}"
+                    )
+                    print()
+                exit_code = 1
+        elif not approved and package.name not in EXCEPTIONS:
+            print(
+                "We could not detect an OSI-approved license for "
+                f"{package.name}@{package.version}: {package.license}"
+            )
+            print()
+            exit_code = 1
+        elif approved and package.name in EXCEPTIONS:
+            print(
+                "Approved license detected for "
+                f"{package.name}@{package.version}: {package.license}"
+            )
+            print(f"Please remove the package from the EXCEPTIONS list: {package.name}")
+            print()
+            exit_code = 1
+    current_packages = {package.name for package in package_definitions}
+    for package in [*TODO.keys(), *EXCEPTIONS]:
+        if package not in current_packages:
+            print(
+                f"Package {package} is tracked, but not used. Please remove from the licenses.py"
+                "file."
+            )
+            print()
+            exit_code = 1
+    return exit_code
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    exit_code = main()
+    if exit_code == 0:
+        print("All licenses are approved!")
+    sys.exit(exit_code)
diff --git a/script/split_tests.py b/script/split_tests.py
index c64de46a068..e124f722552 100755
--- a/script/split_tests.py
+++ b/script/split_tests.py
@@ -49,27 +49,16 @@ class BucketHolder:
             test_folder.get_all_flatten(), reverse=True, key=lambda x: x.total_tests
         )
         for tests in sorted_tests:
+            print(f"{tests.total_tests:>{digits}} tests in {tests.path}")
             if tests.added_to_bucket:
                 # Already added to bucket
                 continue
 
-            print(f"{tests.total_tests:>{digits}} tests in {tests.path}")
             smallest_bucket = min(self._buckets, key=lambda x: x.total_tests)
-            is_file = isinstance(tests, TestFile)
             if (
                 smallest_bucket.total_tests + tests.total_tests < self._tests_per_bucket
-            ) or is_file:
+            ) or isinstance(tests, TestFile):
                 smallest_bucket.add(tests)
-                # Ensure all files from the same folder are in the same bucket
-                # to ensure that syrupy correctly identifies unused snapshots
-                if is_file:
-                    for other_test in tests.parent.children.values():
-                        if other_test is tests or isinstance(other_test, TestFolder):
-                            continue
-                        print(
-                            f"{other_test.total_tests:>{digits}} tests in {other_test.path} (same bucket)"
-                        )
-                        smallest_bucket.add(other_test)
 
         # verify that all tests are added to a bucket
         if not test_folder.added_to_bucket:
@@ -90,7 +79,6 @@ class TestFile:
     total_tests: int
     path: Path
     added_to_bucket: bool = field(default=False, init=False)
-    parent: TestFolder | None = field(default=None, init=False)
 
     def add_to_bucket(self) -> None:
         """Add test file to bucket."""
@@ -137,7 +125,6 @@ class TestFolder:
     def add_test_file(self, file: TestFile) -> None:
         """Add test file to folder."""
         path = file.path
-        file.parent = self
         relative_path = path.relative_to(self.path)
         if not relative_path.parts:
             raise ValueError("Path is not a child of this folder")
diff --git a/tests/common.py b/tests/common.py
index 8bd45e4d7f8..ad14481e385 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -1064,8 +1064,6 @@ class MockConfigEntry(config_entries.ConfigEntry):
         data: dict[str, Any] | None = None,
     ) -> ConfigFlowResult:
         """Start a reauthentication flow."""
-        if self.entry_id not in hass.config_entries._entries:
-            raise ValueError("Config entry must be added to hass to start reauth flow")
         return await start_reauth_flow(hass, self, context, data)
 
     async def start_reconfigure_flow(
@@ -1075,10 +1073,6 @@ class MockConfigEntry(config_entries.ConfigEntry):
         show_advanced_options: bool = False,
     ) -> ConfigFlowResult:
         """Start a reconfiguration flow."""
-        if self.entry_id not in hass.config_entries._entries:
-            raise ValueError(
-                "Config entry must be added to hass to start reconfiguration flow"
-            )
         return await hass.config_entries.flow.async_init(
             self.domain,
             context={
diff --git a/tests/components/abode/test_alarm_control_panel.py b/tests/components/abode/test_alarm_control_panel.py
index 025afa74b80..51e0ee46838 100644
--- a/tests/components/abode/test_alarm_control_panel.py
+++ b/tests/components/abode/test_alarm_control_panel.py
@@ -3,10 +3,7 @@
 from unittest.mock import PropertyMock, patch
 
 from homeassistant.components.abode import ATTR_DEVICE_ID
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_DOMAIN,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_FRIENDLY_NAME,
@@ -14,6 +11,9 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_AWAY,
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_DISARM,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -39,7 +39,7 @@ async def test_attributes(hass: HomeAssistant) -> None:
     await setup_platform(hass, ALARM_DOMAIN)
 
     state = hass.states.get(DEVICE_ID)
-    assert state.state == AlarmControlPanelState.DISARMED
+    assert state.state == STATE_ALARM_DISARMED
     assert state.attributes.get(ATTR_DEVICE_ID) == "area_1"
     assert not state.attributes.get("battery_backup")
     assert not state.attributes.get("cellular_backup")
@@ -75,7 +75,7 @@ async def test_set_alarm_away(hass: HomeAssistant) -> None:
             await hass.async_block_till_done()
 
             state = hass.states.get(DEVICE_ID)
-            assert state.state == AlarmControlPanelState.ARMED_AWAY
+            assert state.state == STATE_ALARM_ARMED_AWAY
 
 
 async def test_set_alarm_home(hass: HomeAssistant) -> None:
@@ -105,7 +105,7 @@ async def test_set_alarm_home(hass: HomeAssistant) -> None:
             await hass.async_block_till_done()
 
             state = hass.states.get(DEVICE_ID)
-            assert state.state == AlarmControlPanelState.ARMED_HOME
+            assert state.state == STATE_ALARM_ARMED_HOME
 
 
 async def test_set_alarm_standby(hass: HomeAssistant) -> None:
@@ -134,7 +134,7 @@ async def test_set_alarm_standby(hass: HomeAssistant) -> None:
             await hass.async_block_till_done()
 
             state = hass.states.get(DEVICE_ID)
-            assert state.state == AlarmControlPanelState.DISARMED
+            assert state.state == STATE_ALARM_DISARMED
 
 
 async def test_state_unknown(hass: HomeAssistant) -> None:
diff --git a/tests/components/acaia/__init__.py b/tests/components/acaia/__init__.py
deleted file mode 100644
index f4eaa39e615..00000000000
--- a/tests/components/acaia/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""Common test tools for the acaia integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
-) -> None:
-    """Set up the acaia integration for testing."""
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/acaia/conftest.py b/tests/components/acaia/conftest.py
deleted file mode 100644
index 1dc6ff31051..00000000000
--- a/tests/components/acaia/conftest.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""Common fixtures for the acaia tests."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, MagicMock, patch
-
-from aioacaia.acaiascale import AcaiaDeviceState
-from aioacaia.const import UnitMass as AcaiaUnitOfMass
-import pytest
-
-from homeassistant.components.acaia.const import CONF_IS_NEW_STYLE_SCALE, DOMAIN
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.core import HomeAssistant
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.acaia.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_verify() -> Generator[AsyncMock]:
-    """Override is_new_scale check."""
-    with patch(
-        "homeassistant.components.acaia.config_flow.is_new_scale", return_value=True
-    ) as mock_verify:
-        yield mock_verify
-
-
-@pytest.fixture
-def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
-    """Return the default mocked config entry."""
-    return MockConfigEntry(
-        title="LUNAR-DDEEFF",
-        domain=DOMAIN,
-        version=1,
-        data={
-            CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
-            CONF_IS_NEW_STYLE_SCALE: True,
-        },
-        unique_id="aa:bb:cc:dd:ee:ff",
-    )
-
-
-@pytest.fixture
-async def init_integration(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_scale: MagicMock
-) -> None:
-    """Set up the acaia integration for testing."""
-    await setup_integration(hass, mock_config_entry)
-
-
-@pytest.fixture
-def mock_scale() -> Generator[MagicMock]:
-    """Return a mocked acaia scale client."""
-    with (
-        patch(
-            "homeassistant.components.acaia.coordinator.AcaiaScale",
-            autospec=True,
-        ) as scale_mock,
-    ):
-        scale = scale_mock.return_value
-        scale.connected = True
-        scale.mac = "aa:bb:cc:dd:ee:ff"
-        scale.model = "Lunar"
-        scale.timer_running = True
-        scale.heartbeat_task = None
-        scale.process_queue_task = None
-        scale.device_state = AcaiaDeviceState(
-            battery_level=42, units=AcaiaUnitOfMass.GRAMS
-        )
-        scale.weight = 123.45
-        yield scale
diff --git a/tests/components/acaia/snapshots/test_button.ambr b/tests/components/acaia/snapshots/test_button.ambr
deleted file mode 100644
index cd91ca1a17a..00000000000
--- a/tests/components/acaia/snapshots/test_button.ambr
+++ /dev/null
@@ -1,139 +0,0 @@
-# serializer version: 1
-# name: test_buttons[button.lunar_ddeeff_reset_timer-entry]
-  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.lunar_ddeeff_reset_timer',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Reset timer',
-    'platform': 'acaia',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'reset_timer',
-    'unique_id': 'aa:bb:cc:dd:ee:ff_reset_timer',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[button.lunar_ddeeff_reset_timer-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'LUNAR-DDEEFF Reset timer',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.lunar_ddeeff_reset_timer',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[button.lunar_ddeeff_start_stop_timer-entry]
-  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.lunar_ddeeff_start_stop_timer',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Start/stop timer',
-    'platform': 'acaia',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'start_stop',
-    'unique_id': 'aa:bb:cc:dd:ee:ff_start_stop',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[button.lunar_ddeeff_start_stop_timer-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'LUNAR-DDEEFF Start/stop timer',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.lunar_ddeeff_start_stop_timer',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[button.lunar_ddeeff_tare-entry]
-  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.lunar_ddeeff_tare',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Tare',
-    'platform': 'acaia',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'tare',
-    'unique_id': 'aa:bb:cc:dd:ee:ff_tare',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[button.lunar_ddeeff_tare-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'LUNAR-DDEEFF Tare',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.lunar_ddeeff_tare',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
diff --git a/tests/components/acaia/snapshots/test_init.ambr b/tests/components/acaia/snapshots/test_init.ambr
deleted file mode 100644
index 1cc3d8dbbc0..00000000000
--- a/tests/components/acaia/snapshots/test_init.ambr
+++ /dev/null
@@ -1,33 +0,0 @@
-# serializer version: 1
-# name: test_device
-  DeviceRegistryEntrySnapshot({
-    'area_id': 'kitchen',
-    'config_entries': <ANY>,
-    'configuration_url': None,
-    'connections': set({
-    }),
-    'disabled_by': None,
-    'entry_type': None,
-    'hw_version': None,
-    'id': <ANY>,
-    'identifiers': set({
-      tuple(
-        'acaia',
-        'aa:bb:cc:dd:ee:ff',
-      ),
-    }),
-    'is_new': False,
-    'labels': set({
-    }),
-    'manufacturer': 'Acaia',
-    'model': 'Lunar',
-    'model_id': None,
-    'name': 'LUNAR-DDEEFF',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': None,
-    'suggested_area': 'Kitchen',
-    'sw_version': None,
-    'via_device_id': None,
-  })
-# ---
diff --git a/tests/components/acaia/test_button.py b/tests/components/acaia/test_button.py
deleted file mode 100644
index f68f85e253d..00000000000
--- a/tests/components/acaia/test_button.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Tests for the acaia buttons."""
-
-from datetime import timedelta
-from unittest.mock import MagicMock, patch
-
-from freezegun.api import FrozenDateTimeFactory
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
-from homeassistant.const import (
-    ATTR_ENTITY_ID,
-    STATE_UNAVAILABLE,
-    STATE_UNKNOWN,
-    Platform,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
-
-BUTTONS = (
-    "tare",
-    "reset_timer",
-    "start_stop_timer",
-)
-
-
-async def test_buttons(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    snapshot: SnapshotAssertion,
-    mock_scale: MagicMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test the acaia buttons."""
-
-    with patch("homeassistant.components.acaia.PLATFORMS", [Platform.BUTTON]):
-        await setup_integration(hass, mock_config_entry)
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-async def test_button_presses(
-    hass: HomeAssistant,
-    mock_scale: MagicMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test the acaia button presses."""
-
-    await setup_integration(hass, mock_config_entry)
-
-    for button in BUTTONS:
-        await hass.services.async_call(
-            BUTTON_DOMAIN,
-            SERVICE_PRESS,
-            {
-                ATTR_ENTITY_ID: f"button.lunar_ddeeff_{button}",
-            },
-            blocking=True,
-        )
-
-        function = getattr(mock_scale, button)
-        function.assert_called_once()
-
-
-async def test_buttons_unavailable_on_disconnected_scale(
-    hass: HomeAssistant,
-    mock_scale: MagicMock,
-    mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test the acaia buttons are unavailable when the scale is disconnected."""
-
-    await setup_integration(hass, mock_config_entry)
-
-    for button in BUTTONS:
-        state = hass.states.get(f"button.lunar_ddeeff_{button}")
-        assert state
-        assert state.state == STATE_UNKNOWN
-
-    mock_scale.connected = False
-    freezer.tick(timedelta(minutes=10))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    for button in BUTTONS:
-        state = hass.states.get(f"button.lunar_ddeeff_{button}")
-        assert state
-        assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/acaia/test_config_flow.py b/tests/components/acaia/test_config_flow.py
deleted file mode 100644
index 2bf4b1dbe8a..00000000000
--- a/tests/components/acaia/test_config_flow.py
+++ /dev/null
@@ -1,242 +0,0 @@
-"""Test the acaia config flow."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
-
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError, AcaiaUnknownDevice
-import pytest
-
-from homeassistant.components.acaia.const import CONF_IS_NEW_STYLE_SCALE, DOMAIN
-from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_USER
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.bluetooth import BluetoothServiceInfo
-
-from tests.common import MockConfigEntry
-
-service_info = BluetoothServiceInfo(
-    name="LUNAR-DDEEFF",
-    address="aa:bb:cc:dd:ee:ff",
-    rssi=-63,
-    manufacturer_data={},
-    service_data={},
-    service_uuids=[],
-    source="local",
-)
-
-
-@pytest.fixture
-def mock_discovered_service_info() -> Generator[AsyncMock]:
-    """Override getting Bluetooth service info."""
-    with patch(
-        "homeassistant.components.acaia.config_flow.async_discovered_service_info",
-        return_value=[service_info],
-    ) as mock_discovered_service_info:
-        yield mock_discovered_service_info
-
-
-async def test_form(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    mock_verify: AsyncMock,
-    mock_discovered_service_info: AsyncMock,
-) -> None:
-    """Test we get the form."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    user_input = {
-        CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
-    }
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input=user_input,
-    )
-
-    assert result2["type"] is FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "LUNAR-DDEEFF"
-    assert result2["data"] == {
-        **user_input,
-        CONF_IS_NEW_STYLE_SCALE: True,
-    }
-
-
-async def test_bluetooth_discovery(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    mock_verify: AsyncMock,
-) -> None:
-    """Test we can discover a device."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_BLUETOOTH}, data=service_info
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "bluetooth_confirm"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={},
-    )
-
-    assert result2["type"] is FlowResultType.CREATE_ENTRY
-    assert result2["title"] == service_info.name
-    assert result2["data"] == {
-        CONF_ADDRESS: service_info.address,
-        CONF_IS_NEW_STYLE_SCALE: True,
-    }
-
-
-@pytest.mark.parametrize(
-    ("exception", "error"),
-    [
-        (AcaiaDeviceNotFound("Error"), "device_not_found"),
-        (AcaiaError, "unknown"),
-        (AcaiaUnknownDevice, "unsupported_device"),
-    ],
-)
-async def test_bluetooth_discovery_errors(
-    hass: HomeAssistant,
-    mock_verify: AsyncMock,
-    exception: Exception,
-    error: str,
-) -> None:
-    """Test abortions of Bluetooth discovery."""
-    mock_verify.side_effect = exception
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_BLUETOOTH}, data=service_info
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == error
-
-
-async def test_already_configured(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_verify: AsyncMock,
-    mock_discovered_service_info: AsyncMock,
-) -> None:
-    """Ensure we can't add the same device twice."""
-
-    mock_config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {
-            CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
-        },
-    )
-    await hass.async_block_till_done()
-
-    assert result2["type"] is FlowResultType.ABORT
-    assert result2["reason"] == "already_configured"
-
-
-async def test_already_configured_bluetooth_discovery(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Ensure configure device is not discovered again."""
-
-    mock_config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_BLUETOOTH}, data=service_info
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-@pytest.mark.parametrize(
-    ("exception", "error"),
-    [
-        (AcaiaDeviceNotFound("Error"), "device_not_found"),
-        (AcaiaError, "unknown"),
-    ],
-)
-async def test_recoverable_config_flow_errors(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    mock_verify: AsyncMock,
-    mock_discovered_service_info: AsyncMock,
-    exception: Exception,
-    error: str,
-) -> None:
-    """Test recoverable errors."""
-    mock_verify.side_effect = exception
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {
-            CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
-        },
-    )
-
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": error}
-
-    # recover
-    mock_verify.side_effect = None
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
-        {
-            CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
-        },
-    )
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-
-
-async def test_unsupported_device(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    mock_verify: AsyncMock,
-    mock_discovered_service_info: AsyncMock,
-) -> None:
-    """Test flow aborts on unsupported device."""
-    mock_verify.side_effect = AcaiaUnknownDevice
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {
-            CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
-        },
-    )
-
-    assert result2["type"] is FlowResultType.ABORT
-    assert result2["reason"] == "unsupported_device"
-
-
-async def test_no_bluetooth_devices(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    mock_discovered_service_info: AsyncMock,
-) -> None:
-    """Test flow aborts on unsupported device."""
-    mock_discovered_service_info.return_value = []
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "no_devices_found"
diff --git a/tests/components/acaia/test_init.py b/tests/components/acaia/test_init.py
deleted file mode 100644
index 8ad988d3b9b..00000000000
--- a/tests/components/acaia/test_init.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""Test init of acaia integration."""
-
-from datetime import timedelta
-from unittest.mock import MagicMock
-
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError
-from freezegun.api import FrozenDateTimeFactory
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.acaia.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from tests.common import MockConfigEntry, async_fire_time_changed
-
-pytestmark = pytest.mark.usefixtures("init_integration")
-
-
-async def test_load_unload_config_entry(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test loading and unloading the integration."""
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    await hass.config_entries.async_unload(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
-
-
-@pytest.mark.parametrize(
-    "exception", [AcaiaError, AcaiaDeviceNotFound("Boom"), TimeoutError]
-)
-async def test_update_exception_leads_to_active_disconnect(
-    hass: HomeAssistant,
-    mock_scale: MagicMock,
-    freezer: FrozenDateTimeFactory,
-    exception: Exception,
-) -> None:
-    """Test scale gets disconnected on exception."""
-
-    mock_scale.connect.side_effect = exception
-    mock_scale.connected = False
-
-    freezer.tick(timedelta(minutes=10))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    mock_scale.device_disconnected_handler.assert_called_once()
-
-
-async def test_device(
-    mock_scale: MagicMock,
-    device_registry: dr.DeviceRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Snapshot the device from registry."""
-
-    device = device_registry.async_get_device({(DOMAIN, mock_scale.mac)})
-    assert device
-    assert device == snapshot
diff --git a/tests/components/adguard/test_config_flow.py b/tests/components/adguard/test_config_flow.py
index 6644a4ca20f..d493962611f 100644
--- a/tests/components/adguard/test_config_flow.py
+++ b/tests/components/adguard/test_config_flow.py
@@ -4,6 +4,7 @@ import aiohttp
 
 from homeassistant import config_entries
 from homeassistant.components.adguard.const import DOMAIN
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import (
     CONF_HOST,
@@ -16,7 +17,6 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
diff --git a/tests/components/advantage_air/test_binary_sensor.py b/tests/components/advantage_air/test_binary_sensor.py
index d0088d96ba5..13bbadb38f9 100644
--- a/tests/components/advantage_air/test_binary_sensor.py
+++ b/tests/components/advantage_air/test_binary_sensor.py
@@ -1,8 +1,10 @@
 """Test the Advantage Air Binary Sensor Platform."""
 
 from datetime import timedelta
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
 
+from homeassistant.components.advantage_air import ADVANTAGE_AIR_SYNC_INTERVAL
+from homeassistant.config_entries import RELOAD_AFTER_UPDATE_DELAY
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -68,14 +70,22 @@ async def test_binary_sensor_async_setup_entry(
     assert not hass.states.get(entity_id)
 
     mock_get.reset_mock()
+    entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
+    await hass.async_block_till_done()
 
-    with patch("homeassistant.config_entries.RELOAD_AFTER_UPDATE_DELAY", 1):
-        entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
-        await hass.async_block_till_done()
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL + 1),
+    )
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert len(mock_get.mock_calls) == 1
 
-        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
-        await hass.async_block_till_done(wait_background_tasks=True)
-        assert len(mock_get.mock_calls) == 1
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+    )
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert len(mock_get.mock_calls) == 2
 
     state = hass.states.get(entity_id)
     assert state
@@ -91,14 +101,22 @@ async def test_binary_sensor_async_setup_entry(
     assert not hass.states.get(entity_id)
 
     mock_get.reset_mock()
+    entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
+    await hass.async_block_till_done()
 
-    with patch("homeassistant.config_entries.RELOAD_AFTER_UPDATE_DELAY", 1):
-        entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
-        await hass.async_block_till_done()
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL + 1),
+    )
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert len(mock_get.mock_calls) == 1
 
-        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
-        await hass.async_block_till_done(wait_background_tasks=True)
-        assert len(mock_get.mock_calls) == 1
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+    )
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert len(mock_get.mock_calls) == 2
 
     state = hass.states.get(entity_id)
     assert state
diff --git a/tests/components/advantage_air/test_sensor.py b/tests/components/advantage_air/test_sensor.py
index 3ea368a59fb..06243921a64 100644
--- a/tests/components/advantage_air/test_sensor.py
+++ b/tests/components/advantage_air/test_sensor.py
@@ -1,13 +1,15 @@
 """Test the Advantage Air Sensor Platform."""
 
 from datetime import timedelta
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
 
+from homeassistant.components.advantage_air import ADVANTAGE_AIR_SYNC_INTERVAL
 from homeassistant.components.advantage_air.const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from homeassistant.components.advantage_air.sensor import (
     ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
     ADVANTAGE_AIR_SET_COUNTDOWN_VALUE,
 )
+from homeassistant.config_entries import RELOAD_AFTER_UPDATE_DELAY
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -122,15 +124,23 @@ async def test_sensor_platform_disabled_entity(
 
     assert not hass.states.get(entity_id)
 
+    entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
+    await hass.async_block_till_done(wait_background_tasks=True)
     mock_get.reset_mock()
 
-    with patch("homeassistant.config_entries.RELOAD_AFTER_UPDATE_DELAY", 1):
-        entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
-        await hass.async_block_till_done(wait_background_tasks=True)
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL + 1),
+    )
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert len(mock_get.mock_calls) == 1
 
-        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
-        await hass.async_block_till_done(wait_background_tasks=True)
-        assert len(mock_get.mock_calls) == 1
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+    )
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert len(mock_get.mock_calls) == 2
 
     state = hass.states.get(entity_id)
     assert state
diff --git a/tests/components/airgradient/conftest.py b/tests/components/airgradient/conftest.py
index 395c5cd96a4..1899e12c8ae 100644
--- a/tests/components/airgradient/conftest.py
+++ b/tests/components/airgradient/conftest.py
@@ -1,7 +1,7 @@
 """AirGradient tests configuration."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 from airgradient import Config, Measures
 import pytest
@@ -10,6 +10,7 @@ from homeassistant.components.airgradient.const import DOMAIN
 from homeassistant.const import CONF_HOST
 
 from tests.common import MockConfigEntry, load_fixture
+from tests.components.smhi.common import AsyncMock
 
 
 @pytest.fixture
diff --git a/tests/components/airgradient/snapshots/test_update.ambr b/tests/components/airgradient/snapshots/test_update.ambr
index 1f944bb528b..f76a8fc1196 100644
--- a/tests/components/airgradient/snapshots/test_update.ambr
+++ b/tests/components/airgradient/snapshots/test_update.ambr
@@ -37,7 +37,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/airgradient/icon.png',
       'friendly_name': 'Airgradient Firmware',
       'in_progress': False,
diff --git a/tests/components/airthings_ble/__init__.py b/tests/components/airthings_ble/__init__.py
index add21b1067f..a736fa979e9 100644
--- a/tests/components/airthings_ble/__init__.py
+++ b/tests/components/airthings_ble/__init__.py
@@ -49,7 +49,7 @@ def patch_airthings_ble(return_value=AirthingsDevice, side_effect=None):
 def patch_airthings_device_update():
     """Patch airthings-ble device."""
     return patch(
-        "homeassistant.components.airthings_ble.coordinator.AirthingsBluetoothDeviceData.update_device",
+        "homeassistant.components.airthings_ble.AirthingsBluetoothDeviceData.update_device",
         return_value=WAVE_DEVICE_INFO,
     )
 
diff --git a/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr b/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr
index c6ad36916bf..86b5c75b290 100644
--- a/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr
+++ b/tests/components/airzone_cloud/snapshots/test_diagnostics.ambr
@@ -136,7 +136,6 @@
           }),
           'temperature': 21.0,
           'temperature-setpoint': 22.0,
-          'temperature-setpoint-auto-air': 22.0,
           'temperature-setpoint-cool-air': 22.0,
           'temperature-setpoint-hot-air': 22.0,
           'temperature-setpoint-max': 30.0,
@@ -192,7 +191,6 @@
           }),
           'temperature': 20.0,
           'temperature-setpoint': 22.0,
-          'temperature-setpoint-auto-air': 22.0,
           'temperature-setpoint-cool-air': 22.0,
           'temperature-setpoint-hot-air': 18.0,
           'temperature-setpoint-max': 30.0,
@@ -299,7 +297,6 @@
         'dhw1': dict({
           'active': False,
           'available': True,
-          'double-set-point': False,
           'id': 'dhw1',
           'installation': 'installation1',
           'is-connected': True,
@@ -382,7 +379,6 @@
           'aq-present': True,
           'aq-status': 'good',
           'available': True,
-          'double-set-point': False,
           'errors': list([
             dict({
               '_id': 'error-id',
diff --git a/tests/components/alarm_control_panel/common.py b/tests/components/alarm_control_panel/common.py
index 8a631eeff36..36e9918f54c 100644
--- a/tests/components/alarm_control_panel/common.py
+++ b/tests/components/alarm_control_panel/common.py
@@ -8,7 +8,6 @@ from homeassistant.components.alarm_control_panel import (
     DOMAIN,
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.const import (
     ATTR_CODE,
@@ -21,6 +20,12 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_VACATION,
     SERVICE_ALARM_DISARM,
     SERVICE_ALARM_TRIGGER,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant
 
@@ -140,31 +145,31 @@ class MockAlarm(MockEntity, AlarmControlPanelEntity):
 
     def alarm_arm_away(self, code=None):
         """Send arm away command."""
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_AWAY
+        self._attr_state = STATE_ALARM_ARMED_AWAY
         self.schedule_update_ha_state()
 
     def alarm_arm_home(self, code=None):
         """Send arm home command."""
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_HOME
+        self._attr_state = STATE_ALARM_ARMED_HOME
         self.schedule_update_ha_state()
 
     def alarm_arm_night(self, code=None):
         """Send arm night command."""
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_NIGHT
+        self._attr_state = STATE_ALARM_ARMED_NIGHT
         self.schedule_update_ha_state()
 
     def alarm_arm_vacation(self, code=None):
         """Send arm night command."""
-        self._attr_alarm_state = AlarmControlPanelState.ARMED_VACATION
+        self._attr_state = STATE_ALARM_ARMED_VACATION
         self.schedule_update_ha_state()
 
     def alarm_disarm(self, code=None):
         """Send disarm command."""
         if code == "1234":
-            self._attr_alarm_state = AlarmControlPanelState.DISARMED
+            self._attr_state = STATE_ALARM_DISARMED
             self.schedule_update_ha_state()
 
     def alarm_trigger(self, code=None):
         """Send alarm trigger command."""
-        self._attr_alarm_state = AlarmControlPanelState.TRIGGERED
+        self._attr_state = STATE_ALARM_TRIGGERED
         self.schedule_update_ha_state()
diff --git a/tests/components/alarm_control_panel/test_device_action.py b/tests/components/alarm_control_panel/test_device_action.py
index a7335017691..9c5aaffd733 100644
--- a/tests/components/alarm_control_panel/test_device_action.py
+++ b/tests/components/alarm_control_panel/test_device_action.py
@@ -7,10 +7,19 @@ from homeassistant.components import automation
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.components.device_automation import DeviceAutomationType
-from homeassistant.const import CONF_PLATFORM, STATE_UNKNOWN, EntityCategory
+from homeassistant.const import (
+    CONF_PLATFORM,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+    STATE_UNKNOWN,
+    EntityCategory,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -532,44 +541,27 @@ async def test_action(
 
     hass.bus.async_fire("test_event_arm_away")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get(entity_entry.entity_id).state
-        == AlarmControlPanelState.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(entity_entry.entity_id).state
-        == AlarmControlPanelState.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(entity_entry.entity_id).state
-        == AlarmControlPanelState.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(entity_entry.entity_id).state
-        == AlarmControlPanelState.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(entity_entry.entity_id).state == AlarmControlPanelState.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(entity_entry.entity_id).state
-        == AlarmControlPanelState.TRIGGERED
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_TRIGGERED
 
 
 async def test_action_legacy(
@@ -623,7 +615,4 @@ async def test_action_legacy(
 
     hass.bus.async_fire("test_event_arm_away")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get(entity_entry.entity_id).state
-        == AlarmControlPanelState.ARMED_AWAY
-    )
+    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 37cbc466e6d..da1d77f50a3 100644
--- a/tests/components/alarm_control_panel/test_device_condition.py
+++ b/tests/components/alarm_control_panel/test_device_condition.py
@@ -7,10 +7,18 @@ from homeassistant.components import automation
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.components.device_automation import DeviceAutomationType
-from homeassistant.const import EntityCategory
+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_DISARMED,
+    STATE_ALARM_TRIGGERED,
+    EntityCategory,
+)
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -346,7 +354,7 @@ async def test_if_state(
             ]
         },
     )
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.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")
@@ -358,7 +366,7 @@ async def test_if_state(
     assert len(service_calls) == 1
     assert service_calls[0].data["some"] == "is_triggered - event - test_event1"
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.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")
@@ -370,7 +378,7 @@ async def test_if_state(
     assert len(service_calls) == 2
     assert service_calls[1].data["some"] == "is_disarmed - event - test_event2"
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.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")
@@ -382,7 +390,7 @@ async def test_if_state(
     assert len(service_calls) == 3
     assert service_calls[2].data["some"] == "is_armed_home - event - test_event3"
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.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")
@@ -394,7 +402,7 @@ async def test_if_state(
     assert len(service_calls) == 4
     assert service_calls[3].data["some"] == "is_armed_away - event - test_event4"
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.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")
@@ -406,7 +414,7 @@ async def test_if_state(
     assert len(service_calls) == 5
     assert service_calls[4].data["some"] == "is_armed_night - event - test_event5"
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.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")
@@ -418,7 +426,7 @@ async def test_if_state(
     assert len(service_calls) == 6
     assert service_calls[5].data["some"] == "is_armed_vacation - event - test_event6"
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.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")
@@ -480,7 +488,7 @@ async def test_if_state_legacy(
             ]
         },
     )
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(service_calls) == 1
diff --git a/tests/components/alarm_control_panel/test_device_trigger.py b/tests/components/alarm_control_panel/test_device_trigger.py
index 17a301ccdf1..46eba314dc1 100644
--- a/tests/components/alarm_control_panel/test_device_trigger.py
+++ b/tests/components/alarm_control_panel/test_device_trigger.py
@@ -9,10 +9,18 @@ from homeassistant.components import automation
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.components.device_automation import DeviceAutomationType
-from homeassistant.const import EntityCategory
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+    EntityCategory,
+)
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -248,7 +256,7 @@ async def test_if_fires_on_state_change(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.PENDING)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_PENDING)
 
     assert await async_setup_component(
         hass,
@@ -392,7 +400,7 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is triggered.
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert len(service_calls) == 1
     assert (
@@ -401,7 +409,7 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is disarmed.
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.DISARMED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
     await hass.async_block_till_done()
     assert len(service_calls) == 2
     assert (
@@ -410,7 +418,7 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is armed home.
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.ARMED_HOME)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_HOME)
     await hass.async_block_till_done()
     assert len(service_calls) == 3
     assert (
@@ -419,7 +427,7 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is armed away.
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.ARMED_AWAY)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_AWAY)
     await hass.async_block_till_done()
     assert len(service_calls) == 4
     assert (
@@ -428,7 +436,7 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is armed night.
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.ARMED_NIGHT)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_NIGHT)
     await hass.async_block_till_done()
     assert len(service_calls) == 5
     assert (
@@ -437,7 +445,7 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is armed vacation.
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.ARMED_VACATION)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_VACATION)
     await hass.async_block_till_done()
     assert len(service_calls) == 6
     assert (
@@ -463,7 +471,7 @@ async def test_if_fires_on_state_change_with_for(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.DISARMED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
 
     assert await async_setup_component(
         hass,
@@ -498,7 +506,7 @@ async def test_if_fires_on_state_change_with_for(
     await hass.async_block_till_done()
     assert len(service_calls) == 0
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert len(service_calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -528,7 +536,7 @@ async def test_if_fires_on_state_change_legacy(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.DISARMED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
 
     assert await async_setup_component(
         hass,
@@ -562,7 +570,7 @@ async def test_if_fires_on_state_change_legacy(
     await hass.async_block_till_done()
     assert len(service_calls) == 0
 
-    hass.states.async_set(entry.entity_id, AlarmControlPanelState.TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert len(service_calls) == 1
     assert (
diff --git a/tests/components/alarm_control_panel/test_init.py b/tests/components/alarm_control_panel/test_init.py
index 89a2a2a2b1a..06724978ce3 100644
--- a/tests/components/alarm_control_panel/test_init.py
+++ b/tests/components/alarm_control_panel/test_init.py
@@ -2,17 +2,14 @@
 
 from types import ModuleType
 from typing import Any
-from unittest.mock import patch
 
 import pytest
 
 from homeassistant.components import alarm_control_panel
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
+from homeassistant.components.alarm_control_panel.const import (
     AlarmControlPanelEntityFeature,
     CodeFormat,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_CODE,
     SERVICE_ALARM_ARM_AWAY,
@@ -26,20 +23,11 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
-from .conftest import TEST_DOMAIN, MockAlarmControlPanel
+from .conftest import MockAlarmControlPanel
 
-from tests.common import (
-    MockConfigEntry,
-    MockModule,
-    MockPlatform,
-    help_test_all,
-    import_and_test_deprecated_constant_enum,
-    mock_integration,
-    mock_platform,
-)
+from tests.common import help_test_all, import_and_test_deprecated_constant_enum
 
 
 async def help_test_async_alarm_control_panel_service(
@@ -295,290 +283,3 @@ async def test_alarm_control_panel_with_default_code(
         hass, mock_alarm_control_panel_entity.entity_id, SERVICE_ALARM_DISARM
     )
     mock_alarm_control_panel_entity.calls_disarm.assert_called_with("1234")
-
-
-async def test_alarm_control_panel_not_log_deprecated_state_warning(
-    hass: HomeAssistant,
-    mock_alarm_control_panel_entity: MockAlarmControlPanel,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test correctly using alarm_state doesn't log issue or raise repair."""
-    state = hass.states.get(mock_alarm_control_panel_entity.entity_id)
-    assert state is not None
-    assert "Entities should implement the 'alarm_state' property and" not in caplog.text
-
-
-async def test_alarm_control_panel_log_deprecated_state_warning_using_state_prop(
-    hass: HomeAssistant,
-    code_format: CodeFormat | None,
-    supported_features: AlarmControlPanelEntityFeature,
-    code_arm_required: bool,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test incorrectly using state property does log issue and raise repair."""
-
-    async def async_setup_entry_init(
-        hass: HomeAssistant, config_entry: ConfigEntry
-    ) -> bool:
-        """Set up test config entry."""
-        await hass.config_entries.async_forward_entry_setups(
-            config_entry, [ALARM_CONTROL_PANEL_DOMAIN]
-        )
-        return True
-
-    mock_integration(
-        hass,
-        MockModule(
-            TEST_DOMAIN,
-            async_setup_entry=async_setup_entry_init,
-        ),
-    )
-
-    class MockLegacyAlarmControlPanel(MockAlarmControlPanel):
-        """Mocked alarm control entity."""
-
-        def __init__(
-            self,
-            supported_features: AlarmControlPanelEntityFeature = AlarmControlPanelEntityFeature(
-                0
-            ),
-            code_format: CodeFormat | None = None,
-            code_arm_required: bool = True,
-        ) -> None:
-            """Initialize the alarm control."""
-            super().__init__(supported_features, code_format, code_arm_required)
-
-        @property
-        def state(self) -> str:
-            """Return the state of the entity."""
-            return "disarmed"
-
-    entity = MockLegacyAlarmControlPanel(
-        supported_features=supported_features,
-        code_format=code_format,
-        code_arm_required=code_arm_required,
-    )
-
-    async def async_setup_entry_platform(
-        hass: HomeAssistant,
-        config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
-    ) -> None:
-        """Set up test alarm control panel platform via config entry."""
-        async_add_entities([entity])
-
-    mock_platform(
-        hass,
-        f"{TEST_DOMAIN}.{ALARM_CONTROL_PANEL_DOMAIN}",
-        MockPlatform(async_setup_entry=async_setup_entry_platform),
-    )
-
-    with patch.object(
-        MockLegacyAlarmControlPanel,
-        "__module__",
-        "tests.custom_components.test.alarm_control_panel",
-    ):
-        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(entity.entity_id)
-    assert state is not None
-
-    assert "Entities should implement the 'alarm_state' property and" in caplog.text
-
-
-async def test_alarm_control_panel_log_deprecated_state_warning_using_attr_state_attr(
-    hass: HomeAssistant,
-    code_format: CodeFormat | None,
-    supported_features: AlarmControlPanelEntityFeature,
-    code_arm_required: bool,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test incorrectly using _attr_state attribute does log issue and raise repair."""
-
-    async def async_setup_entry_init(
-        hass: HomeAssistant, config_entry: ConfigEntry
-    ) -> bool:
-        """Set up test config entry."""
-        await hass.config_entries.async_forward_entry_setups(
-            config_entry, [ALARM_CONTROL_PANEL_DOMAIN]
-        )
-        return True
-
-    mock_integration(
-        hass,
-        MockModule(
-            TEST_DOMAIN,
-            async_setup_entry=async_setup_entry_init,
-        ),
-    )
-
-    class MockLegacyAlarmControlPanel(MockAlarmControlPanel):
-        """Mocked alarm control entity."""
-
-        def __init__(
-            self,
-            supported_features: AlarmControlPanelEntityFeature = AlarmControlPanelEntityFeature(
-                0
-            ),
-            code_format: CodeFormat | None = None,
-            code_arm_required: bool = True,
-        ) -> None:
-            """Initialize the alarm control."""
-            super().__init__(supported_features, code_format, code_arm_required)
-
-        def alarm_disarm(self, code: str | None = None) -> None:
-            """Mock alarm disarm calls."""
-            self._attr_state = "disarmed"
-
-    entity = MockLegacyAlarmControlPanel(
-        supported_features=supported_features,
-        code_format=code_format,
-        code_arm_required=code_arm_required,
-    )
-
-    async def async_setup_entry_platform(
-        hass: HomeAssistant,
-        config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
-    ) -> None:
-        """Set up test alarm control panel platform via config entry."""
-        async_add_entities([entity])
-
-    mock_platform(
-        hass,
-        f"{TEST_DOMAIN}.{ALARM_CONTROL_PANEL_DOMAIN}",
-        MockPlatform(async_setup_entry=async_setup_entry_platform),
-    )
-
-    with patch.object(
-        MockLegacyAlarmControlPanel,
-        "__module__",
-        "tests.custom_components.test.alarm_control_panel",
-    ):
-        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(entity.entity_id)
-    assert state is not None
-
-    assert "Entities should implement the 'alarm_state' property and" not in caplog.text
-
-    with patch.object(
-        MockLegacyAlarmControlPanel,
-        "__module__",
-        "tests.custom_components.test.alarm_control_panel",
-    ):
-        await help_test_async_alarm_control_panel_service(
-            hass, entity.entity_id, SERVICE_ALARM_DISARM
-        )
-
-    assert "Entities should implement the 'alarm_state' property and" in caplog.text
-    caplog.clear()
-    with patch.object(
-        MockLegacyAlarmControlPanel,
-        "__module__",
-        "tests.custom_components.test.alarm_control_panel",
-    ):
-        await help_test_async_alarm_control_panel_service(
-            hass, entity.entity_id, SERVICE_ALARM_DISARM
-        )
-    # Test we only log once
-    assert "Entities should implement the 'alarm_state' property and" not in caplog.text
-
-
-async def test_alarm_control_panel_deprecated_state_does_not_break_state(
-    hass: HomeAssistant,
-    code_format: CodeFormat | None,
-    supported_features: AlarmControlPanelEntityFeature,
-    code_arm_required: bool,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test using _attr_state attribute does not break state."""
-
-    async def async_setup_entry_init(
-        hass: HomeAssistant, config_entry: ConfigEntry
-    ) -> bool:
-        """Set up test config entry."""
-        await hass.config_entries.async_forward_entry_setups(
-            config_entry, [ALARM_CONTROL_PANEL_DOMAIN]
-        )
-        return True
-
-    mock_integration(
-        hass,
-        MockModule(
-            TEST_DOMAIN,
-            async_setup_entry=async_setup_entry_init,
-        ),
-    )
-
-    class MockLegacyAlarmControlPanel(MockAlarmControlPanel):
-        """Mocked alarm control entity."""
-
-        def __init__(
-            self,
-            supported_features: AlarmControlPanelEntityFeature = AlarmControlPanelEntityFeature(
-                0
-            ),
-            code_format: CodeFormat | None = None,
-            code_arm_required: bool = True,
-        ) -> None:
-            """Initialize the alarm control."""
-            self._attr_state = "armed_away"
-            super().__init__(supported_features, code_format, code_arm_required)
-
-        def alarm_disarm(self, code: str | None = None) -> None:
-            """Mock alarm disarm calls."""
-            self._attr_state = "disarmed"
-
-    entity = MockLegacyAlarmControlPanel(
-        supported_features=supported_features,
-        code_format=code_format,
-        code_arm_required=code_arm_required,
-    )
-
-    async def async_setup_entry_platform(
-        hass: HomeAssistant,
-        config_entry: ConfigEntry,
-        async_add_entities: AddEntitiesCallback,
-    ) -> None:
-        """Set up test alarm control panel platform via config entry."""
-        async_add_entities([entity])
-
-    mock_platform(
-        hass,
-        f"{TEST_DOMAIN}.{ALARM_CONTROL_PANEL_DOMAIN}",
-        MockPlatform(async_setup_entry=async_setup_entry_platform),
-    )
-
-    with patch.object(
-        MockLegacyAlarmControlPanel,
-        "__module__",
-        "tests.custom_components.test.alarm_control_panel",
-    ):
-        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(entity.entity_id)
-    assert state is not None
-    assert state.state == "armed_away"
-
-    with patch.object(
-        MockLegacyAlarmControlPanel,
-        "__module__",
-        "tests.custom_components.test.alarm_control_panel",
-    ):
-        await help_test_async_alarm_control_panel_service(
-            hass, entity.entity_id, SERVICE_ALARM_DISARM
-        )
-
-    state = hass.states.get(entity.entity_id)
-    assert state is not None
-    assert state.state == "disarmed"
diff --git a/tests/components/alarm_control_panel/test_reproduce_state.py b/tests/components/alarm_control_panel/test_reproduce_state.py
index fcb4fdee36e..c7984b0793e 100644
--- a/tests/components/alarm_control_panel/test_reproduce_state.py
+++ b/tests/components/alarm_control_panel/test_reproduce_state.py
@@ -2,7 +2,6 @@
 
 import pytest
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.const import (
     SERVICE_ALARM_ARM_AWAY,
     SERVICE_ALARM_ARM_CUSTOM_BYPASS,
@@ -11,6 +10,13 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_VACATION,
     SERVICE_ALARM_DISARM,
     SERVICE_ALARM_TRIGGER,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.state import async_reproduce_state
@@ -23,37 +29,27 @@ async def test_reproducing_states(
 ) -> None:
     """Test reproducing Alarm control panel states."""
     hass.states.async_set(
-        "alarm_control_panel.entity_armed_away",
-        AlarmControlPanelState.ARMED_AWAY,
-        {},
+        "alarm_control_panel.entity_armed_away", STATE_ALARM_ARMED_AWAY, {}
     )
     hass.states.async_set(
         "alarm_control_panel.entity_armed_custom_bypass",
-        AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
+        STATE_ALARM_ARMED_CUSTOM_BYPASS,
         {},
     )
     hass.states.async_set(
-        "alarm_control_panel.entity_armed_home",
-        AlarmControlPanelState.ARMED_HOME,
-        {},
+        "alarm_control_panel.entity_armed_home", STATE_ALARM_ARMED_HOME, {}
     )
     hass.states.async_set(
-        "alarm_control_panel.entity_armed_night",
-        AlarmControlPanelState.ARMED_NIGHT,
-        {},
+        "alarm_control_panel.entity_armed_night", STATE_ALARM_ARMED_NIGHT, {}
     )
     hass.states.async_set(
-        "alarm_control_panel.entity_armed_vacation",
-        AlarmControlPanelState.ARMED_VACATION,
-        {},
+        "alarm_control_panel.entity_armed_vacation", STATE_ALARM_ARMED_VACATION, {}
     )
     hass.states.async_set(
-        "alarm_control_panel.entity_disarmed", AlarmControlPanelState.DISARMED, {}
+        "alarm_control_panel.entity_disarmed", STATE_ALARM_DISARMED, {}
     )
     hass.states.async_set(
-        "alarm_control_panel.entity_triggered",
-        AlarmControlPanelState.TRIGGERED,
-        {},
+        "alarm_control_panel.entity_triggered", STATE_ALARM_TRIGGERED, {}
     )
 
     arm_away_calls = async_mock_service(
@@ -80,34 +76,18 @@ async def test_reproducing_states(
     await async_reproduce_state(
         hass,
         [
-            State(
-                "alarm_control_panel.entity_armed_away",
-                AlarmControlPanelState.ARMED_AWAY,
-            ),
+            State("alarm_control_panel.entity_armed_away", STATE_ALARM_ARMED_AWAY),
             State(
                 "alarm_control_panel.entity_armed_custom_bypass",
-                AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
+                STATE_ALARM_ARMED_CUSTOM_BYPASS,
             ),
+            State("alarm_control_panel.entity_armed_home", STATE_ALARM_ARMED_HOME),
+            State("alarm_control_panel.entity_armed_night", STATE_ALARM_ARMED_NIGHT),
             State(
-                "alarm_control_panel.entity_armed_home",
-                AlarmControlPanelState.ARMED_HOME,
-            ),
-            State(
-                "alarm_control_panel.entity_armed_night",
-                AlarmControlPanelState.ARMED_NIGHT,
-            ),
-            State(
-                "alarm_control_panel.entity_armed_vacation",
-                AlarmControlPanelState.ARMED_VACATION,
-            ),
-            State(
-                "alarm_control_panel.entity_disarmed",
-                AlarmControlPanelState.DISARMED,
-            ),
-            State(
-                "alarm_control_panel.entity_triggered",
-                AlarmControlPanelState.TRIGGERED,
+                "alarm_control_panel.entity_armed_vacation", STATE_ALARM_ARMED_VACATION
             ),
+            State("alarm_control_panel.entity_disarmed", STATE_ALARM_DISARMED),
+            State("alarm_control_panel.entity_triggered", STATE_ALARM_TRIGGERED),
         ],
     )
 
@@ -137,34 +117,17 @@ async def test_reproducing_states(
     await async_reproduce_state(
         hass,
         [
+            State("alarm_control_panel.entity_armed_away", STATE_ALARM_TRIGGERED),
             State(
-                "alarm_control_panel.entity_armed_away",
-                AlarmControlPanelState.TRIGGERED,
+                "alarm_control_panel.entity_armed_custom_bypass", STATE_ALARM_ARMED_AWAY
             ),
             State(
-                "alarm_control_panel.entity_armed_custom_bypass",
-                AlarmControlPanelState.ARMED_AWAY,
-            ),
-            State(
-                "alarm_control_panel.entity_armed_home",
-                AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-            ),
-            State(
-                "alarm_control_panel.entity_armed_night",
-                AlarmControlPanelState.ARMED_HOME,
-            ),
-            State(
-                "alarm_control_panel.entity_armed_vacation",
-                AlarmControlPanelState.ARMED_NIGHT,
-            ),
-            State(
-                "alarm_control_panel.entity_disarmed",
-                AlarmControlPanelState.ARMED_VACATION,
-            ),
-            State(
-                "alarm_control_panel.entity_triggered",
-                AlarmControlPanelState.DISARMED,
+                "alarm_control_panel.entity_armed_home", STATE_ALARM_ARMED_CUSTOM_BYPASS
             ),
+            State("alarm_control_panel.entity_armed_night", STATE_ALARM_ARMED_HOME),
+            State("alarm_control_panel.entity_armed_vacation", STATE_ALARM_ARMED_NIGHT),
+            State("alarm_control_panel.entity_disarmed", STATE_ALARM_ARMED_VACATION),
+            State("alarm_control_panel.entity_triggered", STATE_ALARM_DISARMED),
             # Should not raise
             State("alarm_control_panel.non_existing", "on"),
         ],
diff --git a/tests/components/alexa/test_capabilities.py b/tests/components/alexa/test_capabilities.py
index a41c2f47b2d..5acdbdb271a 100644
--- a/tests/components/alexa/test_capabilities.py
+++ b/tests/components/alexa/test_capabilities.py
@@ -5,7 +5,6 @@ from unittest.mock import patch
 
 import pytest
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.components.alexa import smart_home
 from homeassistant.components.climate import (
     ATTR_CURRENT_TEMPERATURE,
@@ -24,6 +23,11 @@ from homeassistant.components.water_heater import (
 )
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
     STATE_OFF,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
@@ -1347,23 +1351,15 @@ async def test_temperature_sensor_water_heater(hass: HomeAssistant) -> None:
 
 async def test_report_alarm_control_panel_state(hass: HomeAssistant) -> None:
     """Test SecurityPanelController implements armState property."""
+    hass.states.async_set("alarm_control_panel.armed_away", STATE_ALARM_ARMED_AWAY, {})
     hass.states.async_set(
-        "alarm_control_panel.armed_away", AlarmControlPanelState.ARMED_AWAY, {}
+        "alarm_control_panel.armed_custom_bypass", STATE_ALARM_ARMED_CUSTOM_BYPASS, {}
     )
+    hass.states.async_set("alarm_control_panel.armed_home", STATE_ALARM_ARMED_HOME, {})
     hass.states.async_set(
-        "alarm_control_panel.armed_custom_bypass",
-        AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        {},
-    )
-    hass.states.async_set(
-        "alarm_control_panel.armed_home", AlarmControlPanelState.ARMED_HOME, {}
-    )
-    hass.states.async_set(
-        "alarm_control_panel.armed_night", AlarmControlPanelState.ARMED_NIGHT, {}
-    )
-    hass.states.async_set(
-        "alarm_control_panel.disarmed", AlarmControlPanelState.DISARMED, {}
+        "alarm_control_panel.armed_night", STATE_ALARM_ARMED_NIGHT, {}
     )
+    hass.states.async_set("alarm_control_panel.disarmed", STATE_ALARM_DISARMED, {})
 
     properties = await reported_properties(hass, "alarm_control_panel.armed_away")
     properties.assert_equal("Alexa.SecurityPanelController", "armState", "ARMED_AWAY")
diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py
index 68010a6a711..6ccf265dcdc 100644
--- a/tests/components/alexa/test_smart_home.py
+++ b/tests/components/alexa/test_smart_home.py
@@ -12,6 +12,7 @@ from homeassistant.components.cover import CoverDeviceClass, CoverEntityFeature
 from homeassistant.components.media_player import MediaPlayerEntityFeature
 from homeassistant.components.vacuum import VacuumEntityFeature
 from homeassistant.components.valve import SERVICE_STOP_VALVE, ValveEntityFeature
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     SERVICE_CLOSE_VALVE,
     SERVICE_OPEN_VALVE,
@@ -19,7 +20,6 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import Context, Event, HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import entityfilter
 from homeassistant.setup import async_setup_component
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
@@ -3999,108 +3999,6 @@ async def test_alarm_control_panel_code_arm_required(hass: HomeAssistant) -> Non
     await discovery_test(device, hass, expected_endpoints=0)
 
 
-async def test_alarm_control_panel_disarm_required(hass: HomeAssistant) -> None:
-    """Test alarm_control_panel disarm required."""
-    device = (
-        "alarm_control_panel.test_4",
-        "armed_away",
-        {
-            "friendly_name": "Test Alarm Control Panel 4",
-            "code_arm_required": False,
-            "code_format": "FORMAT_NUMBER",
-            "code": "1234",
-            "supported_features": 3,
-        },
-    )
-    appliance = await discovery_test(device, hass)
-
-    assert appliance["endpointId"] == "alarm_control_panel#test_4"
-    assert appliance["displayCategories"][0] == "SECURITY_PANEL"
-    assert appliance["friendlyName"] == "Test Alarm Control Panel 4"
-    assert_endpoint_capabilities(
-        appliance, "Alexa.SecurityPanelController", "Alexa.EndpointHealth", "Alexa"
-    )
-
-    properties = await reported_properties(hass, "alarm_control_panel#test_4")
-    properties.assert_equal("Alexa.SecurityPanelController", "armState", "ARMED_AWAY")
-
-    msg = await assert_request_fails(
-        "Alexa.SecurityPanelController",
-        "Arm",
-        "alarm_control_panel#test_4",
-        "alarm_control_panel.alarm_arm_home",
-        hass,
-        payload={"armState": "ARMED_STAY"},
-    )
-    assert msg["event"]["payload"]["type"] == "AUTHORIZATION_REQUIRED"
-    assert (
-        msg["event"]["payload"]["message"]
-        == "You must disarm the system before you can set the requested arm state."
-    )
-
-    _, msg = await assert_request_calls_service(
-        "Alexa.SecurityPanelController",
-        "Arm",
-        "alarm_control_panel#test_4",
-        "alarm_control_panel.alarm_arm_away",
-        hass,
-        response_type="Arm.Response",
-        payload={"armState": "ARMED_AWAY"},
-    )
-    properties = ReportedProperties(msg["context"]["properties"])
-    properties.assert_equal("Alexa.SecurityPanelController", "armState", "ARMED_AWAY")
-
-
-async def test_alarm_control_panel_change_arm_type(hass: HomeAssistant) -> None:
-    """Test alarm_control_panel change arm type."""
-    device = (
-        "alarm_control_panel.test_5",
-        "armed_home",
-        {
-            "friendly_name": "Test Alarm Control Panel 5",
-            "code_arm_required": False,
-            "code_format": "FORMAT_NUMBER",
-            "code": "1234",
-            "supported_features": 3,
-        },
-    )
-    appliance = await discovery_test(device, hass)
-
-    assert appliance["endpointId"] == "alarm_control_panel#test_5"
-    assert appliance["displayCategories"][0] == "SECURITY_PANEL"
-    assert appliance["friendlyName"] == "Test Alarm Control Panel 5"
-    assert_endpoint_capabilities(
-        appliance, "Alexa.SecurityPanelController", "Alexa.EndpointHealth", "Alexa"
-    )
-
-    properties = await reported_properties(hass, "alarm_control_panel#test_5")
-    properties.assert_equal("Alexa.SecurityPanelController", "armState", "ARMED_STAY")
-
-    _, msg = await assert_request_calls_service(
-        "Alexa.SecurityPanelController",
-        "Arm",
-        "alarm_control_panel#test_5",
-        "alarm_control_panel.alarm_arm_home",
-        hass,
-        response_type="Arm.Response",
-        payload={"armState": "ARMED_STAY"},
-    )
-    properties = ReportedProperties(msg["context"]["properties"])
-    properties.assert_equal("Alexa.SecurityPanelController", "armState", "ARMED_STAY")
-
-    _, msg = await assert_request_calls_service(
-        "Alexa.SecurityPanelController",
-        "Arm",
-        "alarm_control_panel#test_5",
-        "alarm_control_panel.alarm_arm_away",
-        hass,
-        response_type="Arm.Response",
-        payload={"armState": "ARMED_AWAY"},
-    )
-    properties = ReportedProperties(msg["context"]["properties"])
-    properties.assert_equal("Alexa.SecurityPanelController", "armState", "ARMED_AWAY")
-
-
 async def test_range_unsupported_domain(hass: HomeAssistant) -> None:
     """Test rangeController with unsupported domain."""
     device = ("switch.test", "on", {"friendly_name": "Test switch"})
diff --git a/tests/components/analytics/test_analytics.py b/tests/components/analytics/test_analytics.py
index ba7e46bdde7..5542aab4b30 100644
--- a/tests/components/analytics/test_analytics.py
+++ b/tests/components/analytics/test_analytics.py
@@ -76,7 +76,7 @@ async def test_no_send(
     """Test send when no preferences are defined."""
     analytics = Analytics(hass)
     with patch(
-        "homeassistant.components.analytics.analytics.is_hassio",
+        "homeassistant.components.hassio.is_hassio",
         side_effect=Mock(return_value=False),
     ):
         assert not analytics.preferences[ATTR_BASE]
@@ -97,7 +97,7 @@ async def test_load_with_supervisor_diagnostics(hass: HomeAssistant) -> None:
             side_effect=Mock(return_value={"diagnostics": True}),
         ),
         patch(
-            "homeassistant.components.analytics.analytics.is_hassio",
+            "homeassistant.components.hassio.is_hassio",
             side_effect=Mock(return_value=True),
         ),
     ):
@@ -118,7 +118,7 @@ async def test_load_with_supervisor_without_diagnostics(hass: HomeAssistant) ->
             side_effect=Mock(return_value={"diagnostics": False}),
         ),
         patch(
-            "homeassistant.components.analytics.analytics.is_hassio",
+            "homeassistant.components.hassio.is_hassio",
             side_effect=Mock(return_value=True),
         ),
     ):
@@ -219,12 +219,8 @@ async def test_send_base_with_supervisor(
             side_effect=Mock(return_value={}),
         ),
         patch(
-            "homeassistant.components.analytics.analytics.is_hassio",
+            "homeassistant.components.hassio.is_hassio",
             side_effect=Mock(return_value=True),
-        ) as is_hassio_mock,
-        patch(
-            "homeassistant.helpers.system_info.is_hassio",
-            new=is_hassio_mock,
         ),
     ):
         await analytics.load()
@@ -318,12 +314,8 @@ async def test_send_usage_with_supervisor(
             side_effect=Mock(return_value={}),
         ),
         patch(
-            "homeassistant.components.analytics.analytics.is_hassio",
+            "homeassistant.components.hassio.is_hassio",
             side_effect=Mock(return_value=True),
-        ) as is_hassio_mock,
-        patch(
-            "homeassistant.helpers.system_info.is_hassio",
-            new=is_hassio_mock,
         ),
     ):
         await analytics.send_analytics()
@@ -537,12 +529,8 @@ async def test_send_statistics_with_supervisor(
             side_effect=Mock(return_value={}),
         ),
         patch(
-            "homeassistant.components.analytics.analytics.is_hassio",
+            "homeassistant.components.hassio.is_hassio",
             side_effect=Mock(return_value=True),
-        ) as is_hassio_mock,
-        patch(
-            "homeassistant.helpers.system_info.is_hassio",
-            new=is_hassio_mock,
         ),
     ):
         await analytics.send_analytics()
diff --git a/tests/components/analytics_insights/conftest.py b/tests/components/analytics_insights/conftest.py
index a9c152b8ab9..fcdda95e9bd 100644
--- a/tests/components/analytics_insights/conftest.py
+++ b/tests/components/analytics_insights/conftest.py
@@ -5,10 +5,9 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 from python_homeassistant_analytics import CurrentAnalytics
-from python_homeassistant_analytics.models import Addon, CustomIntegration, Integration
+from python_homeassistant_analytics.models import CustomIntegration, Integration
 
 from homeassistant.components.analytics_insights.const import (
-    CONF_TRACKED_ADDONS,
     CONF_TRACKED_CUSTOM_INTEGRATIONS,
     CONF_TRACKED_INTEGRATIONS,
     DOMAIN,
@@ -44,10 +43,6 @@ def mock_analytics_client() -> Generator[AsyncMock]:
         client.get_current_analytics.return_value = CurrentAnalytics.from_json(
             load_fixture("analytics_insights/current_data.json")
         )
-        addons = load_json_object_fixture("analytics_insights/addons.json")
-        client.get_addons.return_value = {
-            key: Addon.from_dict(value) for key, value in addons.items()
-        }
         integrations = load_json_object_fixture("analytics_insights/integrations.json")
         client.get_integrations.return_value = {
             key: Integration.from_dict(value) for key, value in integrations.items()
@@ -70,7 +65,6 @@ def mock_config_entry() -> MockConfigEntry:
         title="Homeassistant Analytics",
         data={},
         options={
-            CONF_TRACKED_ADDONS: ["core_samba"],
             CONF_TRACKED_INTEGRATIONS: ["youtube", "spotify", "myq"],
             CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
         },
diff --git a/tests/components/analytics_insights/fixtures/addons.json b/tests/components/analytics_insights/fixtures/addons.json
deleted file mode 100644
index cb7ae42c86b..00000000000
--- a/tests/components/analytics_insights/fixtures/addons.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "core_samba": {
-    "total": 76357,
-    "versions": {
-      "12.3.2": 65875,
-      "12.2.0": 1313,
-      "12.3.1": 5018,
-      "12.1.0": 211,
-      "10.0.0": 1139,
-      "9.4.0": 4,
-      "12.3.0": 704,
-      "9.3.1": 36,
-      "10.0.2": 1290,
-      "9.5.1": 379,
-      "9.6.1": 66,
-      "10.0.1": 200,
-      "9.3.0": 20,
-      "9.2.0": 9,
-      "9.5.0": 13,
-      "12.0.0": 39,
-      "9.7.0": 20,
-      "11.0.0": 13,
-      "3.0": 1,
-      "9.6.0": 2,
-      "8.1": 2,
-      "9.0": 3
-    },
-    "protected": 76345,
-    "auto_update": 32732
-  }
-}
diff --git a/tests/components/analytics_insights/snapshots/test_sensor.ambr b/tests/components/analytics_insights/snapshots/test_sensor.ambr
index 6e11b344b0b..971ca6db86f 100644
--- a/tests/components/analytics_insights/snapshots/test_sensor.ambr
+++ b/tests/components/analytics_insights/snapshots/test_sensor.ambr
@@ -1,54 +1,4 @@
 # serializer version: 1
-# name: test_all_entities[sensor.homeassistant_analytics_core_samba-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.homeassistant_analytics_core_samba',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'core_samba',
-    'platform': 'analytics_insights',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'addons',
-    'unique_id': 'addon_core_samba_active_installations',
-    'unit_of_measurement': 'active installations',
-  })
-# ---
-# name: test_all_entities[sensor.homeassistant_analytics_core_samba-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Homeassistant Analytics core_samba',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': 'active installations',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.homeassistant_analytics_core_samba',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '76357',
-  })
-# ---
 # name: test_all_entities[sensor.homeassistant_analytics_hacs_custom-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/analytics_insights/test_config_flow.py b/tests/components/analytics_insights/test_config_flow.py
index 747f24930a4..0c9d4c074f8 100644
--- a/tests/components/analytics_insights/test_config_flow.py
+++ b/tests/components/analytics_insights/test_config_flow.py
@@ -7,7 +7,6 @@ import pytest
 from python_homeassistant_analytics import HomeassistantAnalyticsConnectionError
 
 from homeassistant.components.analytics_insights.const import (
-    CONF_TRACKED_ADDONS,
     CONF_TRACKED_CUSTOM_INTEGRATIONS,
     CONF_TRACKED_INTEGRATIONS,
     DOMAIN,
@@ -26,12 +25,10 @@ from tests.common import MockConfigEntry
     [
         (
             {
-                CONF_TRACKED_ADDONS: ["core_samba"],
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
             {
-                CONF_TRACKED_ADDONS: ["core_samba"],
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
@@ -41,7 +38,6 @@ from tests.common import MockConfigEntry
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
             },
             {
-                CONF_TRACKED_ADDONS: [],
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: [],
             },
@@ -51,7 +47,6 @@ from tests.common import MockConfigEntry
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
             {
-                CONF_TRACKED_ADDONS: [],
                 CONF_TRACKED_INTEGRATIONS: [],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
@@ -88,7 +83,6 @@ async def test_form(
     "user_input",
     [
         {
-            CONF_TRACKED_ADDONS: [],
             CONF_TRACKED_INTEGRATIONS: [],
             CONF_TRACKED_CUSTOM_INTEGRATIONS: [],
         },
@@ -119,7 +113,6 @@ async def test_submitting_empty_form(
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         {
-            CONF_TRACKED_ADDONS: ["core_samba"],
             CONF_TRACKED_INTEGRATIONS: ["youtube"],
             CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
         },
@@ -130,7 +123,6 @@ async def test_submitting_empty_form(
     assert result["title"] == "Home Assistant Analytics Insights"
     assert result["data"] == {}
     assert result["options"] == {
-        CONF_TRACKED_ADDONS: ["core_samba"],
         CONF_TRACKED_INTEGRATIONS: ["youtube"],
         CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
     }
@@ -169,7 +161,6 @@ async def test_form_already_configured(
         domain=DOMAIN,
         data={},
         options={
-            CONF_TRACKED_ADDONS: [],
             CONF_TRACKED_INTEGRATIONS: ["youtube", "spotify"],
             CONF_TRACKED_CUSTOM_INTEGRATIONS: [],
         },
@@ -188,32 +179,19 @@ async def test_form_already_configured(
     [
         (
             {
-                CONF_TRACKED_ADDONS: ["core_samba"],
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
             {
-                CONF_TRACKED_ADDONS: ["core_samba"],
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
         ),
-        (
-            {
-                CONF_TRACKED_ADDONS: ["core_samba"],
-            },
-            {
-                CONF_TRACKED_ADDONS: ["core_samba"],
-                CONF_TRACKED_INTEGRATIONS: [],
-                CONF_TRACKED_CUSTOM_INTEGRATIONS: [],
-            },
-        ),
         (
             {
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
             },
             {
-                CONF_TRACKED_ADDONS: [],
                 CONF_TRACKED_INTEGRATIONS: ["youtube"],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: [],
             },
@@ -223,7 +201,6 @@ async def test_form_already_configured(
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
             {
-                CONF_TRACKED_ADDONS: [],
                 CONF_TRACKED_INTEGRATIONS: [],
                 CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
             },
@@ -260,7 +237,6 @@ async def test_options_flow(
     "user_input",
     [
         {
-            CONF_TRACKED_ADDONS: [],
             CONF_TRACKED_INTEGRATIONS: [],
             CONF_TRACKED_CUSTOM_INTEGRATIONS: [],
         },
@@ -291,7 +267,6 @@ async def test_submitting_empty_options_flow(
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
         {
-            CONF_TRACKED_ADDONS: ["core_samba"],
             CONF_TRACKED_INTEGRATIONS: ["youtube", "hue"],
             CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
         },
@@ -300,7 +275,6 @@ async def test_submitting_empty_options_flow(
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["data"] == {
-        CONF_TRACKED_ADDONS: ["core_samba"],
         CONF_TRACKED_INTEGRATIONS: ["youtube", "hue"],
         CONF_TRACKED_CUSTOM_INTEGRATIONS: ["hacs"],
     }
diff --git a/tests/components/androidtv/common.py b/tests/components/androidtv/common.py
index 133f6b1470b..23e048e4d52 100644
--- a/tests/components/androidtv/common.py
+++ b/tests/components/androidtv/common.py
@@ -100,12 +100,7 @@ CONFIG_FIRETV_DEFAULT = CONFIG_FIRETV_PYTHON_ADB
 
 
 def setup_mock_entry(
-    config: dict[str, Any],
-    entity_domain: str,
-    *,
-    options=None,
-    version=1,
-    minor_version=2,
+    config: dict[str, Any], entity_domain: str
 ) -> tuple[str, str, MockConfigEntry]:
     """Prepare mock entry for entities tests."""
     patch_key = config[ADB_PATCH_KEY]
@@ -114,9 +109,6 @@ def setup_mock_entry(
         domain=DOMAIN,
         data=config[DOMAIN],
         unique_id="a1:b1:c1:d1:e1:f1",
-        options=options,
-        version=version,
-        minor_version=minor_version,
     )
 
     return patch_key, entity_id, config_entry
diff --git a/tests/components/androidtv/test_config_flow.py b/tests/components/androidtv/test_config_flow.py
index cb1015e4198..b73fee9fb10 100644
--- a/tests/components/androidtv/test_config_flow.py
+++ b/tests/components/androidtv/test_config_flow.py
@@ -22,7 +22,7 @@ from homeassistant.components.androidtv.const import (
     CONF_APPS,
     CONF_EXCLUDE_UNNAMED_APPS,
     CONF_GET_SOURCES,
-    CONF_SCREENCAP_INTERVAL,
+    CONF_SCREENCAP,
     CONF_STATE_DETECTION_RULES,
     CONF_TURN_OFF_COMMAND,
     CONF_TURN_ON_COMMAND,
@@ -501,7 +501,7 @@ async def test_options_flow(hass: HomeAssistant) -> None:
             user_input={
                 CONF_GET_SOURCES: True,
                 CONF_EXCLUDE_UNNAMED_APPS: True,
-                CONF_SCREENCAP_INTERVAL: 1,
+                CONF_SCREENCAP: True,
                 CONF_TURN_OFF_COMMAND: "off",
                 CONF_TURN_ON_COMMAND: "on",
             },
@@ -515,6 +515,6 @@ async def test_options_flow(hass: HomeAssistant) -> None:
 
         assert config_entry.options[CONF_GET_SOURCES] is True
         assert config_entry.options[CONF_EXCLUDE_UNNAMED_APPS] is True
-        assert config_entry.options[CONF_SCREENCAP_INTERVAL] == 1
+        assert config_entry.options[CONF_SCREENCAP] is True
         assert config_entry.options[CONF_TURN_OFF_COMMAND] == "off"
         assert config_entry.options[CONF_TURN_ON_COMMAND] == "on"
diff --git a/tests/components/androidtv/test_init.py b/tests/components/androidtv/test_init.py
deleted file mode 100644
index 8ff7df1668b..00000000000
--- a/tests/components/androidtv/test_init.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""Tests for AndroidTV integration initialization."""
-
-from homeassistant.components.androidtv.const import (
-    CONF_SCREENCAP,
-    CONF_SCREENCAP_INTERVAL,
-)
-from homeassistant.components.media_player import DOMAIN as MP_DOMAIN
-from homeassistant.core import HomeAssistant
-
-from . import patchers
-from .common import CONFIG_ANDROID_DEFAULT, SHELL_RESPONSE_OFF, setup_mock_entry
-
-
-async def test_migrate_version(
-    hass: HomeAssistant,
-) -> None:
-    """Test migration to new version."""
-    patch_key, _, mock_config_entry = setup_mock_entry(
-        CONFIG_ANDROID_DEFAULT,
-        MP_DOMAIN,
-        options={CONF_SCREENCAP: False},
-        minor_version=1,
-    )
-    mock_config_entry.add_to_hass(hass)
-
-    with (
-        patchers.patch_connect(True)[patch_key],
-        patchers.patch_shell(SHELL_RESPONSE_OFF)[patch_key],
-    ):
-        assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert mock_config_entry.options[CONF_SCREENCAP_INTERVAL] == 0
-        assert mock_config_entry.minor_version == 2
diff --git a/tests/components/androidtv/test_media_player.py b/tests/components/androidtv/test_media_player.py
index 5a8d88dd9f6..ef0d0c63b06 100644
--- a/tests/components/androidtv/test_media_player.py
+++ b/tests/components/androidtv/test_media_player.py
@@ -13,7 +13,7 @@ import pytest
 from homeassistant.components.androidtv.const import (
     CONF_APPS,
     CONF_EXCLUDE_UNNAMED_APPS,
-    CONF_SCREENCAP_INTERVAL,
+    CONF_SCREENCAP,
     CONF_STATE_DETECTION_RULES,
     CONF_TURN_OFF_COMMAND,
     CONF_TURN_ON_COMMAND,
@@ -801,9 +801,6 @@ async def test_get_image_http(
     """
     patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
     config_entry.add_to_hass(hass)
-    hass.config_entries.async_update_entry(
-        config_entry, options={CONF_SCREENCAP_INTERVAL: 2}
-    )
 
     with (
         patchers.patch_connect(True)[patch_key],
@@ -831,27 +828,21 @@ async def test_get_image_http(
     content = await resp.read()
     assert content == b"image"
 
-    next_update = utcnow() + timedelta(minutes=1)
+    next_update = utcnow() + timedelta(seconds=30)
     with (
         patchers.patch_shell("11")[patch_key],
         patchers.PATCH_SCREENCAP as patch_screen_cap,
-        patch(
-            "homeassistant.components.androidtv.media_player.utcnow",
-            return_value=next_update,
-        ),
+        patch("homeassistant.util.utcnow", return_value=next_update),
     ):
         async_fire_time_changed(hass, next_update, True)
         await hass.async_block_till_done()
         patch_screen_cap.assert_not_called()
 
-    next_update = utcnow() + timedelta(minutes=2)
+    next_update = utcnow() + timedelta(seconds=60)
     with (
         patchers.patch_shell("11")[patch_key],
         patchers.PATCH_SCREENCAP as patch_screen_cap,
-        patch(
-            "homeassistant.components.androidtv.media_player.utcnow",
-            return_value=next_update,
-        ),
+        patch("homeassistant.util.utcnow", return_value=next_update),
     ):
         async_fire_time_changed(hass, next_update, True)
         await hass.async_block_till_done()
@@ -863,9 +854,6 @@ async def test_get_image_http_fail(hass: HomeAssistant) -> None:
 
     patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
     config_entry.add_to_hass(hass)
-    hass.config_entries.async_update_entry(
-        config_entry, options={CONF_SCREENCAP_INTERVAL: 2}
-    )
 
     with (
         patchers.patch_connect(True)[patch_key],
@@ -897,7 +885,7 @@ async def test_get_image_disabled(hass: HomeAssistant) -> None:
     patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
     config_entry.add_to_hass(hass)
     hass.config_entries.async_update_entry(
-        config_entry, options={CONF_SCREENCAP_INTERVAL: 0}
+        config_entry, options={CONF_SCREENCAP: False}
     )
 
     with (
@@ -1145,7 +1133,7 @@ async def test_options_reload(hass: HomeAssistant) -> None:
         with patchers.PATCH_SETUP_ENTRY as setup_entry_call:
             # change an option that not require integration reload
             hass.config_entries.async_update_entry(
-                config_entry, options={CONF_EXCLUDE_UNNAMED_APPS: True}
+                config_entry, options={CONF_SCREENCAP: False}
             )
             await hass.async_block_till_done()
 
diff --git a/tests/components/anova/__init__.py b/tests/components/anova/__init__.py
index 903a1180980..887f5b3b05b 100644
--- a/tests/components/anova/__init__.py
+++ b/tests/components/anova/__init__.py
@@ -36,7 +36,6 @@ def create_entry(hass: HomeAssistant, device_id: str = DEVICE_UNIQUE_ID) -> Conf
         },
         unique_id="sample@gmail.com",
         version=1,
-        minor_version=2,
     )
     entry.add_to_hass(hass)
     return entry
diff --git a/tests/components/anova/test_config_flow.py b/tests/components/anova/test_config_flow.py
index 3b2afaa49c0..0f93b869296 100644
--- a/tests/components/anova/test_config_flow.py
+++ b/tests/components/anova/test_config_flow.py
@@ -6,7 +6,7 @@ from anova_wifi import AnovaApi, InvalidLogin
 
 from homeassistant import config_entries
 from homeassistant.components.anova.const import DOMAIN
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_DEVICES, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -27,6 +27,7 @@ async def test_flow_user(hass: HomeAssistant, anova_api: AnovaApi) -> None:
     assert result["data"] == {
         CONF_USERNAME: "sample@gmail.com",
         CONF_PASSWORD: "sample",
+        CONF_DEVICES: [],
     }
 
 
diff --git a/tests/components/anova/test_init.py b/tests/components/anova/test_init.py
index 2e3e2920abc..66ea11fdaef 100644
--- a/tests/components/anova/test_init.py
+++ b/tests/components/anova/test_init.py
@@ -1,18 +1,13 @@
 """Test init for Anova."""
 
-from unittest.mock import patch
-
 from anova_wifi import AnovaApi
 
 from homeassistant.components.anova.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import CONF_DEVICES, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
 from . import async_init_integration, create_entry
 
-from tests.common import MockConfigEntry
-
 
 async def test_async_setup_entry(hass: HomeAssistant, anova_api: AnovaApi) -> None:
     """Test a successful setup entry."""
@@ -60,34 +55,3 @@ async def test_websocket_failure(
     """Test that we successfully handle a websocket failure on setup."""
     entry = await async_init_integration(hass)
     assert entry.state is ConfigEntryState.SETUP_RETRY
-
-
-async def test_migration_removing_devices_in_config_entry(
-    hass: HomeAssistant, anova_api: AnovaApi
-) -> None:
-    """Test a successful setup entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="Anova",
-        data={
-            CONF_USERNAME: "sample@gmail.com",
-            CONF_PASSWORD: "sample",
-            CONF_DEVICES: [],
-        },
-        unique_id="sample@gmail.com",
-        version=1,
-        minor_version=1,
-    )
-    entry.add_to_hass(hass)
-
-    with patch("homeassistant.components.anova.AnovaApi.authenticate"):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.anova_precision_cooker_mode")
-    assert state is not None
-    assert state.state == "idle"
-
-    assert entry.version == 1
-    assert entry.minor_version == 2
-    assert CONF_DEVICES not in entry.data
diff --git a/tests/components/apple_tv/test_config_flow.py b/tests/components/apple_tv/test_config_flow.py
index 4567bd32582..f37042a6f50 100644
--- a/tests/components/apple_tv/test_config_flow.py
+++ b/tests/components/apple_tv/test_config_flow.py
@@ -16,7 +16,6 @@ from homeassistant.components.apple_tv.const import (
     CONF_START_OFF,
     DOMAIN,
 )
-from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -1190,17 +1189,18 @@ async def test_reconfigure_update_credentials(hass: HomeAssistant) -> None:
     )
     config_entry.add_to_hass(hass)
 
-    result = await config_entry.start_reauth_flow(hass, data={"name": "apple tv"})
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": "reauth"},
+        data={"identifier": "mrpid", "name": "apple tv"},
+    )
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         {},
     )
     assert result2["type"] is FlowResultType.FORM
-    assert result2["description_placeholders"] == {
-        CONF_NAME: "Mock Title",
-        "protocol": "MRP",
-    }
+    assert result2["description_placeholders"] == {"protocol": "MRP"}
 
     result3 = await hass.config_entries.flow.async_configure(
         result["flow_id"], {"pin": 1111}
diff --git a/tests/components/assist_pipeline/snapshots/test_websocket.ambr b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
index b806c6faf23..131444c17ac 100644
--- a/tests/components/assist_pipeline/snapshots/test_websocket.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
@@ -697,7 +697,7 @@
         'speech': dict({
           'plain': dict({
             'extra_data': None,
-            'speech': 'Sorry, I am not aware of any area called Are',
+            'speech': 'Sorry, I am not aware of any area called are',
           }),
         }),
       }),
@@ -741,7 +741,7 @@
         'speech': dict({
           'plain': dict({
             'extra_data': None,
-            'speech': 'Sorry, I am not aware of any area called Are',
+            'speech': 'Sorry, I am not aware of any area called are',
           }),
         }),
       }),
diff --git a/tests/components/assist_pipeline/test_vad.py b/tests/components/assist_pipeline/test_vad.py
index bd07601cd5d..fda26d2fb94 100644
--- a/tests/components/assist_pipeline/test_vad.py
+++ b/tests/components/assist_pipeline/test_vad.py
@@ -16,7 +16,7 @@ def test_silence() -> None:
     segmenter = VoiceCommandSegmenter()
 
     # True return value indicates voice command has not finished
-    assert segmenter.process(_ONE_SECOND * 3, 0.0)
+    assert segmenter.process(_ONE_SECOND * 3, False)
     assert not segmenter.in_command
 
 
@@ -26,15 +26,15 @@ def test_speech() -> None:
     segmenter = VoiceCommandSegmenter()
 
     # silence
-    assert segmenter.process(_ONE_SECOND, 0.0)
+    assert segmenter.process(_ONE_SECOND, False)
 
     # "speech"
-    assert segmenter.process(_ONE_SECOND, 1.0)
+    assert segmenter.process(_ONE_SECOND, True)
     assert segmenter.in_command
 
     # silence
     # False return value indicates voice command is finished
-    assert not segmenter.process(_ONE_SECOND, 0.0)
+    assert not segmenter.process(_ONE_SECOND, False)
     assert not segmenter.in_command
 
 
@@ -112,19 +112,19 @@ def test_silence_seconds() -> None:
     segmenter = VoiceCommandSegmenter(silence_seconds=1.0)
 
     # silence
-    assert segmenter.process(_ONE_SECOND, 0.0)
+    assert segmenter.process(_ONE_SECOND, False)
     assert not segmenter.in_command
 
     # "speech"
-    assert segmenter.process(_ONE_SECOND, 1.0)
+    assert segmenter.process(_ONE_SECOND, True)
     assert segmenter.in_command
 
     # not enough silence to end
-    assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, False)
     assert segmenter.in_command
 
     # exactly enough silence now
-    assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert not segmenter.process(_ONE_SECOND * 0.5, False)
     assert not segmenter.in_command
 
 
@@ -134,27 +134,27 @@ def test_silence_reset() -> None:
     segmenter = VoiceCommandSegmenter(silence_seconds=1.0, reset_seconds=0.5)
 
     # silence
-    assert segmenter.process(_ONE_SECOND, 0.0)
+    assert segmenter.process(_ONE_SECOND, False)
     assert not segmenter.in_command
 
     # "speech"
-    assert segmenter.process(_ONE_SECOND, 1.0)
+    assert segmenter.process(_ONE_SECOND, True)
     assert segmenter.in_command
 
     # not enough silence to end
-    assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, False)
     assert segmenter.in_command
 
     # speech should reset silence detection
-    assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, True)
     assert segmenter.in_command
 
     # not enough silence to end
-    assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, False)
     assert segmenter.in_command
 
     # exactly enough silence now
-    assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert not segmenter.process(_ONE_SECOND * 0.5, False)
     assert not segmenter.in_command
 
 
@@ -166,23 +166,23 @@ def test_speech_reset() -> None:
     )
 
     # silence
-    assert segmenter.process(_ONE_SECOND, 0.0)
+    assert segmenter.process(_ONE_SECOND, False)
     assert not segmenter.in_command
 
     # not enough speech to start voice command
-    assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, True)
     assert not segmenter.in_command
 
     # silence should reset speech detection
-    assert segmenter.process(_ONE_SECOND, 0.0)
+    assert segmenter.process(_ONE_SECOND, False)
     assert not segmenter.in_command
 
     # not enough speech to start voice command
-    assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, True)
     assert not segmenter.in_command
 
     # exactly enough speech now
-    assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, True)
     assert segmenter.in_command
 
 
@@ -193,18 +193,18 @@ def test_timeout() -> None:
 
     # not enough to time out
     assert not segmenter.timed_out
-    assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, False)
     assert not segmenter.timed_out
 
     # enough to time out
-    assert not segmenter.process(_ONE_SECOND * 0.5, 1.0)
+    assert not segmenter.process(_ONE_SECOND * 0.5, True)
     assert segmenter.timed_out
 
     # flag resets with more audio
-    assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, True)
     assert not segmenter.timed_out
 
-    assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert not segmenter.process(_ONE_SECOND * 0.5, False)
     assert segmenter.timed_out
 
 
@@ -215,38 +215,14 @@ def test_command_seconds() -> None:
         command_seconds=3, speech_seconds=1, silence_seconds=1, reset_seconds=1
     )
 
-    assert segmenter.process(_ONE_SECOND, 1.0)
+    assert segmenter.process(_ONE_SECOND, True)
 
     # Silence counts towards total command length
-    assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert segmenter.process(_ONE_SECOND * 0.5, False)
 
     # Enough to finish command now
-    assert segmenter.process(_ONE_SECOND, 1.0)
-    assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+    assert segmenter.process(_ONE_SECOND, True)
+    assert segmenter.process(_ONE_SECOND * 0.5, False)
 
     # Silence to finish
-    assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
-
-
-def test_speech_thresholds() -> None:
-    """Test before/in command speech thresholds."""
-
-    segmenter = VoiceCommandSegmenter(
-        before_command_speech_threshold=0.2,
-        in_command_speech_threshold=0.5,
-        command_seconds=2,
-        speech_seconds=1,
-        silence_seconds=1,
-    )
-
-    # Not high enough probability to trigger command
-    assert segmenter.process(_ONE_SECOND, 0.1)
-    assert not segmenter.in_command
-
-    # Triggers command
-    assert segmenter.process(_ONE_SECOND, 0.3)
-    assert segmenter.in_command
-
-    # Now that same probability is considered silence.
-    # Finishes command.
-    assert not segmenter.process(_ONE_SECOND, 0.3)
+    assert not segmenter.process(_ONE_SECOND * 0.5, False)
diff --git a/tests/components/azure_devops/test_config_flow.py b/tests/components/azure_devops/test_config_flow.py
index 64c771a7adc..577067d5744 100644
--- a/tests/components/azure_devops/test_config_flow.py
+++ b/tests/components/azure_devops/test_config_flow.py
@@ -57,7 +57,6 @@ async def test_reauth_authorization_error(
     mock_devops_client: AsyncMock,
 ) -> None:
     """Test we show user form on Azure DevOps authorization error."""
-    mock_config_entry.add_to_hass(hass)
     mock_devops_client.authorize.return_value = False
     mock_devops_client.authorized = False
 
@@ -109,7 +108,6 @@ async def test_reauth_connection_error(
     mock_devops_client: AsyncMock,
 ) -> None:
     """Test we show user form on Azure DevOps connection error."""
-    mock_config_entry.add_to_hass(hass)
     mock_devops_client.authorize.side_effect = aiohttp.ClientError
     mock_devops_client.authorized = False
 
diff --git a/tests/components/backup/conftest.py b/tests/components/backup/conftest.py
deleted file mode 100644
index 631c774e63c..00000000000
--- a/tests/components/backup/conftest.py
+++ /dev/null
@@ -1,73 +0,0 @@
-"""Test fixtures for the Backup integration."""
-
-from __future__ import annotations
-
-from collections.abc import Generator
-from pathlib import Path
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-
-from homeassistant.core import HomeAssistant
-
-
-@pytest.fixture(name="mocked_json_bytes")
-def mocked_json_bytes_fixture() -> Generator[Mock]:
-    """Mock json_bytes."""
-    with patch(
-        "homeassistant.components.backup.manager.json_bytes",
-        return_value=b"{}",  # Empty JSON
-    ) as mocked_json_bytes:
-        yield mocked_json_bytes
-
-
-@pytest.fixture(name="mocked_tarfile")
-def mocked_tarfile_fixture() -> Generator[Mock]:
-    """Mock tarfile."""
-    with patch(
-        "homeassistant.components.backup.manager.SecureTarFile"
-    ) as mocked_tarfile:
-        yield mocked_tarfile
-
-
-@pytest.fixture(name="mock_backup_generation")
-def mock_backup_generation_fixture(
-    hass: HomeAssistant, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> Generator[None]:
-    """Mock backup generator."""
-
-    def _mock_iterdir(path: Path) -> list[Path]:
-        if not path.name.endswith("testing_config"):
-            return []
-        return [
-            Path("test.txt"),
-            Path(".DS_Store"),
-            Path(".storage"),
-        ]
-
-    with (
-        patch("pathlib.Path.iterdir", _mock_iterdir),
-        patch("pathlib.Path.stat", MagicMock(st_size=123)),
-        patch("pathlib.Path.is_file", lambda x: x.name != ".storage"),
-        patch(
-            "pathlib.Path.is_dir",
-            lambda x: x.name == ".storage",
-        ),
-        patch(
-            "pathlib.Path.exists",
-            lambda x: x != Path(hass.config.path("backups")),
-        ),
-        patch(
-            "pathlib.Path.is_symlink",
-            lambda _: False,
-        ),
-        patch(
-            "pathlib.Path.mkdir",
-            MagicMock(),
-        ),
-        patch(
-            "homeassistant.components.backup.manager.HAVERSION",
-            "2025.1.0",
-        ),
-    ):
-        yield
diff --git a/tests/components/backup/snapshots/test_websocket.ambr b/tests/components/backup/snapshots/test_websocket.ambr
index 42eb524e529..07e099561b1 100644
--- a/tests/components/backup/snapshots/test_websocket.ambr
+++ b/tests/components/backup/snapshots/test_websocket.ambr
@@ -210,23 +210,16 @@
   dict({
     'id': 1,
     'result': dict({
-      'slug': '27f5c632',
+      'date': '1970-01-01T00:00:00.000Z',
+      'name': 'Test',
+      'path': 'abc123.tar',
+      'size': 0.0,
+      'slug': 'abc123',
     }),
     'success': True,
     'type': 'result',
   })
 # ---
-# name: test_generate[without_hassio].1
-  dict({
-    'event': dict({
-      'done': True,
-      'stage': None,
-      'success': True,
-    }),
-    'id': 1,
-    'type': 'event',
-  })
-# ---
 # name: test_info[with_hassio]
   dict({
     'error': dict({
@@ -276,22 +269,3 @@
     'type': 'result',
   })
 # ---
-# name: test_restore[with_hassio]
-  dict({
-    'error': dict({
-      'code': 'unknown_command',
-      'message': 'Unknown command.',
-    }),
-    'id': 1,
-    'success': False,
-    'type': 'result',
-  })
-# ---
-# name: test_restore[without_hassio]
-  dict({
-    'id': 1,
-    'result': None,
-    'success': True,
-    'type': 'result',
-  })
-# ---
diff --git a/tests/components/backup/test_http.py b/tests/components/backup/test_http.py
index 76b1f76b55b..93ecb27bc97 100644
--- a/tests/components/backup/test_http.py
+++ b/tests/components/backup/test_http.py
@@ -1,11 +1,8 @@
 """Tests for the Backup integration."""
 
-import asyncio
-from io import StringIO
 from unittest.mock import patch
 
 from aiohttp import web
-import pytest
 
 from homeassistant.core import HomeAssistant
 
@@ -52,12 +49,12 @@ async def test_downloading_backup_not_found(
     assert resp.status == 404
 
 
-async def test_downloading_as_non_admin(
+async def test_non_admin(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_admin_user: MockUser,
 ) -> None:
-    """Test downloading a backup file when you are not an admin."""
+    """Test downloading a backup file that does not exist."""
     hass_admin_user.groups = []
     await setup_backup_integration(hass)
 
@@ -65,53 +62,3 @@ async def test_downloading_as_non_admin(
 
     resp = await client.get("/api/backup/download/abc123")
     assert resp.status == 401
-
-
-async def test_uploading_a_backup_file(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-) -> None:
-    """Test uploading a backup file."""
-    await setup_backup_integration(hass)
-
-    client = await hass_client()
-
-    with patch(
-        "homeassistant.components.backup.manager.BackupManager.async_receive_backup",
-    ) as async_receive_backup_mock:
-        resp = await client.post(
-            "/api/backup/upload",
-            data={"file": StringIO("test")},
-        )
-        assert resp.status == 201
-        assert async_receive_backup_mock.called
-
-
-@pytest.mark.parametrize(
-    ("error", "message"),
-    [
-        (OSError("Boom!"), "Can't write backup file Boom!"),
-        (asyncio.CancelledError("Boom!"), ""),
-    ],
-)
-async def test_error_handling_uploading_a_backup_file(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    error: Exception,
-    message: str,
-) -> None:
-    """Test error handling when uploading a backup file."""
-    await setup_backup_integration(hass)
-
-    client = await hass_client()
-
-    with patch(
-        "homeassistant.components.backup.manager.BackupManager.async_receive_backup",
-        side_effect=error,
-    ):
-        resp = await client.post(
-            "/api/backup/upload",
-            data={"file": StringIO("test")},
-        )
-        assert resp.status == 500
-        assert await resp.text() == message
diff --git a/tests/components/backup/test_manager.py b/tests/components/backup/test_manager.py
index 9d24964aedf..1bf801a0fcf 100644
--- a/tests/components/backup/test_manager.py
+++ b/tests/components/backup/test_manager.py
@@ -2,18 +2,13 @@
 
 from __future__ import annotations
 
-import asyncio
-from unittest.mock import AsyncMock, MagicMock, Mock, mock_open, patch
+from pathlib import Path
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
-import aiohttp
-from multidict import CIMultiDict, CIMultiDictProxy
 import pytest
 
 from homeassistant.components.backup import BackupManager
-from homeassistant.components.backup.manager import (
-    BackupPlatformProtocol,
-    BackupProgress,
-)
+from homeassistant.components.backup.manager import BackupPlatformProtocol
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
@@ -23,30 +18,59 @@ from .common import TEST_BACKUP
 from tests.common import MockPlatform, mock_platform
 
 
-async def _mock_backup_generation(
-    manager: BackupManager, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> None:
+async def _mock_backup_generation(manager: BackupManager):
     """Mock backup generator."""
 
-    progress: list[BackupProgress] = []
+    def _mock_iterdir(path: Path) -> list[Path]:
+        if not path.name.endswith("testing_config"):
+            return []
+        return [
+            Path("test.txt"),
+            Path(".DS_Store"),
+            Path(".storage"),
+        ]
 
-    def on_progress(_progress: BackupProgress) -> None:
-        """Mock progress callback."""
-        progress.append(_progress)
+    with (
+        patch(
+            "homeassistant.components.backup.manager.SecureTarFile"
+        ) as mocked_tarfile,
+        patch("pathlib.Path.iterdir", _mock_iterdir),
+        patch("pathlib.Path.stat", MagicMock(st_size=123)),
+        patch("pathlib.Path.is_file", lambda x: x.name != ".storage"),
+        patch(
+            "pathlib.Path.is_dir",
+            lambda x: x.name == ".storage",
+        ),
+        patch(
+            "pathlib.Path.exists",
+            lambda x: x != manager.backup_dir,
+        ),
+        patch(
+            "pathlib.Path.is_symlink",
+            lambda _: False,
+        ),
+        patch(
+            "pathlib.Path.mkdir",
+            MagicMock(),
+        ),
+        patch(
+            "homeassistant.components.backup.manager.json_bytes",
+            return_value=b"{}",  # Empty JSON
+        ) as mocked_json_bytes,
+        patch(
+            "homeassistant.components.backup.manager.HAVERSION",
+            "2025.1.0",
+        ),
+    ):
+        await manager.async_create_backup()
 
-    assert manager.backup_task is None
-    await manager.async_create_backup(on_progress=on_progress)
-    assert manager.backup_task is not None
-    assert progress == []
-
-    await manager.backup_task
-    assert progress == [BackupProgress(done=True, stage=None, success=True)]
-
-    assert mocked_json_bytes.call_count == 1
-    backup_json_dict = mocked_json_bytes.call_args[0][0]
-    assert isinstance(backup_json_dict, dict)
-    assert backup_json_dict["homeassistant"] == {"version": "2025.1.0"}
-    assert manager.backup_dir.as_posix() in str(mocked_tarfile.call_args_list[0][0][0])
+        assert mocked_json_bytes.call_count == 1
+        backup_json_dict = mocked_json_bytes.call_args[0][0]
+        assert isinstance(backup_json_dict, dict)
+        assert backup_json_dict["homeassistant"] == {"version": "2025.1.0"}
+        assert manager.backup_dir.as_posix() in str(
+            mocked_tarfile.call_args_list[0][0][0]
+        )
 
 
 async def _setup_mock_domain(
@@ -150,26 +174,21 @@ async def test_getting_backup_that_does_not_exist(
 
 async def test_async_create_backup_when_backing_up(hass: HomeAssistant) -> None:
     """Test generate backup."""
-    event = asyncio.Event()
     manager = BackupManager(hass)
-    manager.backup_task = hass.async_create_task(event.wait())
+    manager.backing_up = True
     with pytest.raises(HomeAssistantError, match="Backup already in progress"):
-        await manager.async_create_backup(on_progress=None)
-    event.set()
+        await manager.async_create_backup()
 
 
-@pytest.mark.usefixtures("mock_backup_generation")
 async def test_async_create_backup(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
-    mocked_json_bytes: Mock,
-    mocked_tarfile: Mock,
 ) -> None:
     """Test generate backup."""
     manager = BackupManager(hass)
     manager.loaded_backups = True
 
-    await _mock_backup_generation(manager, mocked_json_bytes, mocked_tarfile)
+    await _mock_backup_generation(manager)
 
     assert "Generated new backup with slug " in caplog.text
     assert "Creating backup directory" in caplog.text
@@ -226,9 +245,7 @@ async def test_not_loading_bad_platforms(
     )
 
 
-async def test_exception_plaform_pre(
-    hass: HomeAssistant, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> None:
+async def test_exception_plaform_pre(hass: HomeAssistant) -> None:
     """Test exception in pre step."""
     manager = BackupManager(hass)
     manager.loaded_backups = True
@@ -245,12 +262,10 @@ async def test_exception_plaform_pre(
     )
 
     with pytest.raises(HomeAssistantError):
-        await _mock_backup_generation(manager, mocked_json_bytes, mocked_tarfile)
+        await _mock_backup_generation(manager)
 
 
-async def test_exception_plaform_post(
-    hass: HomeAssistant, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> None:
+async def test_exception_plaform_post(hass: HomeAssistant) -> None:
     """Test exception in post step."""
     manager = BackupManager(hass)
     manager.loaded_backups = True
@@ -267,7 +282,7 @@ async def test_exception_plaform_post(
     )
 
     with pytest.raises(HomeAssistantError):
-        await _mock_backup_generation(manager, mocked_json_bytes, mocked_tarfile)
+        await _mock_backup_generation(manager)
 
 
 async def test_loading_platforms_when_running_async_pre_backup_actions(
@@ -318,65 +333,3 @@ async def test_loading_platforms_when_running_async_post_backup_actions(
     assert len(manager.platforms) == 1
 
     assert "Loaded 1 platforms" in caplog.text
-
-
-async def test_async_receive_backup(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test receiving a backup file."""
-    manager = BackupManager(hass)
-
-    size = 2 * 2**16
-    protocol = Mock(_reading_paused=False)
-    stream = aiohttp.StreamReader(protocol, 2**16)
-    stream.feed_data(b"0" * size + b"\r\n--:--")
-    stream.feed_eof()
-
-    open_mock = mock_open()
-
-    with patch("pathlib.Path.open", open_mock), patch("shutil.move") as mover_mock:
-        await manager.async_receive_backup(
-            contents=aiohttp.BodyPartReader(
-                b"--:",
-                CIMultiDictProxy(
-                    CIMultiDict(
-                        {
-                            aiohttp.hdrs.CONTENT_DISPOSITION: "attachment; filename=abc123.tar"
-                        }
-                    )
-                ),
-                stream,
-            )
-        )
-        assert open_mock.call_count == 1
-        assert mover_mock.call_count == 1
-        assert mover_mock.mock_calls[0].args[1].name == "abc123.tar"
-
-
-async def test_async_trigger_restore(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test trigger restore."""
-    manager = BackupManager(hass)
-    manager.loaded_backups = True
-    manager.backups = {TEST_BACKUP.slug: TEST_BACKUP}
-
-    with (
-        patch("pathlib.Path.exists", return_value=True),
-        patch("pathlib.Path.write_text") as mocked_write_text,
-        patch("homeassistant.core.ServiceRegistry.async_call") as mocked_service_call,
-    ):
-        await manager.async_restore_backup(TEST_BACKUP.slug)
-        assert mocked_write_text.call_args[0][0] == '{"path": "abc123.tar"}'
-        assert mocked_service_call.called
-
-
-async def test_async_trigger_restore_missing_backup(hass: HomeAssistant) -> None:
-    """Test trigger restore."""
-    manager = BackupManager(hass)
-    manager.loaded_backups = True
-
-    with pytest.raises(HomeAssistantError, match="Backup abc123 not found"):
-        await manager.async_restore_backup(TEST_BACKUP.slug)
diff --git a/tests/components/backup/test_websocket.py b/tests/components/backup/test_websocket.py
index 3e031f172ae..805182391da 100644
--- a/tests/components/backup/test_websocket.py
+++ b/tests/components/backup/test_websocket.py
@@ -2,7 +2,6 @@
 
 from unittest.mock import patch
 
-from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -115,34 +114,6 @@ async def test_remove(
         assert snapshot == await client.receive_json()
 
 
-@pytest.mark.parametrize(
-    ("with_hassio", "number_of_messages"),
-    [
-        pytest.param(True, 1, id="with_hassio"),
-        pytest.param(False, 2, id="without_hassio"),
-    ],
-)
-@pytest.mark.usefixtures("mock_backup_generation")
-async def test_generate(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    freezer: FrozenDateTimeFactory,
-    snapshot: SnapshotAssertion,
-    with_hassio: bool,
-    number_of_messages: int,
-) -> None:
-    """Test generating a backup."""
-    await setup_backup_integration(hass, with_hassio=with_hassio)
-
-    client = await hass_ws_client(hass)
-    freezer.move_to("2024-11-13 12:01:00+01:00")
-    await hass.async_block_till_done()
-
-    await client.send_json_auto_id({"type": "backup/generate"})
-    for _ in range(number_of_messages):
-        assert snapshot == await client.receive_json()
-
-
 @pytest.mark.parametrize(
     "with_hassio",
     [
@@ -150,23 +121,24 @@ async def test_generate(
         pytest.param(False, id="without_hassio"),
     ],
 )
-async def test_restore(
+async def test_generate(
     hass: HomeAssistant,
     hass_ws_client: WebSocketGenerator,
     snapshot: SnapshotAssertion,
     with_hassio: bool,
 ) -> None:
-    """Test calling the restore command."""
+    """Test generating a backup."""
     await setup_backup_integration(hass, with_hassio=with_hassio)
 
     client = await hass_ws_client(hass)
     await hass.async_block_till_done()
 
     with patch(
-        "homeassistant.components.backup.manager.BackupManager.async_restore_backup",
+        "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+        return_value=TEST_BACKUP,
     ):
-        await client.send_json_auto_id({"type": "backup/restore", "slug": "abc123"})
-        assert await client.receive_json() == snapshot
+        await client.send_json_auto_id({"type": "backup/generate"})
+        assert snapshot == await client.receive_json()
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/balboa/__init__.py b/tests/components/balboa/__init__.py
index 2cb100e3642..a27293e955f 100644
--- a/tests/components/balboa/__init__.py
+++ b/tests/components/balboa/__init__.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from unittest.mock import MagicMock
 
-from homeassistant.components.balboa.const import CONF_SYNC_TIME, DOMAIN
+from homeassistant.components.balboa import CONF_SYNC_TIME, DOMAIN
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant, State
 
diff --git a/tests/components/bang_olufsen/conftest.py b/tests/components/bang_olufsen/conftest.py
index cbde856ff89..e415dd50c72 100644
--- a/tests/components/bang_olufsen/conftest.py
+++ b/tests/components/bang_olufsen/conftest.py
@@ -15,7 +15,6 @@ from mozart_api.models import (
     PlaybackContentMetadata,
     PlaybackProgress,
     PlaybackState,
-    PlayQueueSettings,
     ProductState,
     RemoteMenuItem,
     RenderingState,
@@ -35,13 +34,13 @@ from .const import (
     TEST_DATA_CREATE_ENTRY,
     TEST_DATA_CREATE_ENTRY_2,
     TEST_FRIENDLY_NAME,
+    TEST_FRIENDLY_NAME_2,
     TEST_FRIENDLY_NAME_3,
-    TEST_FRIENDLY_NAME_4,
+    TEST_HOST_2,
     TEST_HOST_3,
-    TEST_HOST_4,
     TEST_JID_1,
+    TEST_JID_2,
     TEST_JID_3,
-    TEST_JID_4,
     TEST_NAME,
     TEST_NAME_2,
     TEST_SERIAL_NUMBER,
@@ -124,7 +123,7 @@ def mock_mozart_client() -> Generator[AsyncMock]:
         client.get_available_sources = AsyncMock()
         client.get_available_sources.return_value = SourceArray(
             items=[
-                # Is not playable, so should not be user selectable
+                # Is in the HIDDEN_SOURCE_IDS constant, so should not be user selectable
                 Source(
                     name="AirPlay",
                     id="airPlay",
@@ -137,16 +136,14 @@ def mock_mozart_client() -> Generator[AsyncMock]:
                     id="tidal",
                     is_enabled=True,
                     is_multiroom_available=True,
-                    is_playable=True,
                 ),
                 Source(
                     name="Line-In",
                     id="lineIn",
                     is_enabled=True,
                     is_multiroom_available=False,
-                    is_playable=True,
                 ),
-                # Is disabled and not playable, so should not be user selectable
+                # Is disabled, so should not be user selectable
                 Source(
                     name="Powerlink",
                     id="pl",
@@ -267,29 +264,29 @@ def mock_mozart_client() -> Generator[AsyncMock]:
         }
         client.get_beolink_peers = AsyncMock()
         client.get_beolink_peers.return_value = [
+            BeolinkPeer(
+                friendly_name=TEST_FRIENDLY_NAME_2,
+                jid=TEST_JID_2,
+                ip_address=TEST_HOST_2,
+            ),
             BeolinkPeer(
                 friendly_name=TEST_FRIENDLY_NAME_3,
                 jid=TEST_JID_3,
                 ip_address=TEST_HOST_3,
             ),
-            BeolinkPeer(
-                friendly_name=TEST_FRIENDLY_NAME_4,
-                jid=TEST_JID_4,
-                ip_address=TEST_HOST_4,
-            ),
         ]
         client.get_beolink_listeners = AsyncMock()
         client.get_beolink_listeners.return_value = [
+            BeolinkPeer(
+                friendly_name=TEST_FRIENDLY_NAME_2,
+                jid=TEST_JID_2,
+                ip_address=TEST_HOST_2,
+            ),
             BeolinkPeer(
                 friendly_name=TEST_FRIENDLY_NAME_3,
                 jid=TEST_JID_3,
                 ip_address=TEST_HOST_3,
             ),
-            BeolinkPeer(
-                friendly_name=TEST_FRIENDLY_NAME_4,
-                jid=TEST_JID_4,
-                ip_address=TEST_HOST_4,
-            ),
         ]
 
         client.get_listening_mode_set = AsyncMock()
@@ -318,12 +315,6 @@ def mock_mozart_client() -> Generator[AsyncMock]:
             href="",
             id=123,
         )
-        client.get_settings_queue = AsyncMock()
-        client.get_settings_queue.return_value = PlayQueueSettings(
-            repeat="none",
-            shuffle=False,
-        )
-
         client.post_standby = AsyncMock()
         client.set_current_volume_level = AsyncMock()
         client.set_volume_mute = AsyncMock()
@@ -345,7 +336,6 @@ def mock_mozart_client() -> Generator[AsyncMock]:
         client.post_beolink_allstandby = AsyncMock()
         client.join_latest_beolink_experience = AsyncMock()
         client.activate_listening_mode = AsyncMock()
-        client.set_settings_queue = AsyncMock()
 
         # Non-REST API client methods
         client.check_device_connection = AsyncMock()
diff --git a/tests/components/bang_olufsen/const.py b/tests/components/bang_olufsen/const.py
index 6602a898eb6..7f2e52cfc87 100644
--- a/tests/components/bang_olufsen/const.py
+++ b/tests/components/bang_olufsen/const.py
@@ -16,7 +16,6 @@ from mozart_api.models import (
     PlayQueueItemType,
     RenderingState,
     SceneProperties,
-    Source,
     UserFlow,
     VolumeLevel,
     VolumeMute,
@@ -126,15 +125,11 @@ TEST_DATA_ZEROCONF_IPV6 = ZeroconfServiceInfo(
     },
 )
 
-TEST_SOURCE = Source(
-    name="Tidal", id="tidal", is_seekable=True, is_enabled=True, is_playable=True
-)
-TEST_AUDIO_SOURCES = [TEST_SOURCE.name, BangOlufsenSource.LINE_IN.name]
+TEST_AUDIO_SOURCES = [BangOlufsenSource.TIDAL.name, BangOlufsenSource.LINE_IN.name]
 TEST_VIDEO_SOURCES = ["HDMI A"]
 TEST_SOURCES = TEST_AUDIO_SOURCES + TEST_VIDEO_SOURCES
 TEST_FALLBACK_SOURCES = [
     "Audio Streamer",
-    "Bluetooth",
     "Spotify Connect",
     "Line-In",
     "Optical",
diff --git a/tests/components/bang_olufsen/snapshots/test_media_player.ambr b/tests/components/bang_olufsen/snapshots/test_media_player.ambr
deleted file mode 100644
index ea96e286821..00000000000
--- a/tests/components/bang_olufsen/snapshots/test_media_player.ambr
+++ /dev/null
@@ -1,874 +0,0 @@
-# serializer version: 1
-# name: test_async_beolink_allstandby
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_beolink_expand[all_discovered-True-None-log_messages0-2]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Tidal',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095935>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_beolink_expand[all_discovered-True-expand_side_effect1-log_messages1-2]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Tidal',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095935>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_beolink_expand[beolink_jids-parameter_value2-None-log_messages2-1]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Tidal',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095935>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_beolink_expand[beolink_jids-parameter_value3-expand_side_effect3-log_messages3-1]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Tidal',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095935>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_beolink_join
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_beolink_unexpand
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players[group_members0-1-0]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Tidal',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095935>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players[group_members0-1-0].1
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_22222222',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_22222222',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players[group_members1-0-1]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Tidal',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095935>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players[group_members1-0-1].1
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_22222222',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_22222222',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players_invalid[source0-group_members0-expected_result0-invalid_source]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'media_position': 0,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Line-In',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players_invalid[source0-group_members0-expected_result0-invalid_source].1
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_22222222',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_22222222',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players_invalid[source1-group_members1-expected_result1-invalid_grouping_entity]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source': 'Tidal',
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095935>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_join_players_invalid[source1-group_members1-expected_result1-invalid_grouping_entity].1
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_22222222',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_22222222',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_unjoin_player
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_11111111',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'repeat': <RepeatMode.OFF: 'off'>,
-      'shuffle': False,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_update_beolink_listener
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'leader': dict({
-          'Laundry room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_22222222',
-        'media_player.beosound_balance_11111111',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_11111111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
-# name: test_async_update_beolink_listener.1
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'beolink': dict({
-        'listeners': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'peers': dict({
-          'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
-          'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
-        }),
-        'self': dict({
-          'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
-        }),
-      }),
-      'device_class': 'speaker',
-      'entity_picture_local': None,
-      'friendly_name': 'Living room Balance',
-      'group_members': list([
-        'media_player.beosound_balance_22222222',
-        'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
-        'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
-      ]),
-      'icon': 'mdi:speaker-wireless',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'sound_mode': 'Test Listening Mode (123)',
-      'sound_mode_list': list([
-        'Test Listening Mode (123)',
-        'Test Listening Mode (234)',
-        'Test Listening Mode 2 (345)',
-      ]),
-      'source_list': list([
-        'Tidal',
-        'Line-In',
-        'HDMI A',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 2095933>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.beosound_balance_22222222',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
diff --git a/tests/components/bang_olufsen/test_init.py b/tests/components/bang_olufsen/test_init.py
index c8e4c05f9ab..3eb98e956be 100644
--- a/tests/components/bang_olufsen/test_init.py
+++ b/tests/components/bang_olufsen/test_init.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceRegistry
 
-from .const import TEST_FRIENDLY_NAME, TEST_MODEL_BALANCE, TEST_SERIAL_NUMBER
+from .const import TEST_MODEL_BALANCE, TEST_NAME, TEST_SERIAL_NUMBER
 
 from tests.common import MockConfigEntry
 
@@ -35,8 +35,7 @@ async def test_setup_entry(
         identifiers={(DOMAIN, TEST_SERIAL_NUMBER)}
     )
     assert device is not None
-    # Is usually TEST_NAME, but is updated to the device's friendly name by _update_name_and_beolink
-    assert device.name == TEST_FRIENDLY_NAME
+    assert device.name == TEST_NAME
     assert device.model == TEST_MODEL_BALANCE
 
     # Ensure that the connection has been checked WebSocket connection has been initialized
@@ -86,7 +85,6 @@ async def test_unload_entry(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
 
     assert mock_config_entry.state == ConfigEntryState.LOADED
-    assert hasattr(mock_config_entry, "runtime_data")
 
     # Unload entry
     await hass.config_entries.async_unload(mock_config_entry.entry_id)
@@ -96,5 +94,5 @@ async def test_unload_entry(
     assert mock_mozart_client.close_api_client.call_count == 1
 
     # Ensure that the entry is not loaded and has been removed from hass
-    assert not hasattr(mock_config_entry, "runtime_data")
+    assert mock_config_entry.entry_id not in hass.data[DOMAIN]
     assert mock_config_entry.state == ConfigEntryState.NOT_LOADED
diff --git a/tests/components/bang_olufsen/test_media_player.py b/tests/components/bang_olufsen/test_media_player.py
index aa35b0265dc..ff42ae2a867 100644
--- a/tests/components/bang_olufsen/test_media_player.py
+++ b/tests/components/bang_olufsen/test_media_player.py
@@ -4,23 +4,16 @@ from contextlib import AbstractContextManager, nullcontext as does_not_raise
 import logging
 from unittest.mock import AsyncMock, patch
 
-from mozart_api.exceptions import NotFoundException
 from mozart_api.models import (
     BeolinkLeader,
-    BeolinkSelf,
     PlaybackContentMetadata,
-    PlayQueueSettings,
     RenderingState,
     Source,
-    SourceArray,
     WebsocketNotificationTag,
 )
 import pytest
-from syrupy.assertion import SnapshotAssertion
-from syrupy.filters import props
 
 from homeassistant.components.bang_olufsen.const import (
-    BANG_OLUFSEN_REPEAT_FROM_HA,
     BANG_OLUFSEN_STATES,
     DOMAIN,
     BangOlufsenSource,
@@ -39,9 +32,7 @@ from homeassistant.components.media_player import (
     ATTR_MEDIA_EXTRA,
     ATTR_MEDIA_POSITION,
     ATTR_MEDIA_POSITION_UPDATED_AT,
-    ATTR_MEDIA_REPEAT,
     ATTR_MEDIA_SEEK_POSITION,
-    ATTR_MEDIA_SHUFFLE,
     ATTR_MEDIA_TITLE,
     ATTR_MEDIA_TRACK,
     ATTR_MEDIA_VOLUME_LEVEL,
@@ -50,29 +41,23 @@ from homeassistant.components.media_player import (
     ATTR_SOUND_MODE_LIST,
     DOMAIN as MEDIA_PLAYER_DOMAIN,
     SERVICE_CLEAR_PLAYLIST,
-    SERVICE_JOIN,
     SERVICE_MEDIA_NEXT_TRACK,
     SERVICE_MEDIA_PLAY_PAUSE,
     SERVICE_MEDIA_PREVIOUS_TRACK,
     SERVICE_MEDIA_SEEK,
     SERVICE_MEDIA_STOP,
     SERVICE_PLAY_MEDIA,
-    SERVICE_REPEAT_SET,
     SERVICE_SELECT_SOUND_MODE,
     SERVICE_SELECT_SOURCE,
-    SERVICE_SHUFFLE_SET,
     SERVICE_TURN_OFF,
-    SERVICE_UNJOIN,
     SERVICE_VOLUME_MUTE,
     SERVICE_VOLUME_SET,
     MediaPlayerState,
     MediaType,
-    RepeatMode,
 )
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers.device_registry import DeviceRegistry
 from homeassistant.setup import async_setup_component
 
 from .const import (
@@ -85,10 +70,7 @@ from .const import (
     TEST_DEEZER_TRACK,
     TEST_FALLBACK_SOURCES,
     TEST_FRIENDLY_NAME_2,
-    TEST_JID_1,
     TEST_JID_2,
-    TEST_JID_3,
-    TEST_JID_4,
     TEST_LISTENING_MODE_REF,
     TEST_MEDIA_PLAYER_ENTITY_ID,
     TEST_MEDIA_PLAYER_ENTITY_ID_2,
@@ -105,7 +87,6 @@ from .const import (
     TEST_SEEK_POSITION_HOME_ASSISTANT_FORMAT,
     TEST_SOUND_MODE_2,
     TEST_SOUND_MODES,
-    TEST_SOURCE,
     TEST_SOURCES,
     TEST_VIDEO_SOURCES,
     TEST_VOLUME,
@@ -149,9 +130,6 @@ async def test_initialization(
     mock_mozart_client.get_remote_menu.assert_called_once()
     mock_mozart_client.get_listening_mode_set.assert_called_once()
     mock_mozart_client.get_active_listening_mode.assert_called_once()
-    mock_mozart_client.get_beolink_self.assert_called_once()
-    mock_mozart_client.get_beolink_peers.assert_called_once()
-    mock_mozart_client.get_beolink_listeners.assert_called_once()
 
 
 async def test_async_update_sources_audio_only(
@@ -212,37 +190,6 @@ async def test_async_update_sources_remote(
     assert mock_mozart_client.get_remote_menu.call_count == 2
 
 
-async def test_async_update_sources_availability(
-    hass: HomeAssistant,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test that the playback_source WebSocket event updates available playback sources."""
-    # Remove video sources to simplify test
-    mock_mozart_client.get_remote_menu.return_value = {}
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    playback_source_callback = (
-        mock_mozart_client.get_playback_source_notifications.call_args[0][0]
-    )
-
-    assert mock_mozart_client.get_available_sources.call_count == 1
-
-    # Add a source that is available and playable
-    mock_mozart_client.get_available_sources.return_value = SourceArray(
-        items=[TEST_SOURCE]
-    )
-
-    # Send playback_source. The source is not actually used, so its attributes don't matter
-    playback_source_callback(Source())
-
-    assert mock_mozart_client.get_available_sources.call_count == 2
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states.attributes[ATTR_INPUT_SOURCE_LIST] == [TEST_SOURCE.name]
-
-
 async def test_async_update_playback_metadata(
     hass: HomeAssistant,
     mock_mozart_client: AsyncMock,
@@ -358,17 +305,19 @@ async def test_async_update_playback_state(
 
 
 @pytest.mark.parametrize(
-    ("source", "content_type", "progress", "metadata"),
+    ("reported_source", "real_source", "content_type", "progress", "metadata"),
     [
-        # Normal source, music mediatype expected
+        # Normal source, music mediatype expected, no progress expected
         (
-            TEST_SOURCE,
+            BangOlufsenSource.TIDAL,
+            BangOlufsenSource.TIDAL,
             MediaType.MUSIC,
             TEST_PLAYBACK_PROGRESS.progress,
             PlaybackContentMetadata(),
         ),
-        # URI source, url media type expected
+        # URI source, url media type expected, no progress expected
         (
+            BangOlufsenSource.URI_STREAMER,
             BangOlufsenSource.URI_STREAMER,
             MediaType.URL,
             TEST_PLAYBACK_PROGRESS.progress,
@@ -377,17 +326,44 @@ async def test_async_update_playback_state(
         # Line-In source,media type expected, progress 0 expected
         (
             BangOlufsenSource.LINE_IN,
+            BangOlufsenSource.CHROMECAST,
             MediaType.MUSIC,
             0,
             PlaybackContentMetadata(),
         ),
+        # Chromecast as source, but metadata says Line-In.
+        # Progress is not set to 0 as the source is Chromecast first
+        (
+            BangOlufsenSource.CHROMECAST,
+            BangOlufsenSource.LINE_IN,
+            MediaType.MUSIC,
+            TEST_PLAYBACK_PROGRESS.progress,
+            PlaybackContentMetadata(title=BangOlufsenSource.LINE_IN.name),
+        ),
+        # Chromecast as source, but metadata says Bluetooth
+        (
+            BangOlufsenSource.CHROMECAST,
+            BangOlufsenSource.BLUETOOTH,
+            MediaType.MUSIC,
+            TEST_PLAYBACK_PROGRESS.progress,
+            PlaybackContentMetadata(title=BangOlufsenSource.BLUETOOTH.name),
+        ),
+        # Chromecast as source, but metadata says Bluetooth in another way
+        (
+            BangOlufsenSource.CHROMECAST,
+            BangOlufsenSource.BLUETOOTH,
+            MediaType.MUSIC,
+            TEST_PLAYBACK_PROGRESS.progress,
+            PlaybackContentMetadata(art=[]),
+        ),
     ],
 )
 async def test_async_update_source_change(
     hass: HomeAssistant,
     mock_mozart_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
-    source: Source,
+    reported_source: Source,
+    real_source: Source,
     content_type: MediaType,
     progress: int,
     metadata: PlaybackContentMetadata,
@@ -416,10 +392,10 @@ async def test_async_update_source_change(
 
     # Simulate metadata
     playback_metadata_callback(metadata)
-    source_change_callback(source)
+    source_change_callback(reported_source)
 
     assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states.attributes[ATTR_INPUT_SOURCE] == source.name
+    assert states.attributes[ATTR_INPUT_SOURCE] == real_source.name
     assert states.attributes[ATTR_MEDIA_CONTENT_TYPE] == content_type
     assert states.attributes[ATTR_MEDIA_POSITION] == progress
 
@@ -517,14 +493,11 @@ async def test_async_update_beolink_line_in(
     assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
     assert states.attributes["group_members"] == []
 
-    # Called once during _initialize and once during _async_update_beolink
-    assert mock_mozart_client.get_beolink_listeners.call_count == 2
-    assert mock_mozart_client.get_beolink_peers.call_count == 2
+    assert mock_mozart_client.get_beolink_listeners.call_count == 1
 
 
 async def test_async_update_beolink_listener(
     hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
     mock_mozart_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     mock_config_entry_2: MockConfigEntry,
@@ -557,56 +530,7 @@ async def test_async_update_beolink_listener(
         TEST_MEDIA_PLAYER_ENTITY_ID,
     ]
 
-    # Called once for each entity during _initialize
-    assert mock_mozart_client.get_beolink_listeners.call_count == 2
-    # Called once for each entity during _initialize and
-    # once more during _async_update_beolink for the entity that has the callback associated with it.
-    assert mock_mozart_client.get_beolink_peers.call_count == 3
-
-    # Main entity
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-    # Secondary entity
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID_2))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_update_name_and_beolink(
-    hass: HomeAssistant,
-    device_registry: DeviceRegistry,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test _async_update_name_and_beolink."""
-    # Change response to ensure device name is changed
-    mock_mozart_client.get_beolink_self.return_value = BeolinkSelf(
-        friendly_name=TEST_FRIENDLY_NAME_2, jid=TEST_JID_1
-    )
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    configuration_callback = (
-        mock_mozart_client.get_notification_notifications.call_args[0][0]
-    )
-    # Trigger callback
-    configuration_callback(WebsocketNotificationTag(value="configuration"))
-
-    await hass.async_block_till_done()
-
-    assert mock_mozart_client.get_beolink_self.call_count == 2
-    assert mock_mozart_client.get_beolink_peers.call_count == 2
-    assert mock_mozart_client.get_beolink_listeners.call_count == 2
-
-    # Check that device name has been changed
-    assert mock_config_entry.unique_id
-    assert (
-        device := device_registry.async_get_device(
-            identifiers={(DOMAIN, mock_config_entry.unique_id)}
-        )
-    )
-    assert device.name == TEST_FRIENDLY_NAME_2
+    assert mock_mozart_client.get_beolink_listeners.call_count == 0
 
 
 async def test_async_mute_volume(
@@ -745,12 +669,10 @@ async def test_async_media_next_track(
 @pytest.mark.parametrize(
     ("source", "expected_result", "seek_called_times"),
     [
-        # Seekable source, seek expected
-        (TEST_SOURCE, does_not_raise(), 1),
-        # Non seekable source, seek shouldn't work
-        (BangOlufsenSource.LINE_IN, pytest.raises(HomeAssistantError), 0),
-        # Malformed source, seek shouldn't work
-        (Source(), pytest.raises(HomeAssistantError), 0),
+        # Deezer source, seek expected
+        (BangOlufsenSource.DEEZER, does_not_raise(), 1),
+        # Non deezer source, seek shouldn't work
+        (BangOlufsenSource.TIDAL, pytest.raises(HomeAssistantError), 0),
     ],
 )
 async def test_async_media_seek(
@@ -834,7 +756,7 @@ async def test_async_clear_playlist(
         # Invalid source
         ("Test source", pytest.raises(ServiceValidationError), 0, 0),
         # Valid audio source
-        (TEST_SOURCE.name, does_not_raise(), 1, 0),
+        (BangOlufsenSource.TIDAL.name, does_not_raise(), 1, 0),
         # Valid video source
         (TEST_VIDEO_SOURCES[0], does_not_raise(), 0, 1),
     ],
@@ -1382,7 +1304,6 @@ async def test_async_browse_media(
 )
 async def test_async_join_players(
     hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
     mock_mozart_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     mock_config_entry_2: MockConfigEntry,
@@ -1404,11 +1325,11 @@ async def test_async_join_players(
     await hass.config_entries.async_setup(mock_config_entry_2.entry_id)
 
     # Set the source to a beolink expandable source
-    source_change_callback(TEST_SOURCE)
+    source_change_callback(BangOlufsenSource.TIDAL)
 
     await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_JOIN,
+        "media_player",
+        "join",
         {
             ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
             ATTR_GROUP_MEMBERS: group_members,
@@ -1419,14 +1340,6 @@ async def test_async_join_players(
     assert mock_mozart_client.post_beolink_expand.call_count == expand_count
     assert mock_mozart_client.join_latest_beolink_experience.call_count == join_count
 
-    # Main entity
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-    # Secondary entity
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID_2))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
 
 @pytest.mark.parametrize(
     ("source", "group_members", "expected_result", "error_type"),
@@ -1440,7 +1353,7 @@ async def test_async_join_players(
         ),
         # Invalid media_player entity
         (
-            TEST_SOURCE,
+            BangOlufsenSource.TIDAL,
             [TEST_MEDIA_PLAYER_ENTITY_ID_3],
             pytest.raises(ServiceValidationError),
             "invalid_grouping_entity",
@@ -1449,7 +1362,6 @@ async def test_async_join_players(
 )
 async def test_async_join_players_invalid(
     hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
     mock_mozart_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     mock_config_entry_2: MockConfigEntry,
@@ -1474,8 +1386,8 @@ async def test_async_join_players_invalid(
 
     with expected_result as exc_info:
         await hass.services.async_call(
-            MEDIA_PLAYER_DOMAIN,
-            SERVICE_JOIN,
+            "media_player",
+            "join",
             {
                 ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
                 ATTR_GROUP_MEMBERS: group_members,
@@ -1490,18 +1402,9 @@ async def test_async_join_players_invalid(
     assert mock_mozart_client.post_beolink_expand.call_count == 0
     assert mock_mozart_client.join_latest_beolink_experience.call_count == 0
 
-    # Main entity
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-    # Secondary entity
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID_2))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
 
 async def test_async_unjoin_player(
     hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
     mock_mozart_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
 ) -> None:
@@ -1511,270 +1414,10 @@ async def test_async_unjoin_player(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
 
     await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_UNJOIN,
+        "media_player",
+        "unjoin",
         {ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID},
         blocking=True,
     )
 
     mock_mozart_client.post_beolink_leave.assert_called_once()
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_beolink_join(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test async_beolink_join with defined JID."""
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    await hass.services.async_call(
-        DOMAIN,
-        "beolink_join",
-        {
-            ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
-            "beolink_jid": TEST_JID_2,
-        },
-        blocking=True,
-    )
-
-    mock_mozart_client.join_beolink_peer.assert_called_once_with(jid=TEST_JID_2)
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-@pytest.mark.parametrize(
-    (
-        "parameter",
-        "parameter_value",
-        "expand_side_effect",
-        "log_messages",
-        "peers_call_count",
-    ),
-    [
-        # All discovered
-        # Valid peers
-        ("all_discovered", True, None, [], 2),
-        # Invalid peers
-        (
-            "all_discovered",
-            True,
-            NotFoundException(),
-            [f"Unable to expand to {TEST_JID_3}", f"Unable to expand to {TEST_JID_4}"],
-            2,
-        ),
-        # Beolink JIDs
-        # Valid peer
-        ("beolink_jids", [TEST_JID_3, TEST_JID_4], None, [], 1),
-        # Invalid peer
-        (
-            "beolink_jids",
-            [TEST_JID_3, TEST_JID_4],
-            NotFoundException(),
-            [
-                f"Unable to expand to {TEST_JID_3}. Is the device available on the network?",
-                f"Unable to expand to {TEST_JID_4}. Is the device available on the network?",
-            ],
-            1,
-        ),
-    ],
-)
-async def test_async_beolink_expand(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    snapshot: SnapshotAssertion,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    parameter: str,
-    parameter_value: bool | list[str],
-    expand_side_effect: NotFoundException | None,
-    log_messages: list[str],
-    peers_call_count: int,
-) -> None:
-    """Test async_beolink_expand."""
-    mock_mozart_client.post_beolink_expand.side_effect = expand_side_effect
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    source_change_callback = (
-        mock_mozart_client.get_source_change_notifications.call_args[0][0]
-    )
-
-    # Set the source to a beolink expandable source
-    source_change_callback(TEST_SOURCE)
-
-    await hass.services.async_call(
-        DOMAIN,
-        "beolink_expand",
-        {
-            ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
-            parameter: parameter_value,
-        },
-        blocking=True,
-    )
-
-    # Check log messages
-    for log_message in log_messages:
-        assert log_message in caplog.text
-
-    # Called once during _initialize and once during async_beolink_expand for all_discovered
-    assert mock_mozart_client.get_beolink_peers.call_count == peers_call_count
-
-    assert mock_mozart_client.post_beolink_expand.call_count == len(
-        await mock_mozart_client.get_beolink_peers()
-    )
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_beolink_unexpand(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test test_async_beolink_unexpand."""
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    await hass.services.async_call(
-        DOMAIN,
-        "beolink_unexpand",
-        {
-            ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
-            "beolink_jids": [TEST_JID_3, TEST_JID_4],
-        },
-        blocking=True,
-    )
-
-    assert mock_mozart_client.post_beolink_unexpand.call_count == 2
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_beolink_allstandby(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test async_beolink_allstandby."""
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    await hass.services.async_call(
-        DOMAIN,
-        "beolink_allstandby",
-        {ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID},
-        blocking=True,
-    )
-
-    mock_mozart_client.post_beolink_allstandby.assert_called_once()
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-@pytest.mark.parametrize(
-    ("repeat"),
-    [
-        # Repeat all
-        (RepeatMode.ALL),
-        # Repeat track
-        (RepeatMode.ONE),
-        # Repeat none
-        (RepeatMode.OFF),
-    ],
-)
-async def test_async_set_repeat(
-    hass: HomeAssistant,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    repeat: RepeatMode,
-) -> None:
-    """Test async_set_repeat."""
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert ATTR_MEDIA_REPEAT not in states.attributes
-
-    # Set the return value of the repeat endpoint to match service call
-    mock_mozart_client.get_settings_queue.return_value = PlayQueueSettings(
-        repeat=BANG_OLUFSEN_REPEAT_FROM_HA[repeat]
-    )
-
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_REPEAT_SET,
-        {
-            ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
-            ATTR_MEDIA_REPEAT: repeat,
-        },
-        blocking=True,
-    )
-    mock_mozart_client.set_settings_queue.assert_called_once_with(
-        play_queue_settings=PlayQueueSettings(
-            repeat=BANG_OLUFSEN_REPEAT_FROM_HA[repeat]
-        )
-    )
-
-    # Test the BANG_OLUFSEN_REPEAT_TO_HA dict by checking property value
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states.attributes[ATTR_MEDIA_REPEAT] == repeat
-
-
-@pytest.mark.parametrize(
-    ("shuffle"),
-    [
-        # Shuffle on
-        (True),
-        # Shuffle off
-        (False),
-    ],
-)
-async def test_async_set_shuffle(
-    hass: HomeAssistant,
-    mock_mozart_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    shuffle: bool,
-) -> None:
-    """Test async_set_shuffle."""
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert ATTR_MEDIA_SHUFFLE not in states.attributes
-
-    # Set the return value of the shuffle endpoint to match service call
-    mock_mozart_client.get_settings_queue.return_value = PlayQueueSettings(
-        shuffle=shuffle
-    )
-
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_SHUFFLE_SET,
-        {
-            ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
-            ATTR_MEDIA_SHUFFLE: shuffle,
-        },
-        blocking=True,
-    )
-    mock_mozart_client.set_settings_queue.assert_called_once_with(
-        play_queue_settings=PlayQueueSettings(shuffle=shuffle)
-    )
-
-    assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
-    assert states.attributes[ATTR_MEDIA_SHUFFLE] == shuffle
diff --git a/tests/components/blebox/test_init.py b/tests/components/blebox/test_init.py
index 0cb5139336c..f406df51bd4 100644
--- a/tests/components/blebox/test_init.py
+++ b/tests/components/blebox/test_init.py
@@ -5,6 +5,7 @@ import logging
 import blebox_uniapi
 import pytest
 
+from homeassistant.components.blebox.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
@@ -56,10 +57,10 @@ async def test_unload_config_entry(hass: HomeAssistant) -> None:
 
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
-    assert hasattr(entry, "runtime_data")
+    assert hass.data[DOMAIN]
 
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
-    assert not hasattr(entry, "runtime_data")
+    assert not hass.data.get(DOMAIN)
 
     assert entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/blink/test_init.py b/tests/components/blink/test_init.py
index 6d4a93e58ab..3cd2cd51ebd 100644
--- a/tests/components/blink/test_init.py
+++ b/tests/components/blink/test_init.py
@@ -66,17 +66,18 @@ async def test_setup_not_ready_authkey_required(
     assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
 
 
-async def test_unload_entry(
+async def test_unload_entry_multiple(
     hass: HomeAssistant,
     mock_blink_api: MagicMock,
     mock_blink_auth_api: MagicMock,
     mock_config_entry: MockConfigEntry,
 ) -> None:
-    """Test unload doesn't un-register services."""
+    """Test being able to unload one of 2 entries."""
 
     mock_config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
+    hass.data[DOMAIN]["dummy"] = {1: 2}
     assert mock_config_entry.state is ConfigEntryState.LOADED
     assert await hass.config_entries.async_unload(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/bluesound/conftest.py b/tests/components/bluesound/conftest.py
index b4ee61dee57..155d6b66e4e 100644
--- a/tests/components/bluesound/conftest.py
+++ b/tests/components/bluesound/conftest.py
@@ -1,124 +1,71 @@
 """Common fixtures for the Bluesound tests."""
 
-from collections.abc import AsyncGenerator, Generator
-from dataclasses import dataclass
-import ipaddress
-from typing import Any
+from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
-from pyblu import Input, Player, Preset, Status, SyncStatus
+from pyblu import Status, SyncStatus
 import pytest
 
 from homeassistant.components.bluesound.const import DOMAIN
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 
-from .utils import LongPollingMock
-
 from tests.common import MockConfigEntry
 
 
-@dataclass
-class PlayerMockData:
-    """Container for player mock data."""
-
-    host: str
-    player: AsyncMock
-    status_long_polling_mock: LongPollingMock[Status]
-    sync_status_long_polling_mock: LongPollingMock[SyncStatus]
-
-    @staticmethod
-    async def generate(host: str) -> "PlayerMockData":
-        """Generate player mock data."""
-        host_ip = ipaddress.ip_address(host)
-        assert host_ip.version == 4
-        mac_parts = [0xFF, 0xFF, *host_ip.packed]
-        mac = ":".join(f"{x:02X}" for x in mac_parts)
-
-        player_name = f"player-name{host.replace('.', '')}"
-
-        player = await AsyncMock(spec=Player)()
-        player.__aenter__.return_value = player
-
-        status_long_polling_mock = LongPollingMock(
-            Status(
-                etag="etag",
-                input_id=None,
-                service=None,
-                state="play",
-                shuffle=False,
-                album="album",
-                artist="artist",
-                name="song",
-                image=None,
-                volume=10,
-                volume_db=22.3,
-                mute=False,
-                mute_volume=None,
-                mute_volume_db=None,
-                seconds=2,
-                total_seconds=123.1,
-                can_seek=False,
-                sleep=0,
-                group_name=None,
-                group_volume=None,
-                indexing=False,
-                stream_url=None,
-            )
-        )
-
-        sync_status_long_polling_mock = LongPollingMock(
-            SyncStatus(
-                etag="etag",
-                id=f"{host}:11000",
-                mac=mac,
-                name=player_name,
-                image="invalid_url",
-                initialized=True,
-                brand="brand",
-                model="model",
-                model_name="model-name",
-                volume_db=0.5,
-                volume=50,
-                group=None,
-                master=None,
-                slaves=None,
-                zone=None,
-                zone_master=None,
-                zone_slave=None,
-                mute_volume_db=None,
-                mute_volume=None,
-            )
-        )
-
-        player.status.side_effect = status_long_polling_mock.side_effect()
-        player.sync_status.side_effect = sync_status_long_polling_mock.side_effect()
-
-        player.inputs = AsyncMock(
-            return_value=[
-                Input("1", "input1", "image1", "url1"),
-                Input("2", "input2", "image2", "url2"),
-            ]
-        )
-        player.presets = AsyncMock(
-            return_value=[
-                Preset("preset1", "1", "url1", "image1", None),
-                Preset("preset2", "2", "url2", "image2", None),
-            ]
-        )
-
-        return PlayerMockData(
-            host, player, status_long_polling_mock, sync_status_long_polling_mock
-        )
+@pytest.fixture
+def sync_status() -> SyncStatus:
+    """Return a sync status object."""
+    return SyncStatus(
+        etag="etag",
+        id="1.1.1.1:11000",
+        mac="00:11:22:33:44:55",
+        name="player-name",
+        image="invalid_url",
+        initialized=True,
+        brand="brand",
+        model="model",
+        model_name="model-name",
+        volume_db=0.5,
+        volume=50,
+        group=None,
+        master=None,
+        slaves=None,
+        zone=None,
+        zone_master=None,
+        zone_slave=None,
+        mute_volume_db=None,
+        mute_volume=None,
+    )
 
 
-@dataclass
-class PlayerMocks:
-    """Container for mocks."""
-
-    player_data: PlayerMockData
-    player_data_secondary: PlayerMockData
-    player_data_for_already_configured: PlayerMockData
+@pytest.fixture
+def status() -> Status:
+    """Return a status object."""
+    return Status(
+        etag="etag",
+        input_id=None,
+        service=None,
+        state="playing",
+        shuffle=False,
+        album=None,
+        artist=None,
+        name=None,
+        image=None,
+        volume=10,
+        volume_db=22.3,
+        mute=False,
+        mute_volume=None,
+        mute_volume_db=None,
+        seconds=2,
+        total_seconds=123.1,
+        can_seek=False,
+        sleep=0,
+        group_name=None,
+        group_volume=None,
+        indexing=False,
+        stream_url=None,
+    )
 
 
 @pytest.fixture
@@ -131,76 +78,24 @@ def mock_setup_entry() -> Generator[AsyncMock]:
 
 
 @pytest.fixture
-def config_entry() -> MockConfigEntry:
+def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
     """Return a mocked config entry."""
-    return MockConfigEntry(
+    mock_entry = MockConfigEntry(
         domain=DOMAIN,
         data={
-            CONF_HOST: "1.1.1.1",
+            CONF_HOST: "1.1.1.2",
             CONF_PORT: 11000,
         },
-        unique_id="ff:ff:01:01:01:01-11000",
+        unique_id="00:11:22:33:44:55-11000",
     )
+    mock_entry.add_to_hass(hass)
+
+    return mock_entry
 
 
 @pytest.fixture
-def config_entry_secondary() -> MockConfigEntry:
-    """Return a mocked config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_HOST: "2.2.2.2",
-            CONF_PORT: 11000,
-        },
-        unique_id="ff:ff:02:02:02:02-11000",
-    )
-
-
-@pytest.fixture
-async def setup_config_entry(
-    hass: HomeAssistant, config_entry: MockConfigEntry, player_mocks: PlayerMocks
-) -> None:
-    """Set up the platform."""
-    config_entry.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-
-@pytest.fixture
-async def setup_config_entry_secondary(
-    hass: HomeAssistant,
-    config_entry_secondary: MockConfigEntry,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Set up the platform."""
-    config_entry_secondary.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(config_entry_secondary.entry_id)
-    await hass.async_block_till_done()
-
-
-@pytest.fixture
-async def player_mocks() -> AsyncGenerator[PlayerMocks]:
+def mock_player(status: Status) -> Generator[AsyncMock]:
     """Mock the player."""
-    player_mocks = PlayerMocks(
-        player_data=await PlayerMockData.generate("1.1.1.1"),
-        player_data_secondary=await PlayerMockData.generate("2.2.2.2"),
-        player_data_for_already_configured=await PlayerMockData.generate("1.1.1.2"),
-    )
-
-    # to simulate a player that is already configured
-    player_mocks.player_data_for_already_configured.sync_status_long_polling_mock.get().mac = player_mocks.player_data.sync_status_long_polling_mock.get().mac
-
-    def select_player(*args: Any, **kwargs: Any) -> AsyncMock:
-        match args[0]:
-            case "1.1.1.1":
-                return player_mocks.player_data.player
-            case "2.2.2.2":
-                return player_mocks.player_data_secondary.player
-            case "1.1.1.2":
-                return player_mocks.player_data_for_already_configured.player
-            case _:
-                raise ValueError("Invalid player")
-
     with (
         patch(
             "homeassistant.components.bluesound.Player", autospec=True
@@ -210,6 +105,28 @@ async def player_mocks() -> AsyncGenerator[PlayerMocks]:
             new=mock_player,
         ),
     ):
-        mock_player.side_effect = select_player
-
-        yield player_mocks
+        player = mock_player.return_value
+        player.__aenter__.return_value = player
+        player.status.return_value = status
+        player.sync_status.return_value = SyncStatus(
+            etag="etag",
+            id="1.1.1.1:11000",
+            mac="00:11:22:33:44:55",
+            name="player-name",
+            image="invalid_url",
+            initialized=True,
+            brand="brand",
+            model="model",
+            model_name="model-name",
+            volume_db=0.5,
+            volume=50,
+            group=None,
+            master=None,
+            slaves=None,
+            zone=None,
+            zone_master=None,
+            zone_slave=None,
+            mute_volume_db=None,
+            mute_volume=None,
+        )
+        yield player
diff --git a/tests/components/bluesound/snapshots/test_media_player.ambr b/tests/components/bluesound/snapshots/test_media_player.ambr
deleted file mode 100644
index 3e644d3038a..00000000000
--- a/tests/components/bluesound/snapshots/test_media_player.ambr
+++ /dev/null
@@ -1,31 +0,0 @@
-# serializer version: 1
-# name: test_attributes_set
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'player-name1111',
-      'is_volume_muted': False,
-      'master': False,
-      'media_album_name': 'album',
-      'media_artist': 'artist',
-      'media_content_type': <MediaType.MUSIC: 'music'>,
-      'media_duration': 123,
-      'media_position': 2,
-      'media_title': 'song',
-      'shuffle': False,
-      'source_list': list([
-        'input1',
-        'input2',
-        'preset1',
-        'preset2',
-      ]),
-      'supported_features': <MediaPlayerEntityFeature: 196157>,
-      'volume_level': 0.1,
-    }),
-    'context': <ANY>,
-    'entity_id': 'media_player.player_name1111',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'playing',
-  })
-# ---
diff --git a/tests/components/bluesound/test_config_flow.py b/tests/components/bluesound/test_config_flow.py
index 63744cdf0ff..53cf40a8d46 100644
--- a/tests/components/bluesound/test_config_flow.py
+++ b/tests/components/bluesound/test_config_flow.py
@@ -11,13 +11,11 @@ from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-from .conftest import PlayerMocks
-
 from tests.common import MockConfigEntry
 
 
 async def test_user_flow_success(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, player_mocks: PlayerMocks
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_player: AsyncMock
 ) -> None:
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
@@ -35,17 +33,15 @@ async def test_user_flow_success(
     )
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "player-name1111"
+    assert result["title"] == "player-name"
     assert result["data"] == {CONF_HOST: "1.1.1.1", CONF_PORT: 11000}
-    assert result["result"].unique_id == "ff:ff:01:01:01:01-11000"
+    assert result["result"].unique_id == "00:11:22:33:44:55-11000"
 
     mock_setup_entry.assert_called_once()
 
 
 async def test_user_flow_cannot_connect(
-    hass: HomeAssistant,
-    player_mocks: PlayerMocks,
-    mock_setup_entry: AsyncMock,
+    hass: HomeAssistant, mock_player: AsyncMock, mock_setup_entry: AsyncMock
 ) -> None:
     """Test we handle cannot connect error."""
     result = await hass.config_entries.flow.async_init(
@@ -53,9 +49,7 @@ async def test_user_flow_cannot_connect(
         context={"source": SOURCE_USER},
     )
 
-    player_mocks.player_data.sync_status_long_polling_mock.set_error(
-        PlayerUnreachableError("Player not reachable")
-    )
+    mock_player.sync_status.side_effect = PlayerUnreachableError("Player not reachable")
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         {
@@ -67,7 +61,7 @@ async def test_user_flow_cannot_connect(
     assert result["errors"] == {"base": "cannot_connect"}
     assert result["step_id"] == "user"
 
-    player_mocks.player_data.sync_status_long_polling_mock.set_error(None)
+    mock_player.sync_status.side_effect = None
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         {
@@ -76,7 +70,7 @@ async def test_user_flow_cannot_connect(
     )
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "player-name1111"
+    assert result["title"] == "player-name"
     assert result["data"] == {
         CONF_HOST: "1.1.1.1",
         CONF_PORT: 11000,
@@ -87,11 +81,10 @@ async def test_user_flow_cannot_connect(
 
 async def test_user_flow_aleady_configured(
     hass: HomeAssistant,
-    player_mocks: PlayerMocks,
-    config_entry: MockConfigEntry,
+    mock_player: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test we handle already configured."""
-    config_entry.add_to_hass(hass)
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_USER},
@@ -100,7 +93,7 @@ async def test_user_flow_aleady_configured(
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         {
-            CONF_HOST: "1.1.1.2",
+            CONF_HOST: "1.1.1.1",
             CONF_PORT: 11000,
         },
     )
@@ -108,13 +101,13 @@ async def test_user_flow_aleady_configured(
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
 
-    assert config_entry.data[CONF_HOST] == "1.1.1.2"
+    assert mock_config_entry.data[CONF_HOST] == "1.1.1.1"
 
-    player_mocks.player_data_for_already_configured.player.sync_status.assert_called_once()
+    mock_player.sync_status.assert_called_once()
 
 
 async def test_import_flow_success(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, player_mocks: PlayerMocks
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_player: AsyncMock
 ) -> None:
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
@@ -124,21 +117,19 @@ async def test_import_flow_success(
     )
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "player-name1111"
+    assert result["title"] == "player-name"
     assert result["data"] == {CONF_HOST: "1.1.1.1", CONF_PORT: 11000}
-    assert result["result"].unique_id == "ff:ff:01:01:01:01-11000"
+    assert result["result"].unique_id == "00:11:22:33:44:55-11000"
 
     mock_setup_entry.assert_called_once()
-    player_mocks.player_data.player.sync_status.assert_called_once()
+    mock_player.sync_status.assert_called_once()
 
 
 async def test_import_flow_cannot_connect(
-    hass: HomeAssistant, player_mocks: PlayerMocks
+    hass: HomeAssistant, mock_player: AsyncMock
 ) -> None:
     """Test we handle cannot connect error."""
-    player_mocks.player_data.player.sync_status.side_effect = PlayerUnreachableError(
-        "Player not reachable"
-    )
+    mock_player.sync_status.side_effect = PlayerUnreachableError("Player not reachable")
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_IMPORT},
@@ -148,30 +139,29 @@ async def test_import_flow_cannot_connect(
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "cannot_connect"
 
-    player_mocks.player_data.player.sync_status.assert_called_once()
+    mock_player.sync_status.assert_called_once()
 
 
 async def test_import_flow_already_configured(
     hass: HomeAssistant,
-    player_mocks: PlayerMocks,
-    config_entry: MockConfigEntry,
+    mock_player: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test we handle already configured."""
-    config_entry.add_to_hass(hass)
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_IMPORT},
-        data={CONF_HOST: "1.1.1.2", CONF_PORT: 11000},
+        data={CONF_HOST: "1.1.1.1", CONF_PORT: 11000},
     )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
 
-    player_mocks.player_data_for_already_configured.player.sync_status.assert_called_once()
+    mock_player.sync_status.assert_called_once()
 
 
 async def test_zeroconf_flow_success(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, player_mocks: PlayerMocks
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_player: AsyncMock
 ) -> None:
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
@@ -181,7 +171,7 @@ async def test_zeroconf_flow_success(
             ip_address="1.1.1.1",
             ip_addresses=["1.1.1.1"],
             port=11000,
-            hostname="player-name1111",
+            hostname="player-name",
             type="_musc._tcp.local.",
             name="player-name._musc._tcp.local.",
             properties={},
@@ -192,27 +182,25 @@ async def test_zeroconf_flow_success(
     assert result["step_id"] == "confirm"
 
     mock_setup_entry.assert_not_called()
-    player_mocks.player_data.player.sync_status.assert_called_once()
+    mock_player.sync_status.assert_called_once()
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input={}
     )
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "player-name1111"
+    assert result["title"] == "player-name"
     assert result["data"] == {CONF_HOST: "1.1.1.1", CONF_PORT: 11000}
-    assert result["result"].unique_id == "ff:ff:01:01:01:01-11000"
+    assert result["result"].unique_id == "00:11:22:33:44:55-11000"
 
     mock_setup_entry.assert_called_once()
 
 
 async def test_zeroconf_flow_cannot_connect(
-    hass: HomeAssistant, player_mocks: PlayerMocks
+    hass: HomeAssistant, mock_player: AsyncMock
 ) -> None:
     """Test we handle cannot connect error."""
-    player_mocks.player_data.player.sync_status.side_effect = PlayerUnreachableError(
-        "Player not reachable"
-    )
+    mock_player.sync_status.side_effect = PlayerUnreachableError("Player not reachable")
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_ZEROCONF},
@@ -220,7 +208,7 @@ async def test_zeroconf_flow_cannot_connect(
             ip_address="1.1.1.1",
             ip_addresses=["1.1.1.1"],
             port=11000,
-            hostname="player-name1111",
+            hostname="player-name",
             type="_musc._tcp.local.",
             name="player-name._musc._tcp.local.",
             properties={},
@@ -230,24 +218,23 @@ async def test_zeroconf_flow_cannot_connect(
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "cannot_connect"
 
-    player_mocks.player_data.player.sync_status.assert_called_once()
+    mock_player.sync_status.assert_called_once()
 
 
 async def test_zeroconf_flow_already_configured(
     hass: HomeAssistant,
-    player_mocks: PlayerMocks,
-    config_entry: MockConfigEntry,
+    mock_player: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test we handle already configured and update the host."""
-    config_entry.add_to_hass(hass)
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_ZEROCONF},
         data=ZeroconfServiceInfo(
-            ip_address="1.1.1.2",
-            ip_addresses=["1.1.1.2"],
+            ip_address="1.1.1.1",
+            ip_addresses=["1.1.1.1"],
             port=11000,
-            hostname="player-name1112",
+            hostname="player-name",
             type="_musc._tcp.local.",
             name="player-name._musc._tcp.local.",
             properties={},
@@ -257,6 +244,6 @@ async def test_zeroconf_flow_already_configured(
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
 
-    assert config_entry.data[CONF_HOST] == "1.1.1.2"
+    assert mock_config_entry.data[CONF_HOST] == "1.1.1.1"
 
-    player_mocks.player_data_for_already_configured.player.sync_status.assert_called_once()
+    mock_player.sync_status.assert_called_once()
diff --git a/tests/components/bluesound/test_init.py b/tests/components/bluesound/test_init.py
deleted file mode 100644
index 4178c27acad..00000000000
--- a/tests/components/bluesound/test_init.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""Test bluesound integration."""
-
-from pyblu.errors import PlayerUnreachableError
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-
-from .conftest import PlayerMocks
-
-from tests.common import MockConfigEntry
-
-
-async def test_setup_entry(
-    hass: HomeAssistant, setup_config_entry: None, config_entry: MockConfigEntry
-) -> None:
-    """Test a successful setup entry."""
-    assert hass.states.get("media_player.player_name1111").state == "playing"
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    assert await hass.config_entries.async_unload(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("media_player.player_name1111").state == "unavailable"
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
-
-
-async def test_unload_entry_while_player_is_offline(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    config_entry: MockConfigEntry,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test entries can be unloaded correctly while the player is offline."""
-    player_mocks.player_data.player.status.side_effect = PlayerUnreachableError(
-        "Player not reachable"
-    )
-    player_mocks.player_data.status_long_polling_mock.trigger()
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    assert await hass.config_entries.async_unload(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("media_player.player_name1111").state == "unavailable"
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/bluesound/test_media_player.py b/tests/components/bluesound/test_media_player.py
deleted file mode 100644
index 0bf615de3da..00000000000
--- a/tests/components/bluesound/test_media_player.py
+++ /dev/null
@@ -1,375 +0,0 @@
-"""Tests for the Bluesound Media Player platform."""
-
-import dataclasses
-from unittest.mock import call
-
-from pyblu import PairedPlayer
-from pyblu.errors import PlayerUnreachableError
-import pytest
-from syrupy.assertion import SnapshotAssertion
-from syrupy.filters import props
-
-from homeassistant.components.bluesound import DOMAIN as BLUESOUND_DOMAIN
-from homeassistant.components.bluesound.const import ATTR_MASTER
-from homeassistant.components.bluesound.services import (
-    SERVICE_CLEAR_TIMER,
-    SERVICE_JOIN,
-    SERVICE_SET_TIMER,
-)
-from homeassistant.components.media_player import (
-    ATTR_MEDIA_VOLUME_LEVEL,
-    DOMAIN as MEDIA_PLAYER_DOMAIN,
-    SERVICE_MEDIA_NEXT_TRACK,
-    SERVICE_MEDIA_PAUSE,
-    SERVICE_MEDIA_PLAY,
-    SERVICE_MEDIA_PREVIOUS_TRACK,
-    SERVICE_VOLUME_DOWN,
-    SERVICE_VOLUME_MUTE,
-    SERVICE_VOLUME_SET,
-    SERVICE_VOLUME_UP,
-    MediaPlayerState,
-)
-from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-
-from .conftest import PlayerMocks
-
-
-@pytest.mark.parametrize(
-    ("service", "method"),
-    [
-        (SERVICE_MEDIA_PAUSE, "pause"),
-        (SERVICE_MEDIA_PLAY, "play"),
-        (SERVICE_MEDIA_NEXT_TRACK, "skip"),
-        (SERVICE_MEDIA_PREVIOUS_TRACK, "back"),
-    ],
-)
-async def test_simple_actions(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    player_mocks: PlayerMocks,
-    service: str,
-    method: str,
-) -> None:
-    """Test the media player simple actions."""
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        service,
-        {ATTR_ENTITY_ID: "media_player.player_name1111"},
-        blocking=True,
-    )
-
-    getattr(player_mocks.player_data.player, method).assert_called_once_with()
-
-
-async def test_volume_set(
-    hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
-) -> None:
-    """Test the media player volume set."""
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_VOLUME_SET,
-        {ATTR_ENTITY_ID: "media_player.player_name1111", ATTR_MEDIA_VOLUME_LEVEL: 0.5},
-        blocking=True,
-    )
-
-    player_mocks.player_data.player.volume.assert_called_once_with(level=50)
-
-
-async def test_volume_mute(
-    hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
-) -> None:
-    """Test the media player volume mute."""
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_VOLUME_MUTE,
-        {ATTR_ENTITY_ID: "media_player.player_name1111", "is_volume_muted": True},
-        blocking=True,
-    )
-
-    player_mocks.player_data.player.volume.assert_called_once_with(mute=True)
-
-
-async def test_volume_up(
-    hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
-) -> None:
-    """Test the media player volume up."""
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_VOLUME_UP,
-        {ATTR_ENTITY_ID: "media_player.player_name1111"},
-        blocking=True,
-    )
-
-    player_mocks.player_data.player.volume.assert_called_once_with(level=11)
-
-
-async def test_volume_down(
-    hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
-) -> None:
-    """Test the media player volume down."""
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_VOLUME_DOWN,
-        {ATTR_ENTITY_ID: "media_player.player_name1111"},
-        blocking=True,
-    )
-
-    player_mocks.player_data.player.volume.assert_called_once_with(level=9)
-
-
-async def test_attributes_set(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    player_mocks: PlayerMocks,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test the media player attributes set."""
-    state = hass.states.get("media_player.player_name1111")
-    assert state == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_stop_maps_to_idle(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test the media player stop maps to idle."""
-    player_mocks.player_data.status_long_polling_mock.set(
-        dataclasses.replace(
-            player_mocks.player_data.status_long_polling_mock.get(), state="stop"
-        )
-    )
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    assert (
-        hass.states.get("media_player.player_name1111").state == MediaPlayerState.IDLE
-    )
-
-
-async def test_status_updated(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test the media player status updated."""
-    pre_state = hass.states.get("media_player.player_name1111")
-    assert pre_state.state == "playing"
-    assert pre_state.attributes[ATTR_MEDIA_VOLUME_LEVEL] == 0.1
-
-    status = player_mocks.player_data.status_long_polling_mock.get()
-    status = dataclasses.replace(status, state="pause", volume=50, etag="changed")
-    player_mocks.player_data.status_long_polling_mock.set(status)
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    post_state = hass.states.get("media_player.player_name1111")
-
-    assert post_state.state == MediaPlayerState.PAUSED
-    assert post_state.attributes[ATTR_MEDIA_VOLUME_LEVEL] == 0.5
-
-
-async def test_unavailable_when_offline(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test that the media player goes unavailable when the player is unreachable."""
-    pre_state = hass.states.get("media_player.player_name1111")
-    assert pre_state.state == "playing"
-
-    player_mocks.player_data.status_long_polling_mock.set_error(
-        PlayerUnreachableError("Player not reachable")
-    )
-    player_mocks.player_data.status_long_polling_mock.trigger()
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    post_state = hass.states.get("media_player.player_name1111")
-
-    assert post_state.state == STATE_UNAVAILABLE
-
-
-async def test_set_sleep_timer(
-    hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
-) -> None:
-    """Test the set sleep timer action."""
-    await hass.services.async_call(
-        BLUESOUND_DOMAIN,
-        SERVICE_SET_TIMER,
-        {ATTR_ENTITY_ID: "media_player.player_name1111"},
-        blocking=True,
-    )
-
-    player_mocks.player_data.player.sleep_timer.assert_called_once()
-
-
-async def test_clear_sleep_timer(
-    hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
-) -> None:
-    """Test the clear sleep timer action."""
-
-    player_mocks.player_data.player.sleep_timer.side_effect = [15, 30, 45, 60, 90, 0]
-
-    await hass.services.async_call(
-        BLUESOUND_DOMAIN,
-        SERVICE_CLEAR_TIMER,
-        {ATTR_ENTITY_ID: "media_player.player_name1111"},
-        blocking=True,
-    )
-
-    player_mocks.player_data.player.sleep_timer.assert_has_calls([call()] * 6)
-
-
-async def test_join_cannot_join_to_self(
-    hass: HomeAssistant, setup_config_entry: None, player_mocks: PlayerMocks
-) -> None:
-    """Test that joining to self is not allowed."""
-    with pytest.raises(ServiceValidationError, match="Cannot join player to itself"):
-        await hass.services.async_call(
-            BLUESOUND_DOMAIN,
-            SERVICE_JOIN,
-            {
-                ATTR_ENTITY_ID: "media_player.player_name1111",
-                ATTR_MASTER: "media_player.player_name1111",
-            },
-            blocking=True,
-        )
-
-
-async def test_join(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    setup_config_entry_secondary: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test the join action."""
-    await hass.services.async_call(
-        BLUESOUND_DOMAIN,
-        SERVICE_JOIN,
-        {
-            ATTR_ENTITY_ID: "media_player.player_name1111",
-            ATTR_MASTER: "media_player.player_name2222",
-        },
-        blocking=True,
-    )
-
-    player_mocks.player_data_secondary.player.add_slave.assert_called_once_with(
-        "1.1.1.1", 11000
-    )
-
-
-async def test_unjoin(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    setup_config_entry_secondary: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test the unjoin action."""
-    updated_sync_status = dataclasses.replace(
-        player_mocks.player_data.sync_status_long_polling_mock.get(),
-        master=PairedPlayer("2.2.2.2", 11000),
-    )
-    player_mocks.player_data.sync_status_long_polling_mock.set(updated_sync_status)
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    await hass.services.async_call(
-        BLUESOUND_DOMAIN,
-        "unjoin",
-        {ATTR_ENTITY_ID: "media_player.player_name1111"},
-        blocking=True,
-    )
-
-    player_mocks.player_data_secondary.player.remove_slave.assert_called_once_with(
-        "1.1.1.1", 11000
-    )
-
-
-async def test_attr_master(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test the media player master."""
-    attr_master = hass.states.get("media_player.player_name1111").attributes[
-        ATTR_MASTER
-    ]
-    assert attr_master is False
-
-    updated_sync_status = dataclasses.replace(
-        player_mocks.player_data.sync_status_long_polling_mock.get(),
-        slaves=[PairedPlayer("2.2.2.2", 11000)],
-    )
-    player_mocks.player_data.sync_status_long_polling_mock.set(updated_sync_status)
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    attr_master = hass.states.get("media_player.player_name1111").attributes[
-        ATTR_MASTER
-    ]
-
-    assert attr_master is True
-
-
-async def test_attr_bluesound_group(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    setup_config_entry_secondary: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test the media player grouping."""
-    attr_bluesound_group = hass.states.get(
-        "media_player.player_name1111"
-    ).attributes.get("bluesound_group")
-    assert attr_bluesound_group is None
-
-    updated_status = dataclasses.replace(
-        player_mocks.player_data.status_long_polling_mock.get(),
-        group_name="player-name1111+player-name2222",
-    )
-    player_mocks.player_data.status_long_polling_mock.set(updated_status)
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    attr_bluesound_group = hass.states.get(
-        "media_player.player_name1111"
-    ).attributes.get("bluesound_group")
-
-    assert attr_bluesound_group == ["player-name1111", "player-name2222"]
-
-
-async def test_volume_up_from_6_to_7(
-    hass: HomeAssistant,
-    setup_config_entry: None,
-    player_mocks: PlayerMocks,
-) -> None:
-    """Test the media player volume up from 6 to 7.
-
-    This fails if if rounding is not done correctly. See https://github.com/home-assistant/core/issues/129956 for more details.
-    """
-    player_mocks.player_data.status_long_polling_mock.set(
-        dataclasses.replace(
-            player_mocks.player_data.status_long_polling_mock.get(), volume=6
-        )
-    )
-
-    # give the long polling loop a chance to update the state; this could be any async call
-    await hass.async_block_till_done()
-
-    await hass.services.async_call(
-        MEDIA_PLAYER_DOMAIN,
-        SERVICE_VOLUME_UP,
-        {ATTR_ENTITY_ID: "media_player.player_name1111"},
-        blocking=True,
-    )
-
-    player_mocks.player_data.player.volume.assert_called_once_with(level=7)
diff --git a/tests/components/bluesound/utils.py b/tests/components/bluesound/utils.py
deleted file mode 100644
index 112d077d7f5..00000000000
--- a/tests/components/bluesound/utils.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""Utils for bluesound tests."""
-
-import asyncio
-from typing import Protocol
-
-
-class Etag(Protocol):
-    """Etag protocol."""
-
-    etag: str
-
-
-class LongPollingMock[T: Etag]:
-    """Mock long polling methods(status, sync_status)."""
-
-    def __init__(self, value: T) -> None:
-        """Store value and allows to wait for changes."""
-        self._value = value
-        self._error: Exception | None = None
-        self._event = asyncio.Event()
-        self._event.set()
-
-    def trigger(self):
-        """Trigger the event without changing the value."""
-        self._event.set()
-
-    def set(self, value: T):
-        """Set the value and notify all waiting."""
-        self._value = value
-        self._event.set()
-
-    def set_error(self, error: Exception | None):
-        """Set the error and notify all waiting."""
-        self._error = error
-        self._event.set()
-
-    def get(self) -> T:
-        """Get the value without waiting."""
-        return self._value
-
-    async def wait(self) -> T:
-        """Wait for the value or error to change."""
-        await self._event.wait()
-        self._event.clear()
-
-        return self._value
-
-    def side_effect(self):
-        """Return the side_effect for mocking."""
-        last_etag = None
-
-        async def mock(*args, **kwargs) -> T:
-            nonlocal last_etag
-            if self._error is not None:
-                raise self._error
-
-            etag = kwargs.get("etag")
-            if etag is None or etag != last_etag:
-                last_etag = self.get().etag
-                return self.get()
-
-            value = await self.wait()
-            last_etag = value.etag
-
-            if self._error is not None:
-                raise self._error
-
-            return value
-
-        return mock
diff --git a/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr b/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr
index 624b2c6007f..2182ff2bb48 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_sensor.ambr
@@ -245,7 +245,7 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
     'original_icon': None,
     'original_name': 'Charging target',
     'platform': 'bmw_connected_drive',
@@ -259,6 +259,7 @@
 # name: test_entity_state_attrs[sensor.i3_rex_charging_target-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'battery',
       'friendly_name': 'i3 (+ REX) Charging target',
       'unit_of_measurement': '%',
     }),
@@ -893,7 +894,7 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
     'original_icon': None,
     'original_name': 'Charging target',
     'platform': 'bmw_connected_drive',
@@ -907,6 +908,7 @@
 # name: test_entity_state_attrs[sensor.i4_edrive40_charging_target-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'battery',
       'friendly_name': 'i4 eDrive40 Charging target',
       'unit_of_measurement': '%',
     }),
@@ -1898,7 +1900,7 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
     'original_icon': None,
     'original_name': 'Charging target',
     'platform': 'bmw_connected_drive',
@@ -1912,6 +1914,7 @@
 # name: test_entity_state_attrs[sensor.ix_xdrive50_charging_target-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'battery',
       'friendly_name': 'iX xDrive50 Charging target',
       'unit_of_measurement': '%',
     }),
diff --git a/tests/components/bmw_connected_drive/test_config_flow.py b/tests/components/bmw_connected_drive/test_config_flow.py
index f57f1a304ac..9d4d15703f2 100644
--- a/tests/components/bmw_connected_drive/test_config_flow.py
+++ b/tests/components/bmw_connected_drive/test_config_flow.py
@@ -4,13 +4,8 @@ from copy import deepcopy
 from unittest.mock import patch
 
 from bimmer_connected.api.authentication import MyBMWAuthentication
-from bimmer_connected.models import (
-    MyBMWAPIError,
-    MyBMWAuthError,
-    MyBMWCaptchaMissingError,
-)
+from bimmer_connected.models import MyBMWAPIError, MyBMWAuthError
 from httpx import RequestError
-import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.bmw_connected_drive.config_flow import DOMAIN
@@ -316,31 +311,3 @@ async def test_reconfigure_unique_id_abort(hass: HomeAssistant) -> None:
         assert result2["type"] is FlowResultType.ABORT
         assert result2["reason"] == "account_mismatch"
         assert config_entry.data == FIXTURE_COMPLETE_ENTRY
-
-
-@pytest.mark.usefixtures("bmw_fixture")
-async def test_captcha_flow_not_set(hass: HomeAssistant) -> None:
-    """Test the external flow with captcha failing once and succeeding the second time."""
-
-    TEST_REGION = "north_america"
-
-    # Start flow and open form
-    # Start flow and open form
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    # Add login data
-    with patch(
-        "bimmer_connected.api.authentication.MyBMWAuthentication._login_row_na",
-        side_effect=MyBMWCaptchaMissingError(
-            "Missing hCaptcha token for North America login"
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={**FIXTURE_USER_INPUT, CONF_REGION: TEST_REGION},
-        )
-        assert result["errors"]["base"] == "missing_captcha"
diff --git a/tests/components/bmw_connected_drive/test_coordinator.py b/tests/components/bmw_connected_drive/test_coordinator.py
index 774a85eb6da..b0f507bbfc2 100644
--- a/tests/components/bmw_connected_drive/test_coordinator.py
+++ b/tests/components/bmw_connected_drive/test_coordinator.py
@@ -1,19 +1,13 @@
 """Test BMW coordinator."""
 
-from copy import deepcopy
 from datetime import timedelta
 from unittest.mock import patch
 
-from bimmer_connected.models import (
-    MyBMWAPIError,
-    MyBMWAuthError,
-    MyBMWCaptchaMissingError,
-)
+from bimmer_connected.models import MyBMWAPIError, MyBMWAuthError
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 
 from homeassistant.components.bmw_connected_drive import DOMAIN as BMW_DOMAIN
-from homeassistant.const import CONF_REGION
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import issue_registry as ir
@@ -128,38 +122,3 @@ async def test_init_reauth(
         f"config_entry_reauth_{BMW_DOMAIN}_{config_entry.entry_id}",
     )
     assert reauth_issue.active is True
-
-
-@pytest.mark.usefixtures("bmw_fixture")
-async def test_captcha_reauth(
-    hass: HomeAssistant,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test the reauth form."""
-    TEST_REGION = "north_america"
-
-    config_entry_fixure = deepcopy(FIXTURE_CONFIG_ENTRY)
-    config_entry_fixure["data"][CONF_REGION] = TEST_REGION
-    config_entry = MockConfigEntry(**config_entry_fixure)
-    config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    coordinator = config_entry.runtime_data.coordinator
-
-    assert coordinator.last_update_success is True
-
-    freezer.tick(timedelta(minutes=10, seconds=1))
-    with patch(
-        "bimmer_connected.account.MyBMWAccount.get_vehicles",
-        side_effect=MyBMWCaptchaMissingError(
-            "Missing hCaptcha token for North America login"
-        ),
-    ):
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done()
-
-    assert coordinator.last_update_success is False
-    assert isinstance(coordinator.last_exception, ConfigEntryAuthFailed) is True
-    assert coordinator.last_exception.translation_key == "missing_captcha"
diff --git a/tests/components/bosch_shc/test_config_flow.py b/tests/components/bosch_shc/test_config_flow.py
index 63f7169b026..eaabe112807 100644
--- a/tests/components/bosch_shc/test_config_flow.py
+++ b/tests/components/bosch_shc/test_config_flow.py
@@ -99,8 +99,8 @@ async def test_form_user(hass: HomeAssistant) -> None:
     assert result3["title"] == "shc012345"
     assert result3["data"] == {
         "host": "1.1.1.1",
-        "ssl_certificate": hass.config.path(DOMAIN, "test-mac", CONF_SHC_CERT),
-        "ssl_key": hass.config.path(DOMAIN, "test-mac", CONF_SHC_KEY),
+        "ssl_certificate": hass.config.path(DOMAIN, CONF_SHC_CERT),
+        "ssl_key": hass.config.path(DOMAIN, CONF_SHC_KEY),
         "token": "abc:123",
         "hostname": "123",
     }
@@ -549,8 +549,8 @@ async def test_zeroconf(hass: HomeAssistant) -> None:
     assert result3["title"] == "shc012345"
     assert result3["data"] == {
         "host": "1.1.1.1",
-        "ssl_certificate": hass.config.path(DOMAIN, "test-mac", CONF_SHC_CERT),
-        "ssl_key": hass.config.path(DOMAIN, "test-mac", CONF_SHC_KEY),
+        "ssl_certificate": hass.config.path(DOMAIN, CONF_SHC_CERT),
+        "ssl_key": hass.config.path(DOMAIN, CONF_SHC_KEY),
         "token": "abc:123",
         "hostname": "123",
     }
@@ -708,7 +708,6 @@ async def test_reauth(hass: HomeAssistant) -> None:
 
 async def test_tls_assets_writer(hass: HomeAssistant) -> None:
     """Test we write tls assets to correct location."""
-    unique_id = "test-mac"
     assets = {
         "token": "abc:123",
         "cert": b"content_cert",
@@ -720,163 +719,14 @@ async def test_tls_assets_writer(hass: HomeAssistant) -> None:
             "homeassistant.components.bosch_shc.config_flow.open", mock_open()
         ) as mocked_file,
     ):
-        write_tls_asset(hass, unique_id, CONF_SHC_CERT, assets["cert"])
+        write_tls_asset(hass, CONF_SHC_CERT, assets["cert"])
         mocked_file.assert_called_with(
-            hass.config.path(DOMAIN, unique_id, CONF_SHC_CERT), "w", encoding="utf8"
+            hass.config.path(DOMAIN, CONF_SHC_CERT), "w", encoding="utf8"
         )
         mocked_file().write.assert_called_with("content_cert")
 
-        write_tls_asset(hass, unique_id, CONF_SHC_KEY, assets["key"])
+        write_tls_asset(hass, CONF_SHC_KEY, assets["key"])
         mocked_file.assert_called_with(
-            hass.config.path(DOMAIN, unique_id, CONF_SHC_KEY), "w", encoding="utf8"
+            hass.config.path(DOMAIN, CONF_SHC_KEY), "w", encoding="utf8"
         )
         mocked_file().write.assert_called_with("content_key")
-
-
-@pytest.mark.usefixtures("mock_zeroconf")
-async def test_register_multiple_controllers(hass: HomeAssistant) -> None:
-    """Test register multiple controllers.
-
-    Each registered controller must get its own key/certificate pair,
-    which must not get overwritten when a new controller is added.
-    """
-
-    controller_1 = {
-        "hostname": "shc111111",
-        "mac": "test-mac1",
-        "host": "1.1.1.1",
-        "register": {
-            "token": "abc:shc111111",
-            "cert": b"content_cert1",
-            "key": b"content_key1",
-        },
-    }
-    controller_2 = {
-        "hostname": "shc222222",
-        "mac": "test-mac2",
-        "host": "2.2.2.2",
-        "register": {
-            "token": "abc:shc222222",
-            "cert": b"content_cert2",
-            "key": b"content_key2",
-        },
-    }
-
-    # Set up controller 1
-    ctrl_1_result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with (
-        patch(
-            "boschshcpy.session.SHCSession.mdns_info",
-            return_value=SHCInformation,
-        ),
-        patch(
-            "boschshcpy.information.SHCInformation.name",
-            new_callable=PropertyMock,
-            return_value=controller_1["hostname"],
-        ),
-        patch(
-            "boschshcpy.information.SHCInformation.unique_id",
-            new_callable=PropertyMock,
-            return_value=controller_1["mac"],
-        ),
-    ):
-        ctrl_1_result2 = await hass.config_entries.flow.async_configure(
-            ctrl_1_result["flow_id"],
-            {"host": controller_1["host"]},
-        )
-
-    with (
-        patch(
-            "boschshcpy.register_client.SHCRegisterClient.register",
-            return_value=controller_1["register"],
-        ),
-        patch("os.mkdir"),
-        patch("homeassistant.components.bosch_shc.config_flow.open"),
-        patch("boschshcpy.session.SHCSession.authenticate"),
-        patch(
-            "homeassistant.components.bosch_shc.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        ctrl_1_result3 = await hass.config_entries.flow.async_configure(
-            ctrl_1_result2["flow_id"],
-            {"password": "test"},
-        )
-        await hass.async_block_till_done()
-
-    assert ctrl_1_result3["type"] is FlowResultType.CREATE_ENTRY
-    assert ctrl_1_result3["title"] == "shc111111"
-    assert ctrl_1_result3["context"]["unique_id"] == controller_1["mac"]
-    assert ctrl_1_result3["data"] == {
-        "host": "1.1.1.1",
-        "ssl_certificate": hass.config.path(DOMAIN, controller_1["mac"], CONF_SHC_CERT),
-        "ssl_key": hass.config.path(DOMAIN, controller_1["mac"], CONF_SHC_KEY),
-        "token": "abc:shc111111",
-        "hostname": "shc111111",
-    }
-
-    # Set up controller 2
-    ctrl_2_result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with (
-        patch(
-            "boschshcpy.session.SHCSession.mdns_info",
-            return_value=SHCInformation,
-        ),
-        patch(
-            "boschshcpy.information.SHCInformation.name",
-            new_callable=PropertyMock,
-            return_value=controller_2["hostname"],
-        ),
-        patch(
-            "boschshcpy.information.SHCInformation.unique_id",
-            new_callable=PropertyMock,
-            return_value=controller_2["mac"],
-        ),
-    ):
-        ctrl_2_result2 = await hass.config_entries.flow.async_configure(
-            ctrl_2_result["flow_id"],
-            {"host": controller_2["host"]},
-        )
-
-    with (
-        patch(
-            "boschshcpy.register_client.SHCRegisterClient.register",
-            return_value=controller_2["register"],
-        ),
-        patch("os.mkdir"),
-        patch("homeassistant.components.bosch_shc.config_flow.open"),
-        patch("boschshcpy.session.SHCSession.authenticate"),
-        patch(
-            "homeassistant.components.bosch_shc.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        ctrl_2_result3 = await hass.config_entries.flow.async_configure(
-            ctrl_2_result2["flow_id"],
-            {"password": "test"},
-        )
-        await hass.async_block_till_done()
-
-    assert ctrl_2_result3["type"] is FlowResultType.CREATE_ENTRY
-    assert ctrl_2_result3["title"] == "shc222222"
-    assert ctrl_2_result3["context"]["unique_id"] == controller_2["mac"]
-    assert ctrl_2_result3["data"] == {
-        "host": "2.2.2.2",
-        "ssl_certificate": hass.config.path(DOMAIN, controller_2["mac"], CONF_SHC_CERT),
-        "ssl_key": hass.config.path(DOMAIN, controller_2["mac"], CONF_SHC_KEY),
-        "token": "abc:shc222222",
-        "hostname": "shc222222",
-    }
-
-    # Check that each controller has its own key/certificate pair
-    assert (
-        ctrl_1_result3["data"]["ssl_certificate"]
-        != ctrl_2_result3["data"]["ssl_certificate"]
-    )
-    assert ctrl_1_result3["data"]["ssl_key"] != ctrl_2_result3["data"]["ssl_key"]
diff --git a/tests/components/bring/fixtures/items_invitation.json b/tests/components/bring/fixtures/items_invitation.json
deleted file mode 100644
index 82ef623e439..00000000000
--- a/tests/components/bring/fixtures/items_invitation.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "uuid": "77a151f8-77c4-47a3-8295-c750a0e69d4f",
-  "status": "INVITATION",
-  "purchase": [
-    {
-      "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
-      "itemId": "Paprika",
-      "specification": "Rot",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
-          }
-        }
-      ]
-    },
-    {
-      "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
-      "itemId": "Pouletbrüstli",
-      "specification": "Bio",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
-          }
-        }
-      ]
-    }
-  ],
-  "recently": [
-    {
-      "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
-      "itemId": "Ananas",
-      "specification": "",
-      "attributes": []
-    }
-  ]
-}
diff --git a/tests/components/bring/fixtures/items_shared.json b/tests/components/bring/fixtures/items_shared.json
deleted file mode 100644
index 9ac999729d3..00000000000
--- a/tests/components/bring/fixtures/items_shared.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "uuid": "77a151f8-77c4-47a3-8295-c750a0e69d4f",
-  "status": "SHARED",
-  "purchase": [
-    {
-      "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
-      "itemId": "Paprika",
-      "specification": "Rot",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
-          }
-        }
-      ]
-    },
-    {
-      "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
-      "itemId": "Pouletbrüstli",
-      "specification": "Bio",
-      "attributes": [
-        {
-          "type": "PURCHASE_CONDITIONS",
-          "content": {
-            "urgent": true,
-            "convenient": true,
-            "discounted": true
-          }
-        }
-      ]
-    }
-  ],
-  "recently": [
-    {
-      "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
-      "itemId": "Ananas",
-      "specification": "",
-      "attributes": []
-    }
-  ]
-}
diff --git a/tests/components/bring/snapshots/test_sensor.ambr b/tests/components/bring/snapshots/test_sensor.ambr
index 97e1d1b4bd9..08e554632e9 100644
--- a/tests/components/bring/snapshots/test_sensor.ambr
+++ b/tests/components/bring/snapshots/test_sensor.ambr
@@ -46,64 +46,6 @@
     'state': '2',
   })
 # ---
-# name: test_setup[sensor.baumarkt_list_access-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        'registered',
-        'shared',
-        'invitation',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.baumarkt_list_access',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
-    'original_icon': None,
-    'original_name': 'List access',
-    'platform': 'bring',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <BringSensor.LIST_ACCESS: 'list_access'>,
-    'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_list_access',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_setup[sensor.baumarkt_list_access-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'enum',
-      'friendly_name': 'Baumarkt List access',
-      'options': list([
-        'registered',
-        'shared',
-        'invitation',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.baumarkt_list_access',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'registered',
-  })
-# ---
 # name: test_setup[sensor.baumarkt_on_occasion-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -337,64 +279,6 @@
     'state': '2',
   })
 # ---
-# name: test_setup[sensor.einkauf_list_access-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        'registered',
-        'shared',
-        'invitation',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.einkauf_list_access',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
-    'original_icon': None,
-    'original_name': 'List access',
-    'platform': 'bring',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <BringSensor.LIST_ACCESS: 'list_access'>,
-    'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_list_access',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_setup[sensor.einkauf_list_access-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'enum',
-      'friendly_name': 'Einkauf List access',
-      'options': list([
-        'registered',
-        'shared',
-        'invitation',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.einkauf_list_access',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'registered',
-  })
-# ---
 # name: test_setup[sensor.einkauf_on_occasion-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/bring/test_sensor.py b/tests/components/bring/test_sensor.py
index 974818ccedf..a36b0163165 100644
--- a/tests/components/bring/test_sensor.py
+++ b/tests/components/bring/test_sensor.py
@@ -1,18 +1,17 @@
 """Test for sensor platform of the Bring! integration."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.bring.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from tests.common import MockConfigEntry, load_json_object_fixture, snapshot_platform
+from tests.common import MockConfigEntry, snapshot_platform
 
 
 @pytest.fixture(autouse=True)
@@ -43,34 +42,3 @@ async def test_setup(
     await snapshot_platform(
         hass, entity_registry, snapshot, bring_config_entry.entry_id
     )
-
-
-@pytest.mark.parametrize(
-    ("fixture", "entity_state"),
-    [
-        ("items_invitation", "invitation"),
-        ("items_shared", "shared"),
-        ("items", "registered"),
-    ],
-)
-async def test_list_access_states(
-    hass: HomeAssistant,
-    bring_config_entry: MockConfigEntry,
-    mock_bring_client: AsyncMock,
-    fixture: str,
-    entity_state: str,
-) -> None:
-    """Snapshot test states of list access sensor."""
-
-    mock_bring_client.get_list.return_value = load_json_object_fixture(
-        f"{fixture}.json", DOMAIN
-    )
-
-    bring_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(bring_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert bring_config_entry.state is ConfigEntryState.LOADED
-
-    assert (state := hass.states.get("sensor.einkauf_list_access"))
-    assert state.state == entity_state
diff --git a/tests/components/bsblan/fixtures/state.json b/tests/components/bsblan/fixtures/state.json
index 8c458e173d4..51d4cf2e136 100644
--- a/tests/components/bsblan/fixtures/state.json
+++ b/tests/components/bsblan/fixtures/state.json
@@ -97,14 +97,5 @@
     "dataType": 1,
     "readonly": 1,
     "unit": ""
-  },
-  "room1_temp_setpoint_boost": {
-    "name": "Room 1 Temp Setpoint Boost",
-    "error": 0,
-    "value": "22.5",
-    "desc": "Boost",
-    "dataType": 1,
-    "readonly": 1,
-    "unit": "°C"
   }
 }
diff --git a/tests/components/bsblan/snapshots/test_diagnostics.ambr b/tests/components/bsblan/snapshots/test_diagnostics.ambr
index 9fabd373205..c1d152056ec 100644
--- a/tests/components/bsblan/snapshots/test_diagnostics.ambr
+++ b/tests/components/bsblan/snapshots/test_diagnostics.ambr
@@ -6,103 +6,60 @@
         'current_temperature': dict({
           'data_type': 0,
           'desc': '',
-          'error': 0,
           'name': 'Room temp 1 actual value',
-          'precision': None,
-          'readonly': 1,
-          'readwrite': 0,
           'unit': '&deg;C',
-          'value': 18.6,
+          'value': '18.6',
         }),
         'outside_temperature': dict({
           'data_type': 0,
           'desc': '',
-          'error': 0,
           'name': 'Outside temp sensor local',
-          'precision': None,
-          'readonly': 0,
-          'readwrite': 0,
           'unit': '&deg;C',
-          'value': 6.1,
+          'value': '6.1',
         }),
       }),
       'state': dict({
         'current_temperature': dict({
           'data_type': 0,
           'desc': '',
-          'error': 0,
           'name': 'Room temp 1 actual value',
-          'precision': None,
-          'readonly': 1,
-          'readwrite': 0,
           'unit': '&deg;C',
-          'value': 18.6,
+          'value': '18.6',
         }),
         'hvac_action': dict({
           'data_type': 1,
           'desc': 'Raumtemp’begrenzung',
-          'error': 0,
           'name': 'Status heating circuit 1',
-          'precision': None,
-          'readonly': 1,
-          'readwrite': 0,
           'unit': '',
-          'value': 122,
+          'value': '122',
         }),
         'hvac_mode': dict({
           'data_type': 1,
           'desc': 'Komfort',
-          'error': 0,
           'name': 'Operating mode',
-          'precision': None,
-          'readonly': 0,
-          'readwrite': 0,
           'unit': '',
           'value': 'heat',
         }),
         'hvac_mode2': dict({
           'data_type': 1,
           'desc': 'Reduziert',
-          'error': 0,
           'name': 'Operating mode',
-          'precision': None,
-          'readonly': 0,
-          'readwrite': 0,
           'unit': '',
-          'value': 2,
-        }),
-        'room1_temp_setpoint_boost': dict({
-          'data_type': 1,
-          'desc': 'Boost',
-          'error': 0,
-          'name': 'Room 1 Temp Setpoint Boost',
-          'precision': None,
-          'readonly': 1,
-          'readwrite': 0,
-          'unit': '°C',
-          'value': '22.5',
+          'value': '2',
         }),
         'room1_thermostat_mode': dict({
           'data_type': 1,
           'desc': 'Kein Bedarf',
-          'error': 0,
           'name': 'Raumthermostat 1',
-          'precision': None,
-          'readonly': 1,
-          'readwrite': 0,
           'unit': '',
-          'value': 0,
+          'value': '0',
         }),
         'target_temperature': dict({
           'data_type': 0,
           'desc': '',
-          'error': 0,
           'name': 'Room temperature Comfort setpoint',
-          'precision': None,
-          'readonly': 0,
-          'readwrite': 0,
           'unit': '&deg;C',
-          'value': 18.5,
+          'value': '18.5',
         }),
       }),
     }),
@@ -116,33 +73,21 @@
       'controller_family': dict({
         'data_type': 0,
         'desc': '',
-        'error': 0,
         'name': 'Device family',
-        'precision': None,
-        'readonly': 0,
-        'readwrite': 0,
         'unit': '',
-        'value': 211,
+        'value': '211',
       }),
       'controller_variant': dict({
         'data_type': 0,
         'desc': '',
-        'error': 0,
         'name': 'Device variant',
-        'precision': None,
-        'readonly': 0,
-        'readwrite': 0,
         'unit': '',
-        'value': 127,
+        'value': '127',
       }),
       'device_identification': dict({
         'data_type': 7,
         'desc': '',
-        'error': 0,
         'name': 'Gerte-Identifikation',
-        'precision': None,
-        'readonly': 0,
-        'readwrite': 0,
         'unit': '',
         'value': 'RVS21.831F/127',
       }),
@@ -151,24 +96,16 @@
       'max_temp': dict({
         'data_type': 0,
         'desc': '',
-        'error': 0,
         'name': 'Summer/winter changeover temp heat circuit 1',
-        'precision': None,
-        'readonly': 0,
-        'readwrite': 0,
         'unit': '&deg;C',
-        'value': 20.0,
+        'value': '20.0',
       }),
       'min_temp': dict({
         'data_type': 0,
         'desc': '',
-        'error': 0,
         'name': 'Room temp frost protection setpoint',
-        'precision': None,
-        'readonly': 0,
-        'readwrite': 0,
         'unit': '&deg;C',
-        'value': 8.0,
+        'value': '8.0',
       }),
     }),
   })
diff --git a/tests/components/cambridge_audio/conftest.py b/tests/components/cambridge_audio/conftest.py
index 33a9ded70e3..3bce1739cf2 100644
--- a/tests/components/cambridge_audio/conftest.py
+++ b/tests/components/cambridge_audio/conftest.py
@@ -1,25 +1,16 @@
 """Cambridge Audio tests configuration."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, Mock, patch
+from unittest.mock import Mock, patch
 
-from aiostreammagic.models import (
-    AudioOutput,
-    Display,
-    Info,
-    NowPlaying,
-    PlayState,
-    PresetList,
-    Source,
-    State,
-    Update,
-)
+from aiostreammagic.models import Display, Info, NowPlaying, PlayState, Source, State
 import pytest
 
 from homeassistant.components.cambridge_audio.const import DOMAIN
 from homeassistant.const import CONF_HOST
 
 from tests.common import MockConfigEntry, load_fixture, load_json_array_fixture
+from tests.components.smhi.common import AsyncMock
 
 
 @pytest.fixture
@@ -60,16 +51,9 @@ def mock_stream_magic_client() -> Generator[AsyncMock]:
             load_fixture("get_now_playing.json", DOMAIN)
         )
         client.display = Display.from_json(load_fixture("get_display.json", DOMAIN))
-        client.update = Update.from_json(load_fixture("get_update.json", DOMAIN))
-        client.preset_list = PresetList.from_json(
-            load_fixture("get_presets_list.json", DOMAIN)
-        )
-        client.audio_output = AudioOutput.from_json(
-            load_fixture("get_audio_output.json", DOMAIN)
-        )
         client.is_connected = Mock(return_value=True)
         client.position_last_updated = client.play_state.position
-        client.unregister_state_update_callbacks.return_value = True
+        client.unregister_state_update_callbacks = AsyncMock(return_value=True)
 
         yield client
 
diff --git a/tests/components/cambridge_audio/fixtures/get_audio_output.json b/tests/components/cambridge_audio/fixtures/get_audio_output.json
deleted file mode 100644
index e38ae037307..00000000000
--- a/tests/components/cambridge_audio/fixtures/get_audio_output.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "outputs": [
-    {
-      "id": "speaker_a",
-      "name": "Speaker A"
-    },
-    {
-      "id": "speaker_b",
-      "name": "Speaker B"
-    },
-    {
-      "id": "headphones",
-      "name": "Headphones"
-    }
-  ]
-}
diff --git a/tests/components/cambridge_audio/fixtures/get_presets_list.json b/tests/components/cambridge_audio/fixtures/get_presets_list.json
deleted file mode 100644
index 87d49e9fd30..00000000000
--- a/tests/components/cambridge_audio/fixtures/get_presets_list.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "start": 1,
-  "end": 99,
-  "max_presets": 99,
-  "presettable": true,
-  "presets": [
-    {
-      "id": 1,
-      "name": "Chicago House Radio",
-      "type": "Radio",
-      "class": "stream.radio",
-      "state": "OK",
-      "is_playing": false,
-      "art_url": "https://static.airable.io/43/68/432868.png",
-      "airable_radio_id": 5317566146608442
-    },
-    {
-      "id": 2,
-      "name": "Spotify: Good & Evil",
-      "type": "Spotify",
-      "class": "stream.service.spotify",
-      "state": "OK",
-      "is_playing": true,
-      "art_url": "https://i.scdn.co/image/ab67616d0000b27325a5a1ed28871e8e53e62d59"
-    },
-    {
-      "id": 3,
-      "name": "Unknown Preset Type",
-      "type": "Unknown",
-      "class": "stream.unknown",
-      "state": "OK"
-    }
-  ]
-}
diff --git a/tests/components/cambridge_audio/fixtures/get_update.json b/tests/components/cambridge_audio/fixtures/get_update.json
deleted file mode 100644
index a6fec6265c0..00000000000
--- a/tests/components/cambridge_audio/fixtures/get_update.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "early_update": false,
-  "update_available": false,
-  "updating": false
-}
diff --git a/tests/components/cambridge_audio/snapshots/test_diagnostics.ambr b/tests/components/cambridge_audio/snapshots/test_diagnostics.ambr
index 1ba9c4093f6..c554785006e 100644
--- a/tests/components/cambridge_audio/snapshots/test_diagnostics.ambr
+++ b/tests/components/cambridge_audio/snapshots/test_diagnostics.ambr
@@ -1,196 +1,51 @@
 # serializer version: 1
 # name: test_entry_diagnostics
   dict({
-    'display': dict({
-      'brightness': 'bright',
-    }),
     'info': dict({
-      'api_version': '1.8',
-      'locale': 'en_GB',
-      'model': 'CXNv2',
-      'name': 'Cambridge Audio CXNv2',
-      'timezone': 'America/Chicago',
-      'udn': '02680b5c-1320-4d54-9f7c-3cfe915ad4c3',
-      'unit_id': '0020c2d8',
-    }),
-    'now_playing': dict({
-      'controls': list([
-        'play_pause',
-        'track_next',
-        'track_previous',
-      ]),
-    }),
-    'play_state': dict({
-      'metadata': dict({
-        'album': "Greatest Hits: God's Favorite Band",
-        'art_url': 'http://192.168.20.218:80/album-art-2d89?id=1:246',
-        'artist': 'Green Day',
-        'bitrate': None,
-        'class_name': 'md.track',
-        'codec': 'ALAC',
-        'duration': 232,
-        'encoding': None,
-        'lossless': True,
-        'mqa': 'none',
-        'name': 'AirPlay',
-        'radio_id': None,
-        'sample_format': None,
-        'sample_rate': 44100,
-        'signal': None,
-        'source': 'AIRPLAY',
-        'station': None,
-        'title': 'Holiday',
-      }),
-      'mode_repeat': 'off',
-      'mode_shuffle': 'off',
-      'position': 179,
-      'presettable': False,
-      'state': 'play',
-    }),
-    'presets_list': dict({
-      'end': 99,
-      'max_presets': 99,
-      'presets': list([
-        dict({
-          'airable_radio_id': 5317566146608442,
-          'art_url': 'https://static.airable.io/43/68/432868.png',
-          'is_playing': False,
-          'name': 'Chicago House Radio',
-          'preset_class': 'stream.radio',
-          'preset_id': 1,
-          'state': 'OK',
-          'type': 'Radio',
-        }),
-        dict({
-          'airable_radio_id': None,
-          'art_url': 'https://i.scdn.co/image/ab67616d0000b27325a5a1ed28871e8e53e62d59',
-          'is_playing': True,
-          'name': 'Spotify: Good & Evil',
-          'preset_class': 'stream.service.spotify',
-          'preset_id': 2,
-          'state': 'OK',
-          'type': 'Spotify',
-        }),
-        dict({
-          'airable_radio_id': None,
-          'art_url': None,
-          'is_playing': False,
-          'name': 'Unknown Preset Type',
-          'preset_class': 'stream.unknown',
-          'preset_id': 3,
-          'state': 'OK',
-          'type': 'Unknown',
-        }),
-      ]),
-      'presettable': True,
-      'start': 1,
+      '__type': "<class 'aiostreammagic.models.Info'>",
+      'repr': "Info(name='Cambridge Audio CXNv2', model='CXNv2', timezone='America/Chicago', locale='en_GB', udn='02680b5c-1320-4d54-9f7c-3cfe915ad4c3', unit_id='0020c2d8', api_version='1.8')",
     }),
     'sources': list([
       dict({
-        'default_name': 'Internet Radio',
-        'description': 'Internet Radio',
-        'description_locale': 'Internet Radio',
-        'id': 'IR',
-        'name': 'Internet Radio',
-        'nameable': False,
-        'preferred_order': 9,
-        'ui_selectable': False,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='IR', name='Internet Radio', default_name='Internet Radio', nameable=False, ui_selectable=False, description='Internet Radio', description_locale='Internet Radio', preferred_order=9)",
       }),
       dict({
-        'default_name': 'USB Audio',
-        'description': 'USB Audio',
-        'description_locale': 'USB Audio',
-        'id': 'USB_AUDIO',
-        'name': 'USB Audio',
-        'nameable': True,
-        'preferred_order': 1,
-        'ui_selectable': True,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='USB_AUDIO', name='USB Audio', default_name='USB Audio', nameable=True, ui_selectable=True, description='USB Audio', description_locale='USB Audio', preferred_order=1)",
       }),
       dict({
-        'default_name': 'D2',
-        'description': 'Digital Co-axial',
-        'description_locale': 'Digital Co-axial',
-        'id': 'SPDIF_COAX',
-        'name': 'D2',
-        'nameable': True,
-        'preferred_order': 3,
-        'ui_selectable': False,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='SPDIF_COAX', name='D2', default_name='D2', nameable=True, ui_selectable=False, description='Digital Co-axial', description_locale='Digital Co-axial', preferred_order=3)",
       }),
       dict({
-        'default_name': 'D1',
-        'description': 'Digital Optical',
-        'description_locale': 'Digital Optical',
-        'id': 'SPDIF_TOSLINK',
-        'name': 'D1',
-        'nameable': True,
-        'preferred_order': 2,
-        'ui_selectable': False,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='SPDIF_TOSLINK', name='D1', default_name='D1', nameable=True, ui_selectable=False, description='Digital Optical', description_locale='Digital Optical', preferred_order=2)",
       }),
       dict({
-        'default_name': 'Media Library',
-        'description': 'Media Player',
-        'description_locale': 'Media Player',
-        'id': 'MEDIA_PLAYER',
-        'name': 'Media Library',
-        'nameable': False,
-        'preferred_order': 10,
-        'ui_selectable': True,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='MEDIA_PLAYER', name='Media Library', default_name='Media Library', nameable=False, ui_selectable=True, description='Media Player', description_locale='Media Player', preferred_order=10)",
       }),
       dict({
-        'default_name': 'AirPlay',
-        'description': 'AirPlay',
-        'description_locale': 'AirPlay',
-        'id': 'AIRPLAY',
-        'name': 'AirPlay',
-        'nameable': False,
-        'preferred_order': 11,
-        'ui_selectable': True,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='AIRPLAY', name='AirPlay', default_name='AirPlay', nameable=False, ui_selectable=True, description='AirPlay', description_locale='AirPlay', preferred_order=11)",
       }),
       dict({
-        'default_name': 'Spotify',
-        'description': 'Spotify',
-        'description_locale': 'Spotify',
-        'id': 'SPOTIFY',
-        'name': 'Spotify',
-        'nameable': False,
-        'preferred_order': 6,
-        'ui_selectable': True,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='SPOTIFY', name='Spotify', default_name='Spotify', nameable=False, ui_selectable=True, description='Spotify', description_locale='Spotify', preferred_order=6)",
       }),
       dict({
-        'default_name': 'Chromecast built-in',
-        'description': 'Chromecast built-in',
-        'description_locale': 'Chromecast built-in',
-        'id': 'CAST',
-        'name': 'Chromecast built-in',
-        'nameable': False,
-        'preferred_order': 8,
-        'ui_selectable': True,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='CAST', name='Chromecast built-in', default_name='Chromecast built-in', nameable=False, ui_selectable=True, description='Chromecast built-in', description_locale='Chromecast built-in', preferred_order=8)",
       }),
       dict({
-        'default_name': 'Roon Ready',
-        'description': 'Roon Ready',
-        'description_locale': 'Roon Ready',
-        'id': 'ROON',
-        'name': 'Roon Ready',
-        'nameable': False,
-        'preferred_order': 5,
-        'ui_selectable': False,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='ROON', name='Roon Ready', default_name='Roon Ready', nameable=False, ui_selectable=False, description='Roon Ready', description_locale='Roon Ready', preferred_order=5)",
       }),
       dict({
-        'default_name': 'TIDAL Connect',
-        'description': 'TIDAL',
-        'description_locale': 'TIDAL',
-        'id': 'TIDAL',
-        'name': 'TIDAL Connect',
-        'nameable': False,
-        'preferred_order': 7,
-        'ui_selectable': False,
+        '__type': "<class 'aiostreammagic.models.Source'>",
+        'repr': "Source(id='TIDAL', name='TIDAL Connect', default_name='TIDAL Connect', nameable=False, ui_selectable=False, description='TIDAL', description_locale='TIDAL', preferred_order=7)",
       }),
     ]),
-    'update': dict({
-      'early_update': False,
-      'update_available': False,
-      'updating': False,
-    }),
   })
 # ---
diff --git a/tests/components/cambridge_audio/snapshots/test_select.ambr b/tests/components/cambridge_audio/snapshots/test_select.ambr
index b40c8a8d5c4..39e1ea8f173 100644
--- a/tests/components/cambridge_audio/snapshots/test_select.ambr
+++ b/tests/components/cambridge_audio/snapshots/test_select.ambr
@@ -1,61 +1,4 @@
 # serializer version: 1
-# name: test_all_entities[select.cambridge_audio_cxnv2_audio_output-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        'Speaker A',
-        'Speaker B',
-        'Headphones',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'select',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'select.cambridge_audio_cxnv2_audio_output',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Audio output',
-    'platform': 'cambridge_audio',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'audio_output',
-    'unique_id': '0020c2d8-audio_output',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[select.cambridge_audio_cxnv2_audio_output-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Cambridge Audio CXNv2 Audio output',
-      'options': list([
-        'Speaker A',
-        'Speaker B',
-        'Headphones',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'select.cambridge_audio_cxnv2_audio_output',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
 # name: test_all_entities[select.cambridge_audio_cxnv2_display_brightness-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/cambridge_audio/snapshots/test_switch.ambr b/tests/components/cambridge_audio/snapshots/test_switch.ambr
deleted file mode 100644
index 9bfcd7c6da7..00000000000
--- a/tests/components/cambridge_audio/snapshots/test_switch.ambr
+++ /dev/null
@@ -1,93 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[switch.cambridge_audio_cxnv2_early_update-entry]
-  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.cambridge_audio_cxnv2_early_update',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Early update',
-    'platform': 'cambridge_audio',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'early_update',
-    'unique_id': '0020c2d8-early_update',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[switch.cambridge_audio_cxnv2_early_update-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Cambridge Audio CXNv2 Early update',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.cambridge_audio_cxnv2_early_update',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[switch.cambridge_audio_cxnv2_pre_amp-entry]
-  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.cambridge_audio_cxnv2_pre_amp',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Pre-Amp',
-    'platform': 'cambridge_audio',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'pre_amp',
-    'unique_id': '0020c2d8-pre_amp',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[switch.cambridge_audio_cxnv2_pre_amp-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Cambridge Audio CXNv2 Pre-Amp',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.cambridge_audio_cxnv2_pre_amp',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/cambridge_audio/test_init.py b/tests/components/cambridge_audio/test_init.py
index 4a8c1b668e2..7dea193d9fd 100644
--- a/tests/components/cambridge_audio/test_init.py
+++ b/tests/components/cambridge_audio/test_init.py
@@ -2,11 +2,9 @@
 
 from unittest.mock import AsyncMock
 
-from aiostreammagic import StreamMagicError
 from syrupy import SnapshotAssertion
 
 from homeassistant.components.cambridge_audio.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
@@ -15,20 +13,6 @@ from . import setup_integration
 from tests.common import MockConfigEntry
 
 
-async def test_config_entry_not_ready(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_stream_magic_client: AsyncMock,
-) -> None:
-    """Test the Cambridge Audio configuration entry not ready."""
-    mock_stream_magic_client.connect = AsyncMock(side_effect=StreamMagicError())
-    await setup_integration(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
-
-    mock_stream_magic_client.connect = AsyncMock(return_value=True)
-
-
 async def test_device_info(
     hass: HomeAssistant,
     snapshot: SnapshotAssertion,
diff --git a/tests/components/cambridge_audio/test_media_player.py b/tests/components/cambridge_audio/test_media_player.py
index b857e61c235..391cdd868ec 100644
--- a/tests/components/cambridge_audio/test_media_player.py
+++ b/tests/components/cambridge_audio/test_media_player.py
@@ -11,14 +11,10 @@ from aiostreammagic.models import CallbackType
 import pytest
 
 from homeassistant.components.media_player import (
-    ATTR_MEDIA_CONTENT_ID,
-    ATTR_MEDIA_CONTENT_TYPE,
     ATTR_MEDIA_REPEAT,
     ATTR_MEDIA_SEEK_POSITION,
     ATTR_MEDIA_SHUFFLE,
-    ATTR_MEDIA_VOLUME_LEVEL,
     DOMAIN as MP_DOMAIN,
-    SERVICE_PLAY_MEDIA,
     MediaPlayerEntityFeature,
     RepeatMode,
 )
@@ -35,9 +31,6 @@ from homeassistant.const import (
     SERVICE_SHUFFLE_SET,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
-    SERVICE_VOLUME_DOWN,
-    SERVICE_VOLUME_SET,
-    SERVICE_VOLUME_UP,
     STATE_BUFFERING,
     STATE_IDLE,
     STATE_OFF,
@@ -47,7 +40,6 @@ from homeassistant.const import (
     STATE_STANDBY,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 
 from . import setup_integration
 from .const import ENTITY_ID
@@ -57,8 +49,9 @@ from tests.common import MockConfigEntry
 
 async def mock_state_update(client: AsyncMock) -> None:
     """Trigger a callback in the media player."""
-    for callback in client.register_state_update_callbacks.call_args_list:
-        await callback[0][0](client, CallbackType.STATE)
+    await client.register_state_update_callbacks.call_args[0][0](
+        client, CallbackType.STATE
+    )
 
 
 async def test_entity_supported_features(
@@ -223,12 +216,12 @@ async def test_media_next_previous_track(
     mock_stream_magic_client.previous_track.assert_called_once()
 
 
-async def test_shuffle_repeat_set(
+async def test_shuffle_repeat(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_stream_magic_client: AsyncMock,
 ) -> None:
-    """Test shuffle and repeat set service."""
+    """Test shuffle and repeat service."""
     await setup_integration(hass, mock_config_entry)
 
     mock_stream_magic_client.now_playing.controls = [
@@ -271,36 +264,6 @@ async def test_shuffle_repeat_set(
     mock_stream_magic_client.set_repeat.assert_called_with(CambridgeRepeatMode.ALL)
 
 
-async def test_shuffle_repeat_get(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_stream_magic_client: AsyncMock,
-) -> None:
-    """Test shuffle and repeat get service."""
-    await setup_integration(hass, mock_config_entry)
-
-    mock_stream_magic_client.play_state.mode_shuffle = None
-
-    state = hass.states.get(ENTITY_ID)
-    assert state.attributes[ATTR_MEDIA_SHUFFLE] is False
-
-    mock_stream_magic_client.play_state.mode_shuffle = ShuffleMode.ALL
-
-    await mock_state_update(mock_stream_magic_client)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(ENTITY_ID)
-    assert state.attributes[ATTR_MEDIA_SHUFFLE] is True
-
-    mock_stream_magic_client.play_state.mode_repeat = CambridgeRepeatMode.ALL
-
-    await mock_state_update(mock_stream_magic_client)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(ENTITY_ID)
-    assert state.attributes[ATTR_MEDIA_REPEAT] == RepeatMode.ALL
-
-
 async def test_power_service(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -339,160 +302,3 @@ async def test_media_seek(
     )
 
     mock_stream_magic_client.media_seek.assert_called_once_with(100)
-
-
-async def test_media_volume(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_stream_magic_client: AsyncMock,
-) -> None:
-    """Test volume service."""
-    await setup_integration(hass, mock_config_entry)
-
-    mock_stream_magic_client.state.pre_amp_mode = True
-
-    # Test volume up
-    await hass.services.async_call(
-        MP_DOMAIN,
-        SERVICE_VOLUME_UP,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-    )
-
-    mock_stream_magic_client.volume_up.assert_called_once()
-
-    # Test volume down
-    await hass.services.async_call(
-        MP_DOMAIN,
-        SERVICE_VOLUME_DOWN,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-    )
-
-    mock_stream_magic_client.volume_down.assert_called_once()
-
-    await hass.services.async_call(
-        MP_DOMAIN,
-        SERVICE_VOLUME_SET,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.30},
-    )
-
-    mock_stream_magic_client.set_volume.assert_called_once_with(30)
-
-
-async def test_play_media_preset_item_id(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_stream_magic_client: AsyncMock,
-) -> None:
-    """Test playing media with a preset item id."""
-    await setup_integration(hass, mock_config_entry)
-
-    await hass.services.async_call(
-        MP_DOMAIN,
-        SERVICE_PLAY_MEDIA,
-        {
-            ATTR_ENTITY_ID: ENTITY_ID,
-            ATTR_MEDIA_CONTENT_TYPE: "preset",
-            ATTR_MEDIA_CONTENT_ID: "1",
-        },
-        blocking=True,
-    )
-    assert mock_stream_magic_client.recall_preset.call_count == 1
-    assert mock_stream_magic_client.recall_preset.call_args_list[0].args[0] == 1
-
-    with pytest.raises(ServiceValidationError, match="Missing preset for media_id: 10"):
-        await hass.services.async_call(
-            MP_DOMAIN,
-            SERVICE_PLAY_MEDIA,
-            {
-                ATTR_ENTITY_ID: ENTITY_ID,
-                ATTR_MEDIA_CONTENT_TYPE: "preset",
-                ATTR_MEDIA_CONTENT_ID: "10",
-            },
-            blocking=True,
-        )
-
-    with pytest.raises(
-        ServiceValidationError, match="Preset must be an integer, got: UNKNOWN_PRESET"
-    ):
-        await hass.services.async_call(
-            MP_DOMAIN,
-            SERVICE_PLAY_MEDIA,
-            {
-                ATTR_ENTITY_ID: ENTITY_ID,
-                ATTR_MEDIA_CONTENT_TYPE: "preset",
-                ATTR_MEDIA_CONTENT_ID: "UNKNOWN_PRESET",
-            },
-            blocking=True,
-        )
-
-
-async def test_play_media_airable_radio_id(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_stream_magic_client: AsyncMock,
-) -> None:
-    """Test playing media with an airable radio id."""
-    await setup_integration(hass, mock_config_entry)
-
-    await hass.services.async_call(
-        MP_DOMAIN,
-        SERVICE_PLAY_MEDIA,
-        {
-            ATTR_ENTITY_ID: ENTITY_ID,
-            ATTR_MEDIA_CONTENT_TYPE: "airable",
-            ATTR_MEDIA_CONTENT_ID: "12345678",
-        },
-        blocking=True,
-    )
-    assert mock_stream_magic_client.play_radio_airable.call_count == 1
-    call_args = mock_stream_magic_client.play_radio_airable.call_args_list[0].args
-    assert call_args[0] == "Radio"
-    assert call_args[1] == 12345678
-
-
-async def test_play_media_internet_radio(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_stream_magic_client: AsyncMock,
-) -> None:
-    """Test playing media with a url."""
-    await setup_integration(hass, mock_config_entry)
-
-    await hass.services.async_call(
-        MP_DOMAIN,
-        SERVICE_PLAY_MEDIA,
-        {
-            ATTR_ENTITY_ID: ENTITY_ID,
-            ATTR_MEDIA_CONTENT_TYPE: "internet_radio",
-            ATTR_MEDIA_CONTENT_ID: "https://example.com",
-        },
-        blocking=True,
-    )
-    assert mock_stream_magic_client.play_radio_url.call_count == 1
-    call_args = mock_stream_magic_client.play_radio_url.call_args_list[0].args
-    assert call_args[0] == "Radio"
-    assert call_args[1] == "https://example.com"
-
-
-async def test_play_media_unknown_type(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_stream_magic_client: AsyncMock,
-) -> None:
-    """Test playing media with an unsupported content type."""
-    await setup_integration(hass, mock_config_entry)
-
-    with pytest.raises(
-        HomeAssistantError,
-        match="Unsupported media type for Cambridge Audio device: unsupported_content_type",
-    ):
-        await hass.services.async_call(
-            MP_DOMAIN,
-            SERVICE_PLAY_MEDIA,
-            {
-                ATTR_ENTITY_ID: ENTITY_ID,
-                ATTR_MEDIA_CONTENT_TYPE: "unsupported_content_type",
-                ATTR_MEDIA_CONTENT_ID: "1",
-            },
-            blocking=True,
-        )
diff --git a/tests/components/cambridge_audio/test_select.py b/tests/components/cambridge_audio/test_select.py
index 473c4027163..e1185be45c0 100644
--- a/tests/components/cambridge_audio/test_select.py
+++ b/tests/components/cambridge_audio/test_select.py
@@ -51,14 +51,3 @@ async def test_setting_value(
         blocking=True,
     )
     mock_stream_magic_client.set_display_brightness.assert_called_once_with("dim")
-
-    await hass.services.async_call(
-        SELECT_DOMAIN,
-        SERVICE_SELECT_OPTION,
-        {
-            ATTR_ENTITY_ID: "select.cambridge_audio_cxnv2_audio_output",
-            ATTR_OPTION: "Speaker A",
-        },
-        blocking=True,
-    )
-    mock_stream_magic_client.set_audio_output.assert_called_once_with("speaker_a")
diff --git a/tests/components/cambridge_audio/test_switch.py b/tests/components/cambridge_audio/test_switch.py
deleted file mode 100644
index 3192f198d1f..00000000000
--- a/tests/components/cambridge_audio/test_switch.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""Tests for the Cambridge Audio switch platform."""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SERVICE_TURN_ON
-from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_stream_magic_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.cambridge_audio.PLATFORMS", [Platform.SWITCH]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-async def test_setting_value(
-    hass: HomeAssistant,
-    mock_stream_magic_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test setting value."""
-    await setup_integration(hass, mock_config_entry)
-
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_ON,
-        {
-            ATTR_ENTITY_ID: "switch.cambridge_audio_cxnv2_early_update",
-        },
-        blocking=True,
-    )
-    mock_stream_magic_client.set_early_update.assert_called_once_with(True)
-    mock_stream_magic_client.set_early_update.reset_mock()
-
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_OFF,
-        {
-            ATTR_ENTITY_ID: "switch.cambridge_audio_cxnv2_early_update",
-        },
-        blocking=True,
-    )
-    mock_stream_magic_client.set_early_update.assert_called_once_with(False)
diff --git a/tests/components/camera/common.py b/tests/components/camera/common.py
index 569756c2640..f7dcf46db01 100644
--- a/tests/components/camera/common.py
+++ b/tests/components/camera/common.py
@@ -6,16 +6,6 @@ components. Instead call the service directly.
 
 from unittest.mock import Mock
 
-from webrtc_models import RTCIceCandidate
-
-from homeassistant.components.camera import (
-    Camera,
-    CameraWebRTCProvider,
-    WebRTCAnswer,
-    WebRTCSendMessage,
-)
-from homeassistant.core import callback
-
 EMPTY_8_6_JPEG = b"empty_8_6"
 WEBRTC_ANSWER = "a=sendonly"
 STREAM_SOURCE = "rtsp://127.0.0.1/stream"
@@ -33,43 +23,3 @@ def mock_turbo_jpeg(
     mocked_turbo_jpeg.scale_with_quality.return_value = EMPTY_8_6_JPEG
     mocked_turbo_jpeg.encode.return_value = EMPTY_8_6_JPEG
     return mocked_turbo_jpeg
-
-
-class SomeTestProvider(CameraWebRTCProvider):
-    """Test provider."""
-
-    def __init__(self) -> None:
-        """Initialize the provider."""
-        self._is_supported = True
-
-    @property
-    def domain(self) -> str:
-        """Return the integration domain of the provider."""
-        return "some_test"
-
-    @callback
-    def async_is_supported(self, stream_source: str) -> bool:
-        """Determine if the provider supports the stream source."""
-        return self._is_supported
-
-    async def async_handle_async_webrtc_offer(
-        self,
-        camera: Camera,
-        offer_sdp: str,
-        session_id: str,
-        send_message: WebRTCSendMessage,
-    ) -> None:
-        """Handle the WebRTC offer and return the answer via the provided callback.
-
-        Return value determines if the offer was handled successfully.
-        """
-        send_message(WebRTCAnswer(answer="answer"))
-
-    async def async_on_webrtc_candidate(
-        self, session_id: str, candidate: RTCIceCandidate
-    ) -> None:
-        """Handle the WebRTC candidate."""
-
-    @callback
-    def async_close_session(self, session_id: str) -> None:
-        """Close the session."""
diff --git a/tests/components/camera/conftest.py b/tests/components/camera/conftest.py
index f0c418711c7..5eda2f1eb55 100644
--- a/tests/components/camera/conftest.py
+++ b/tests/components/camera/conftest.py
@@ -1,30 +1,18 @@
 """Test helpers for camera."""
 
 from collections.abc import AsyncGenerator, Generator
-from unittest.mock import AsyncMock, Mock, PropertyMock, patch
+from unittest.mock import AsyncMock, PropertyMock, patch
 
 import pytest
-from webrtc_models import RTCIceCandidate
 
 from homeassistant.components import camera
 from homeassistant.components.camera.const import StreamType
-from homeassistant.components.camera.webrtc import WebRTCAnswer, WebRTCSendMessage
-from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.setup import async_setup_component
 
-from .common import STREAM_SOURCE, WEBRTC_ANSWER, SomeTestProvider
-
-from tests.common import (
-    MockConfigEntry,
-    MockModule,
-    mock_config_flow,
-    mock_integration,
-    mock_platform,
-    setup_test_component_platform,
-)
+from .common import STREAM_SOURCE, WEBRTC_ANSWER
 
 
 @pytest.fixture(autouse=True)
@@ -68,37 +56,23 @@ def mock_camera_hls_fixture(mock_camera: None) -> Generator[None]:
         yield
 
 
-@pytest.fixture
-async def mock_camera_webrtc_frontendtype_only(
-    hass: HomeAssistant,
-) -> AsyncGenerator[None]:
+@pytest.fixture(name="mock_camera_web_rtc")
+async def mock_camera_web_rtc_fixture(hass: HomeAssistant) -> AsyncGenerator[None]:
     """Initialize a demo camera platform with WebRTC."""
     assert await async_setup_component(
         hass, "camera", {camera.DOMAIN: {"platform": "demo"}}
     )
     await hass.async_block_till_done()
 
-    with patch(
-        "homeassistant.components.camera.Camera.frontend_stream_type",
-        new_callable=PropertyMock(return_value=StreamType.WEB_RTC),
-    ):
-        yield
-
-
-@pytest.fixture
-async def mock_camera_webrtc(
-    mock_camera_webrtc_frontendtype_only: None,
-) -> AsyncGenerator[None]:
-    """Initialize a demo camera platform with WebRTC."""
-
-    async def async_handle_async_webrtc_offer(
-        offer_sdp: str, session_id: str, send_message: WebRTCSendMessage
-    ) -> None:
-        send_message(WebRTCAnswer(WEBRTC_ANSWER))
-
-    with patch(
-        "homeassistant.components.camera.Camera.async_handle_async_webrtc_offer",
-        side_effect=async_handle_async_webrtc_offer,
+    with (
+        patch(
+            "homeassistant.components.camera.Camera.frontend_stream_type",
+            new_callable=PropertyMock(return_value=StreamType.WEB_RTC),
+        ),
+        patch(
+            "homeassistant.components.camera.Camera.async_handle_web_rtc_offer",
+            return_value=WEBRTC_ANSWER,
+        ),
     ):
         yield
 
@@ -153,100 +127,3 @@ def mock_stream_source_fixture() -> Generator[AsyncMock]:
         return_value=STREAM_SOURCE,
     ) as mock_stream_source:
         yield mock_stream_source
-
-
-@pytest.fixture
-async def mock_test_webrtc_cameras(hass: HomeAssistant) -> None:
-    """Initialize test WebRTC cameras with native RTC support."""
-
-    # Cannot use the fixture mock_camera_web_rtc as it's mocking Camera.async_handle_web_rtc_offer
-    # and native support is checked by verify the function "async_handle_web_rtc_offer" was
-    # overwritten(implemented) or not
-    class BaseCamera(camera.Camera):
-        """Base Camera."""
-
-        _attr_supported_features: camera.CameraEntityFeature = (
-            camera.CameraEntityFeature.STREAM
-        )
-        _attr_frontend_stream_type: camera.StreamType = camera.StreamType.WEB_RTC
-
-        async def stream_source(self) -> str | None:
-            return STREAM_SOURCE
-
-    class SyncCamera(BaseCamera):
-        """Mock Camera with native sync WebRTC support."""
-
-        _attr_name = "Sync"
-
-        async def async_handle_web_rtc_offer(self, offer_sdp: str) -> str | None:
-            return WEBRTC_ANSWER
-
-    class AsyncCamera(BaseCamera):
-        """Mock Camera with native async WebRTC support."""
-
-        _attr_name = "Async"
-
-        async def async_handle_async_webrtc_offer(
-            self, offer_sdp: str, session_id: str, send_message: WebRTCSendMessage
-        ) -> None:
-            send_message(WebRTCAnswer(WEBRTC_ANSWER))
-
-        async def async_on_webrtc_candidate(
-            self, session_id: str, candidate: RTCIceCandidate
-        ) -> None:
-            """Handle a WebRTC candidate."""
-            # Do nothing
-
-    domain = "test"
-
-    entry = MockConfigEntry(domain=domain)
-    entry.add_to_hass(hass)
-
-    async def async_setup_entry_init(
-        hass: HomeAssistant, config_entry: ConfigEntry
-    ) -> bool:
-        """Set up test config entry."""
-        await hass.config_entries.async_forward_entry_setups(
-            config_entry, [camera.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, camera.DOMAIN
-        )
-        return True
-
-    mock_integration(
-        hass,
-        MockModule(
-            domain,
-            async_setup_entry=async_setup_entry_init,
-            async_unload_entry=async_unload_entry_init,
-        ),
-    )
-    setup_test_component_platform(
-        hass, camera.DOMAIN, [SyncCamera(), AsyncCamera()], from_config_entry=True
-    )
-    mock_platform(hass, f"{domain}.config_flow", Mock())
-
-    with mock_config_flow(domain, ConfigFlow):
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-
-@pytest.fixture
-async def register_test_provider(
-    hass: HomeAssistant,
-) -> AsyncGenerator[SomeTestProvider]:
-    """Add WebRTC test provider."""
-    await async_setup_component(hass, "camera", {})
-
-    provider = SomeTestProvider()
-    unsub = camera.async_register_webrtc_provider(hass, provider)
-    await hass.async_block_till_done()
-    yield provider
-    unsub()
diff --git a/tests/components/camera/test_init.py b/tests/components/camera/test_init.py
index 32024694b7e..687b533e941 100644
--- a/tests/components/camera/test_init.py
+++ b/tests/components/camera/test_init.py
@@ -1,5 +1,6 @@
 """The tests for the camera component."""
 
+from collections.abc import Generator
 from http import HTTPStatus
 import io
 from types import ModuleType
@@ -7,37 +8,27 @@ from unittest.mock import ANY, AsyncMock, Mock, PropertyMock, mock_open, patch
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
-from webrtc_models import RTCIceCandidate
 
 from homeassistant.components import camera
-from homeassistant.components.camera import (
-    Camera,
-    CameraWebRTCProvider,
-    WebRTCAnswer,
-    WebRTCSendMessage,
-    async_register_webrtc_provider,
-)
 from homeassistant.components.camera.const import (
     DOMAIN,
     PREF_ORIENTATION,
     PREF_PRELOAD_STREAM,
-    StreamType,
 )
-from homeassistant.components.camera.helper import get_camera_from_entity_id
 from homeassistant.components.websocket_api import TYPE_RESULT
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     EVENT_HOMEASSISTANT_STARTED,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.core_config import async_process_ha_core_config
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er, issue_registry as ir
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
-from .common import EMPTY_8_6_JPEG, STREAM_SOURCE, mock_turbo_jpeg
+from .common import EMPTY_8_6_JPEG, STREAM_SOURCE, WEBRTC_ANSWER, mock_turbo_jpeg
 
 from tests.common import (
     async_fire_time_changed,
@@ -46,6 +37,9 @@ from tests.common import (
 )
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
 
+HLS_STREAM_SOURCE = "http://127.0.0.1/example.m3u"
+WEBRTC_OFFER = "v=0\r\n"
+
 
 @pytest.fixture(name="image_mock_url")
 async def image_mock_url_fixture(hass: HomeAssistant) -> None:
@@ -56,6 +50,34 @@ async def image_mock_url_fixture(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
 
+@pytest.fixture(name="mock_hls_stream_source")
+async def mock_hls_stream_source_fixture() -> Generator[AsyncMock]:
+    """Fixture to create an HLS stream source."""
+    with patch(
+        "homeassistant.components.camera.Camera.stream_source",
+        return_value=HLS_STREAM_SOURCE,
+    ) as mock_hls_stream_source:
+        yield mock_hls_stream_source
+
+
+async def provide_web_rtc_answer(stream_source: str, offer: str, stream_id: str) -> str:
+    """Simulate an rtsp to webrtc provider."""
+    assert stream_source == STREAM_SOURCE
+    assert offer == WEBRTC_OFFER
+    return WEBRTC_ANSWER
+
+
+@pytest.fixture(name="mock_rtsp_to_web_rtc")
+def mock_rtsp_to_web_rtc_fixture(hass: HomeAssistant) -> Generator[Mock]:
+    """Fixture that registers a mock rtsp to web_rtc provider."""
+    mock_provider = Mock(side_effect=provide_web_rtc_answer)
+    unsub = camera.async_register_rtsp_to_web_rtc_provider(
+        hass, "mock_domain", mock_provider
+    )
+    yield mock_provider
+    unsub()
+
+
 @pytest.mark.usefixtures("image_mock_url")
 async def test_get_image_from_camera(hass: HomeAssistant) -> None:
     """Grab an image from camera entity."""
@@ -683,6 +705,148 @@ async def test_camera_proxy_stream(hass_client: ClientSessionGenerator) -> None:
             assert response.status == HTTPStatus.BAD_GATEWAY
 
 
+@pytest.mark.usefixtures("mock_camera_web_rtc")
+async def test_websocket_web_rtc_offer(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test initiating a WebRTC stream with offer and answer."""
+    client = await hass_ws_client(hass)
+    await client.send_json(
+        {
+            "id": 9,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["id"] == 9
+    assert response["type"] == TYPE_RESULT
+    assert response["success"]
+    assert response["result"]["answer"] == WEBRTC_ANSWER
+
+
+@pytest.mark.usefixtures("mock_camera_web_rtc")
+async def test_websocket_web_rtc_offer_invalid_entity(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test WebRTC with a camera entity that does not exist."""
+    client = await hass_ws_client(hass)
+    await client.send_json(
+        {
+            "id": 9,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.does_not_exist",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["id"] == 9
+    assert response["type"] == TYPE_RESULT
+    assert not response["success"]
+
+
+@pytest.mark.usefixtures("mock_camera_web_rtc")
+async def test_websocket_web_rtc_offer_missing_offer(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test WebRTC stream with missing required fields."""
+    client = await hass_ws_client(hass)
+    await client.send_json(
+        {
+            "id": 9,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["id"] == 9
+    assert response["type"] == TYPE_RESULT
+    assert not response["success"]
+    assert response["error"]["code"] == "invalid_format"
+
+
+@pytest.mark.usefixtures("mock_camera_web_rtc")
+async def test_websocket_web_rtc_offer_failure(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test WebRTC stream that fails handling the offer."""
+    client = await hass_ws_client(hass)
+
+    with patch(
+        "homeassistant.components.camera.Camera.async_handle_web_rtc_offer",
+        side_effect=HomeAssistantError("offer failed"),
+    ):
+        await client.send_json(
+            {
+                "id": 9,
+                "type": "camera/web_rtc_offer",
+                "entity_id": "camera.demo_camera",
+                "offer": WEBRTC_OFFER,
+            }
+        )
+        response = await client.receive_json()
+
+    assert response["id"] == 9
+    assert response["type"] == TYPE_RESULT
+    assert not response["success"]
+    assert response["error"]["code"] == "web_rtc_offer_failed"
+    assert response["error"]["message"] == "offer failed"
+
+
+@pytest.mark.usefixtures("mock_camera_web_rtc")
+async def test_websocket_web_rtc_offer_timeout(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test WebRTC stream with timeout handling the offer."""
+    client = await hass_ws_client(hass)
+
+    with patch(
+        "homeassistant.components.camera.Camera.async_handle_web_rtc_offer",
+        side_effect=TimeoutError(),
+    ):
+        await client.send_json(
+            {
+                "id": 9,
+                "type": "camera/web_rtc_offer",
+                "entity_id": "camera.demo_camera",
+                "offer": WEBRTC_OFFER,
+            }
+        )
+        response = await client.receive_json()
+
+    assert response["id"] == 9
+    assert response["type"] == TYPE_RESULT
+    assert not response["success"]
+    assert response["error"]["code"] == "web_rtc_offer_failed"
+    assert response["error"]["message"] == "Timeout handling WebRTC offer"
+
+
+@pytest.mark.usefixtures("mock_camera")
+async def test_websocket_web_rtc_offer_invalid_stream_type(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test WebRTC initiating for a camera with a different stream_type."""
+    client = await hass_ws_client(hass)
+    await client.send_json(
+        {
+            "id": 9,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response["id"] == 9
+    assert response["type"] == TYPE_RESULT
+    assert not response["success"]
+    assert response["error"]["code"] == "web_rtc_offer_failed"
+
+
 @pytest.mark.usefixtures("mock_camera")
 async def test_state_streaming(hass: HomeAssistant) -> None:
     """Camera state."""
@@ -744,6 +908,144 @@ async def test_stream_unavailable(
     assert demo_camera.state == camera.CameraState.STREAMING
 
 
+@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
+async def test_rtsp_to_web_rtc_offer(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    mock_rtsp_to_web_rtc: Mock,
+) -> None:
+    """Test creating a web_rtc offer from an rstp provider."""
+    client = await hass_ws_client(hass)
+    await client.send_json(
+        {
+            "id": 9,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response.get("id") == 9
+    assert response.get("type") == TYPE_RESULT
+    assert response.get("success")
+    assert "result" in response
+    assert response["result"] == {"answer": WEBRTC_ANSWER}
+
+    assert mock_rtsp_to_web_rtc.called
+
+
+@pytest.mark.usefixtures(
+    "mock_camera",
+    "mock_hls_stream_source",  # Not an RTSP stream source
+    "mock_rtsp_to_web_rtc",
+)
+async def test_unsupported_rtsp_to_web_rtc_stream_type(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test rtsp-to-webrtc is not registered for non-RTSP streams."""
+    client = await hass_ws_client(hass)
+    await client.send_json(
+        {
+            "id": 10,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+
+    assert response.get("id") == 10
+    assert response.get("type") == TYPE_RESULT
+    assert "success" in response
+    assert not response["success"]
+
+
+@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
+async def test_rtsp_to_web_rtc_provider_unregistered(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test creating a web_rtc offer from an rstp provider."""
+    mock_provider = Mock(side_effect=provide_web_rtc_answer)
+    unsub = camera.async_register_rtsp_to_web_rtc_provider(
+        hass, "mock_domain", mock_provider
+    )
+
+    client = await hass_ws_client(hass)
+
+    # Registered provider can handle the WebRTC offer
+    await client.send_json(
+        {
+            "id": 11,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+    assert response["id"] == 11
+    assert response["type"] == TYPE_RESULT
+    assert response["success"]
+    assert response["result"]["answer"] == WEBRTC_ANSWER
+
+    assert mock_provider.called
+    mock_provider.reset_mock()
+
+    # Unregister provider, then verify the WebRTC offer cannot be handled
+    unsub()
+    await client.send_json(
+        {
+            "id": 12,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+    assert response.get("id") == 12
+    assert response.get("type") == TYPE_RESULT
+    assert "success" in response
+    assert not response["success"]
+
+    assert not mock_provider.called
+
+
+@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
+async def test_rtsp_to_web_rtc_offer_not_accepted(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test a provider that can't satisfy the rtsp to webrtc offer."""
+
+    async def provide_none(stream_source: str, offer: str) -> str:
+        """Simulate a provider that can't accept the offer."""
+        return None
+
+    mock_provider = Mock(side_effect=provide_none)
+    unsub = camera.async_register_rtsp_to_web_rtc_provider(
+        hass, "mock_domain", mock_provider
+    )
+    client = await hass_ws_client(hass)
+
+    # Registered provider can handle the WebRTC offer
+    await client.send_json(
+        {
+            "id": 11,
+            "type": "camera/web_rtc_offer",
+            "entity_id": "camera.demo_camera",
+            "offer": WEBRTC_OFFER,
+        }
+    )
+    response = await client.receive_json()
+    assert response["id"] == 11
+    assert response.get("type") == TYPE_RESULT
+    assert "success" in response
+    assert not response["success"]
+
+    assert mock_provider.called
+
+    unsub()
+
+
 @pytest.mark.usefixtures("mock_camera")
 async def test_use_stream_for_stills(
     hass: HomeAssistant, hass_client: ClientSessionGenerator
@@ -895,162 +1197,3 @@ async def test_entity_picture_url_changes_on_token_update(hass: HomeAssistant) -
     new_entity_picture = camera_state.attributes["entity_picture"]
     assert new_entity_picture != original_picture
     assert "token=" in new_entity_picture
-
-
-async def _test_capabilities(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    entity_id: str,
-    expected_stream_types: set[StreamType],
-    expected_stream_types_with_webrtc_provider: set[StreamType],
-) -> None:
-    """Test camera capabilities."""
-    await async_setup_component(hass, "camera", {})
-    await hass.async_block_till_done()
-
-    async def test(expected_types: set[StreamType]) -> None:
-        camera_obj = get_camera_from_entity_id(hass, entity_id)
-        capabilities = camera_obj.camera_capabilities
-        assert capabilities == camera.CameraCapabilities(expected_types)
-
-        # Request capabilities through WebSocket
-        client = await hass_ws_client(hass)
-        await client.send_json_auto_id(
-            {"type": "camera/capabilities", "entity_id": entity_id}
-        )
-        msg = await client.receive_json()
-
-        # Assert WebSocket response
-        assert msg["type"] == TYPE_RESULT
-        assert msg["success"]
-        assert msg["result"] == {"frontend_stream_types": ANY}
-        assert sorted(msg["result"]["frontend_stream_types"]) == sorted(expected_types)
-
-    await test(expected_stream_types)
-
-    # Test with WebRTC provider
-
-    class SomeTestProvider(CameraWebRTCProvider):
-        """Test provider."""
-
-        @property
-        def domain(self) -> str:
-            """Return domain."""
-            return "test"
-
-        @callback
-        def async_is_supported(self, stream_source: str) -> bool:
-            """Determine if the provider supports the stream source."""
-            return True
-
-        async def async_handle_async_webrtc_offer(
-            self,
-            camera: Camera,
-            offer_sdp: str,
-            session_id: str,
-            send_message: WebRTCSendMessage,
-        ) -> None:
-            """Handle the WebRTC offer and return the answer via the provided callback."""
-            send_message(WebRTCAnswer("answer"))
-
-        async def async_on_webrtc_candidate(
-            self, session_id: str, candidate: RTCIceCandidate
-        ) -> None:
-            """Handle the WebRTC candidate."""
-
-    provider = SomeTestProvider()
-    async_register_webrtc_provider(hass, provider)
-    await hass.async_block_till_done()
-    await test(expected_stream_types_with_webrtc_provider)
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
-async def test_camera_capabilities_hls(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test HLS camera capabilities."""
-    await _test_capabilities(
-        hass,
-        hass_ws_client,
-        "camera.demo_camera",
-        {StreamType.HLS},
-        {StreamType.HLS, StreamType.WEB_RTC},
-    )
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_camera_capabilities_webrtc(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test WebRTC camera capabilities."""
-
-    await _test_capabilities(
-        hass, hass_ws_client, "camera.sync", {StreamType.WEB_RTC}, {StreamType.WEB_RTC}
-    )
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "expect_native_async_webrtc"),
-    [("camera.sync", False), ("camera.async", True)],
-)
-@pytest.mark.usefixtures("mock_test_webrtc_cameras", "register_test_provider")
-async def test_webrtc_provider_not_added_for_native_webrtc(
-    hass: HomeAssistant, entity_id: str, expect_native_async_webrtc: bool
-) -> None:
-    """Test that a WebRTC provider is not added to a camera when the camera has native WebRTC support."""
-    camera_obj = get_camera_from_entity_id(hass, entity_id)
-    assert camera_obj
-    assert camera_obj._webrtc_provider is None
-    assert camera_obj._supports_native_sync_webrtc is not expect_native_async_webrtc
-    assert camera_obj._supports_native_async_webrtc is expect_native_async_webrtc
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
-async def test_camera_capabilities_changing_non_native_support(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test WebRTC camera capabilities."""
-    cam = get_camera_from_entity_id(hass, "camera.demo_camera")
-    assert (
-        cam.supported_features
-        == camera.CameraEntityFeature.ON_OFF | camera.CameraEntityFeature.STREAM
-    )
-
-    await _test_capabilities(
-        hass,
-        hass_ws_client,
-        cam.entity_id,
-        {StreamType.HLS},
-        {StreamType.HLS, StreamType.WEB_RTC},
-    )
-
-    cam._attr_supported_features = camera.CameraEntityFeature(0)
-    cam.async_write_ha_state()
-    await hass.async_block_till_done()
-
-    await _test_capabilities(hass, hass_ws_client, cam.entity_id, set(), set())
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-@pytest.mark.parametrize(("entity_id"), ["camera.sync", "camera.async"])
-async def test_camera_capabilities_changing_native_support(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    entity_id: str,
-) -> None:
-    """Test WebRTC camera capabilities."""
-    cam = get_camera_from_entity_id(hass, entity_id)
-    assert cam.supported_features == camera.CameraEntityFeature.STREAM
-
-    await _test_capabilities(
-        hass, hass_ws_client, cam.entity_id, {StreamType.WEB_RTC}, {StreamType.WEB_RTC}
-    )
-
-    cam._attr_supported_features = camera.CameraEntityFeature(0)
-    cam.async_write_ha_state()
-    await hass.async_block_till_done()
-
-    await _test_capabilities(hass, hass_ws_client, cam.entity_id, set(), set())
diff --git a/tests/components/camera/test_media_source.py b/tests/components/camera/test_media_source.py
index 85f876d4e81..0780ecc2a9c 100644
--- a/tests/components/camera/test_media_source.py
+++ b/tests/components/camera/test_media_source.py
@@ -65,8 +65,8 @@ async def test_browsing_mjpeg(hass: HomeAssistant) -> None:
     assert item.children[0].title == "Demo camera without stream"
 
 
-@pytest.mark.usefixtures("mock_camera_webrtc")
-async def test_browsing_webrtc(hass: HomeAssistant) -> None:
+@pytest.mark.usefixtures("mock_camera_web_rtc")
+async def test_browsing_web_rtc(hass: HomeAssistant) -> None:
     """Test browsing WebRTC camera media source."""
     # 3 cameras:
     # one only supports WebRTC (no stream source)
diff --git a/tests/components/camera/test_webrtc.py b/tests/components/camera/test_webrtc.py
index 29fb9d61c4e..406c48ab203 100644
--- a/tests/components/camera/test_webrtc.py
+++ b/tests/components/camera/test_webrtc.py
@@ -1,253 +1,167 @@
 """Test camera WebRTC."""
 
-from collections.abc import AsyncGenerator, Generator
-import logging
-from typing import Any
-from unittest.mock import AsyncMock, Mock, patch
-
 import pytest
-from webrtc_models import RTCIceCandidate, RTCIceServer
 
-from homeassistant.components.camera import (
+from homeassistant.components.camera import Camera
+from homeassistant.components.camera.const import StreamType
+from homeassistant.components.camera.helper import get_camera_from_entity_id
+from homeassistant.components.camera.webrtc import (
     DATA_ICE_SERVERS,
-    DOMAIN as CAMERA_DOMAIN,
-    Camera,
-    CameraEntityFeature,
     CameraWebRTCProvider,
-    StreamType,
-    WebRTCAnswer,
-    WebRTCCandidate,
-    WebRTCError,
-    WebRTCMessage,
-    WebRTCSendMessage,
-    async_get_supported_legacy_provider,
-    async_register_ice_servers,
-    async_register_rtsp_to_web_rtc_provider,
+    RTCIceServer,
     async_register_webrtc_provider,
-    get_camera_from_entity_id,
+    register_ice_server,
 )
 from homeassistant.components.websocket_api import TYPE_RESULT
-from homeassistant.config_entries import ConfigEntry, ConfigFlow
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.core_config import async_process_ha_core_config
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import issue_registry as ir
+from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from .common import STREAM_SOURCE, WEBRTC_ANSWER, SomeTestProvider
-
-from tests.common import (
-    MockConfigEntry,
-    MockModule,
-    mock_config_flow,
-    mock_integration,
-    mock_platform,
-    setup_test_component_platform,
-)
 from tests.typing import WebSocketGenerator
 
-WEBRTC_OFFER = "v=0\r\n"
-HLS_STREAM_SOURCE = "http://127.0.0.1/example.m3u"
-TEST_INTEGRATION_DOMAIN = "test"
 
-
-class Go2RTCProvider(SomeTestProvider):
-    """go2rtc provider."""
-
-    @property
-    def domain(self) -> str:
-        """Return the integration domain of the provider."""
-        return "go2rtc"
-
-
-class MockCamera(Camera):
-    """Mock Camera Entity."""
-
-    _attr_name = "Test"
-    _attr_supported_features: CameraEntityFeature = CameraEntityFeature.STREAM
-    _attr_frontend_stream_type: StreamType = StreamType.WEB_RTC
-
-    def __init__(self) -> None:
-        """Initialize the mock entity."""
-        super().__init__()
-        self._sync_answer: str | None | Exception = WEBRTC_ANSWER
-
-    def set_sync_answer(self, value: str | None | Exception) -> None:
-        """Set sync offer answer."""
-        self._sync_answer = value
-
-    async def async_handle_web_rtc_offer(self, offer_sdp: str) -> str | None:
-        """Handle the WebRTC offer and return the answer."""
-        if isinstance(self._sync_answer, Exception):
-            raise self._sync_answer
-        return self._sync_answer
-
-    async def stream_source(self) -> str | None:
-        """Return the source of the stream.
-
-        This is used by cameras with CameraEntityFeature.STREAM
-        and StreamType.HLS.
-        """
-        return "rtsp://stream"
-
-
-@pytest.fixture
-async def init_test_integration(
-    hass: HomeAssistant,
-) -> MockCamera:
-    """Initialize components."""
-
-    entry = MockConfigEntry(domain=TEST_INTEGRATION_DOMAIN)
-    entry.add_to_hass(hass)
-
-    async def async_setup_entry_init(
-        hass: HomeAssistant, config_entry: ConfigEntry
-    ) -> bool:
-        """Set up test config entry."""
-        await hass.config_entries.async_forward_entry_setups(
-            config_entry, [CAMERA_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, CAMERA_DOMAIN
-        )
-        return True
-
-    mock_integration(
-        hass,
-        MockModule(
-            TEST_INTEGRATION_DOMAIN,
-            async_setup_entry=async_setup_entry_init,
-            async_unload_entry=async_unload_entry_init,
-        ),
-    )
-    test_camera = MockCamera()
-    setup_test_component_platform(
-        hass, CAMERA_DOMAIN, [test_camera], from_config_entry=True
-    )
-    mock_platform(hass, f"{TEST_INTEGRATION_DOMAIN}.config_flow", Mock())
-
-    with mock_config_flow(TEST_INTEGRATION_DOMAIN, ConfigFlow):
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    return test_camera
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
+@pytest.mark.usefixtures("mock_camera", "mock_stream", "mock_stream_source")
 async def test_async_register_webrtc_provider(
     hass: HomeAssistant,
 ) -> None:
     """Test registering a WebRTC provider."""
-    camera = get_camera_from_entity_id(hass, "camera.demo_camera")
-    assert camera.camera_capabilities.frontend_stream_types == {StreamType.HLS}
+    await async_setup_component(hass, "camera", {})
 
-    provider = SomeTestProvider()
-    unregister = async_register_webrtc_provider(hass, provider)
+    camera = get_camera_from_entity_id(hass, "camera.demo_camera")
+    assert camera.frontend_stream_type is StreamType.HLS
+
+    stream_supported = True
+
+    class TestProvider(CameraWebRTCProvider):
+        """Test provider."""
+
+        async def async_is_supported(self, stream_source: str) -> bool:
+            """Determine if the provider supports the stream source."""
+            nonlocal stream_supported
+            return stream_supported
+
+        async def async_handle_web_rtc_offer(
+            self, camera: Camera, offer_sdp: str
+        ) -> str | None:
+            """Handle the WebRTC offer and return an answer."""
+            return "answer"
+
+    unregister = async_register_webrtc_provider(hass, TestProvider())
     await hass.async_block_till_done()
 
-    assert camera.camera_capabilities.frontend_stream_types == {
-        StreamType.HLS,
-        StreamType.WEB_RTC,
-    }
+    assert camera.frontend_stream_type is StreamType.WEB_RTC
 
     # Mark stream as unsupported
-    provider._is_supported = False
+    stream_supported = False
     # Manually refresh the provider
     await camera.async_refresh_providers()
 
-    assert camera.camera_capabilities.frontend_stream_types == {StreamType.HLS}
+    assert camera.frontend_stream_type is StreamType.HLS
 
-    # Mark stream as supported
-    provider._is_supported = True
+    # Mark stream as unsupported
+    stream_supported = True
     # Manually refresh the provider
     await camera.async_refresh_providers()
-    assert camera.camera_capabilities.frontend_stream_types == {
-        StreamType.HLS,
-        StreamType.WEB_RTC,
-    }
+    assert camera.frontend_stream_type is StreamType.WEB_RTC
 
     unregister()
     await hass.async_block_till_done()
 
-    assert camera.camera_capabilities.frontend_stream_types == {StreamType.HLS}
+    assert camera.frontend_stream_type is StreamType.HLS
 
 
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
+@pytest.mark.usefixtures("mock_camera", "mock_stream", "mock_stream_source")
 async def test_async_register_webrtc_provider_twice(
     hass: HomeAssistant,
-    register_test_provider: SomeTestProvider,
 ) -> None:
     """Test registering a WebRTC provider twice should raise."""
+    await async_setup_component(hass, "camera", {})
+
+    class TestProvider(CameraWebRTCProvider):
+        """Test provider."""
+
+        async def async_is_supported(self, stream_source: str) -> bool:
+            """Determine if the provider supports the stream source."""
+            return True
+
+        async def async_handle_web_rtc_offer(
+            self, camera: Camera, offer_sdp: str
+        ) -> str | None:
+            """Handle the WebRTC offer and return an answer."""
+            return "answer"
+
+    provider = TestProvider()
+    async_register_webrtc_provider(hass, provider)
+    await hass.async_block_till_done()
+
     with pytest.raises(ValueError, match="Provider already registered"):
-        async_register_webrtc_provider(hass, register_test_provider)
+        async_register_webrtc_provider(hass, provider)
 
 
 async def test_async_register_webrtc_provider_camera_not_loaded(
     hass: HomeAssistant,
 ) -> None:
     """Test registering a WebRTC provider when camera is not loaded."""
+
+    class TestProvider(CameraWebRTCProvider):
+        """Test provider."""
+
+        async def async_is_supported(self, stream_source: str) -> bool:
+            """Determine if the provider supports the stream source."""
+            return True
+
+        async def async_handle_web_rtc_offer(
+            self, camera: Camera, offer_sdp: str
+        ) -> str | None:
+            """Handle the WebRTC offer and return an answer."""
+            return "answer"
+
     with pytest.raises(ValueError, match="Unexpected state, camera not loaded"):
-        async_register_webrtc_provider(hass, SomeTestProvider())
+        async_register_webrtc_provider(hass, TestProvider())
 
 
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera", "mock_stream", "mock_stream_source")
 async def test_async_register_ice_server(
     hass: HomeAssistant,
 ) -> None:
     """Test registering an ICE server."""
+    await async_setup_component(hass, "camera", {})
+
     # Clear any existing ICE servers
     hass.data[DATA_ICE_SERVERS].clear()
 
     called = 0
 
-    @callback
-    def get_ice_servers() -> list[RTCIceServer]:
+    async def get_ice_server() -> RTCIceServer:
         nonlocal called
         called += 1
-        return [
-            RTCIceServer(urls="stun:example.com"),
-            RTCIceServer(urls="turn:example.com"),
-        ]
+        return RTCIceServer(urls="stun:example.com")
 
-    unregister = async_register_ice_servers(hass, get_ice_servers)
+    unregister = register_ice_server(hass, get_ice_server)
     assert not called
 
-    camera = get_camera_from_entity_id(hass, "camera.async")
-    config = camera.async_get_webrtc_client_configuration()
+    camera = get_camera_from_entity_id(hass, "camera.demo_camera")
+    config = await camera.async_get_webrtc_client_configuration()
 
-    assert config.configuration.ice_servers == [
-        RTCIceServer(urls="stun:example.com"),
-        RTCIceServer(urls="turn:example.com"),
-    ]
+    assert config.configuration.ice_servers == [RTCIceServer(urls="stun:example.com")]
     assert called == 1
 
     # register another ICE server
     called_2 = 0
 
-    @callback
-    def get_ice_servers_2() -> list[RTCIceServer]:
+    async def get_ice_server_2() -> RTCIceServer:
         nonlocal called_2
         called_2 += 1
-        return [
-            RTCIceServer(
-                urls=["stun:example2.com", "turn:example2.com"],
-                username="user",
-                credential="pass",
-            )
-        ]
+        return RTCIceServer(
+            urls=["stun:example2.com", "turn:example2.com"],
+            username="user",
+            credential="pass",
+        )
 
-    unregister_2 = async_register_ice_servers(hass, get_ice_servers_2)
+    unregister_2 = register_ice_server(hass, get_ice_server_2)
 
-    config = camera.async_get_webrtc_client_configuration()
+    config = await camera.async_get_webrtc_client_configuration()
     assert config.configuration.ice_servers == [
         RTCIceServer(urls="stun:example.com"),
-        RTCIceServer(urls="turn:example.com"),
         RTCIceServer(
             urls=["stun:example2.com", "turn:example2.com"],
             username="user",
@@ -261,7 +175,7 @@ async def test_async_register_ice_server(
 
     unregister()
 
-    config = camera.async_get_webrtc_client_configuration()
+    config = await camera.async_get_webrtc_client_configuration()
     assert config.configuration.ice_servers == [
         RTCIceServer(
             urls=["stun:example2.com", "turn:example2.com"],
@@ -275,11 +189,11 @@ async def test_async_register_ice_server(
     # unregister the second ICE server
     unregister_2()
 
-    config = camera.async_get_webrtc_client_configuration()
+    config = await camera.async_get_webrtc_client_configuration()
     assert config.configuration.ice_servers == []
 
 
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_web_rtc")
 async def test_ws_get_client_config(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -288,7 +202,7 @@ async def test_ws_get_client_config(
 
     client = await hass_ws_client(hass)
     await client.send_json_auto_id(
-        {"type": "camera/webrtc/get_client_config", "entity_id": "camera.async"}
+        {"type": "camera/webrtc/get_client_config", "entity_id": "camera.demo_camera"}
     )
     msg = await client.receive_json()
 
@@ -296,106 +210,7 @@ async def test_ws_get_client_config(
     assert msg["type"] == TYPE_RESULT
     assert msg["success"]
     assert msg["result"] == {
-        "configuration": {
-            "iceServers": [
-                {
-                    "urls": [
-                        "stun:stun.home-assistant.io:80",
-                        "stun:stun.home-assistant.io:3478",
-                    ]
-                },
-            ],
-        },
-        "getCandidatesUpfront": False,
-    }
-
-    @callback
-    def get_ice_server() -> list[RTCIceServer]:
-        return [
-            RTCIceServer(
-                urls=["stun:example2.com", "turn:example2.com"],
-                username="user",
-                credential="pass",
-            )
-        ]
-
-    async_register_ice_servers(hass, get_ice_server)
-
-    await client.send_json_auto_id(
-        {"type": "camera/webrtc/get_client_config", "entity_id": "camera.async"}
-    )
-    msg = await client.receive_json()
-
-    # Assert WebSocket response
-    assert msg["type"] == TYPE_RESULT
-    assert msg["success"]
-    assert msg["result"] == {
-        "configuration": {
-            "iceServers": [
-                {
-                    "urls": [
-                        "stun:stun.home-assistant.io:80",
-                        "stun:stun.home-assistant.io:3478",
-                    ]
-                },
-                {
-                    "urls": ["stun:example2.com", "turn:example2.com"],
-                    "username": "user",
-                    "credential": "pass",
-                },
-            ],
-        },
-        "getCandidatesUpfront": False,
-    }
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_ws_get_client_config_sync_offer(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test get WebRTC client config, when camera is supporting sync offer."""
-    await async_setup_component(hass, "camera", {})
-    await hass.async_block_till_done()
-
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {"type": "camera/webrtc/get_client_config", "entity_id": "camera.sync"}
-    )
-    msg = await client.receive_json()
-
-    # Assert WebSocket response
-    assert msg["type"] == TYPE_RESULT
-    assert msg["success"]
-    assert msg["result"] == {
-        "configuration": {},
-        "getCandidatesUpfront": True,
-    }
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_ws_get_client_config_custom_config(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test get WebRTC client config."""
-    await async_process_ha_core_config(
-        hass,
-        {"webrtc": {"ice_servers": [{"url": "stun:custom_stun_server:3478"}]}},
-    )
-
-    await async_setup_component(hass, "camera", {})
-
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {"type": "camera/webrtc/get_client_config", "entity_id": "camera.async"}
-    )
-    msg = await client.receive_json()
-
-    # Assert WebSocket response
-    assert msg["type"] == TYPE_RESULT
-    assert msg["success"]
-    assert msg["result"] == {
-        "configuration": {"iceServers": [{"urls": ["stun:custom_stun_server:3478"]}]},
-        "getCandidatesUpfront": False,
+        "configuration": {"iceServers": [{"urls": "stun:stun.home-assistant.io:3478"}]}
     }
 
 
@@ -416,802 +231,6 @@ async def test_ws_get_client_config_no_rtc_camera(
     assert msg["type"] == TYPE_RESULT
     assert not msg["success"]
     assert msg["error"] == {
-        "code": "webrtc_get_client_config_failed",
+        "code": "web_rtc_offer_failed",
         "message": "Camera does not support WebRTC, frontend_stream_type=hls",
     }
-
-
-async def provide_webrtc_answer(stream_source: str, offer: str, stream_id: str) -> str:
-    """Simulate an rtsp to webrtc provider."""
-    assert stream_source == STREAM_SOURCE
-    assert offer == WEBRTC_OFFER
-    return WEBRTC_ANSWER
-
-
-@pytest.fixture(name="mock_rtsp_to_webrtc")
-def mock_rtsp_to_webrtc_fixture(hass: HomeAssistant) -> Generator[Mock]:
-    """Fixture that registers a mock rtsp to webrtc provider."""
-    mock_provider = Mock(side_effect=provide_webrtc_answer)
-    unsub = async_register_rtsp_to_web_rtc_provider(hass, "mock_domain", mock_provider)
-    yield mock_provider
-    unsub()
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_websocket_webrtc_offer(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test initiating a WebRTC stream with offer and answer."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.async",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "answer",
-        "answer": WEBRTC_ANSWER,
-    }
-
-    # Unsubscribe/Close session
-    await client.send_json_auto_id(
-        {
-            "type": "unsubscribe_events",
-            "subscription": subscription_id,
-        }
-    )
-    msg = await client.receive_json()
-    assert msg["success"]
-
-
-@pytest.mark.parametrize(
-    ("message", "expected_frontend_message"),
-    [
-        (
-            WebRTCCandidate(RTCIceCandidate("candidate")),
-            {"type": "candidate", "candidate": "candidate"},
-        ),
-        (
-            WebRTCError("webrtc_offer_failed", "error"),
-            {"type": "error", "code": "webrtc_offer_failed", "message": "error"},
-        ),
-        (WebRTCAnswer("answer"), {"type": "answer", "answer": "answer"}),
-    ],
-    ids=["candidate", "error", "answer"],
-)
-@pytest.mark.usefixtures("mock_stream_source", "mock_camera")
-async def test_websocket_webrtc_offer_webrtc_provider(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    register_test_provider: SomeTestProvider,
-    message: WebRTCMessage,
-    expected_frontend_message: dict[str, Any],
-) -> None:
-    """Test initiating a WebRTC stream with a webrtc provider."""
-    client = await hass_ws_client(hass)
-    with (
-        patch.object(
-            register_test_provider, "async_handle_async_webrtc_offer", autospec=True
-        ) as mock_async_handle_async_webrtc_offer,
-        patch.object(
-            register_test_provider, "async_close_session", autospec=True
-        ) as mock_async_close_session,
-    ):
-        await client.send_json_auto_id(
-            {
-                "type": "camera/webrtc/offer",
-                "entity_id": "camera.demo_camera",
-                "offer": WEBRTC_OFFER,
-            }
-        )
-        response = await client.receive_json()
-        assert response["type"] == TYPE_RESULT
-        assert response["success"]
-        subscription_id = response["id"]
-        mock_async_handle_async_webrtc_offer.assert_called_once()
-        assert mock_async_handle_async_webrtc_offer.call_args[0][1] == WEBRTC_OFFER
-        send_message: WebRTCSendMessage = (
-            mock_async_handle_async_webrtc_offer.call_args[0][3]
-        )
-
-        # Session id
-        response = await client.receive_json()
-        assert response["id"] == subscription_id
-        assert response["type"] == "event"
-        assert response["event"]["type"] == "session"
-        session_id = response["event"]["session_id"]
-
-        send_message(message)
-
-        response = await client.receive_json()
-        assert response["id"] == subscription_id
-        assert response["type"] == "event"
-        assert response["event"] == expected_frontend_message
-
-        # Unsubscribe/Close session
-        await client.send_json_auto_id(
-            {
-                "type": "unsubscribe_events",
-                "subscription": subscription_id,
-            }
-        )
-        msg = await client.receive_json()
-        assert msg["success"]
-        mock_async_close_session.assert_called_once_with(session_id)
-
-
-async def test_websocket_webrtc_offer_invalid_entity(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test WebRTC with a camera entity that does not exist."""
-    await async_setup_component(hass, "camera", {})
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.does_not_exist",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"] == {
-        "code": "home_assistant_error",
-        "message": "Camera not found",
-    }
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_websocket_webrtc_offer_missing_offer(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test WebRTC stream with missing required fields."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.demo_camera",
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"]["code"] == "invalid_format"
-
-
-@pytest.mark.parametrize(
-    ("error", "expected_message"),
-    [
-        (ValueError("value error"), "value error"),
-        (HomeAssistantError("offer failed"), "offer failed"),
-        (TimeoutError(), "Timeout handling WebRTC offer"),
-    ],
-)
-async def test_websocket_webrtc_offer_failure(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    init_test_integration: MockCamera,
-    error: Exception,
-    expected_message: str,
-) -> None:
-    """Test WebRTC stream that fails handling the offer."""
-    client = await hass_ws_client(hass)
-    init_test_integration.set_sync_answer(error)
-
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.test",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Error
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "error",
-        "code": "webrtc_offer_failed",
-        "message": expected_message,
-    }
-
-
-async def test_websocket_webrtc_offer_sync(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    init_test_integration: MockCamera,
-) -> None:
-    """Test sync WebRTC stream offer."""
-    client = await hass_ws_client(hass)
-    init_test_integration.set_sync_answer(WEBRTC_ANSWER)
-
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.test",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {"type": "answer", "answer": WEBRTC_ANSWER}
-
-
-async def test_websocket_webrtc_offer_sync_no_answer(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    caplog: pytest.LogCaptureFixture,
-    init_test_integration: MockCamera,
-) -> None:
-    """Test sync WebRTC stream offer with no answer."""
-    client = await hass_ws_client(hass)
-    init_test_integration.set_sync_answer(None)
-
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.test",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "error",
-        "code": "webrtc_offer_failed",
-        "message": "No answer on WebRTC offer",
-    }
-    assert (
-        "homeassistant.components.camera",
-        logging.ERROR,
-        "Error handling WebRTC offer: No answer",
-    ) in caplog.record_tuples
-
-
-@pytest.mark.usefixtures("mock_camera")
-async def test_websocket_webrtc_offer_invalid_stream_type(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test WebRTC initiating for a camera with a different stream_type."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.demo_camera",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"] == {
-        "code": "webrtc_offer_failed",
-        "message": "Camera does not support WebRTC, frontend_stream_type=hls",
-    }
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
-async def test_rtsp_to_webrtc_offer(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    mock_rtsp_to_webrtc: Mock,
-) -> None:
-    """Test creating a webrtc offer from an rstp provider."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.demo_camera",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "answer",
-        "answer": WEBRTC_ANSWER,
-    }
-
-    assert mock_rtsp_to_webrtc.called
-
-
-@pytest.fixture(name="mock_hls_stream_source")
-async def mock_hls_stream_source_fixture() -> AsyncGenerator[AsyncMock]:
-    """Fixture to create an HLS stream source."""
-    with patch(
-        "homeassistant.components.camera.Camera.stream_source",
-        return_value=HLS_STREAM_SOURCE,
-    ) as mock_hls_stream_source:
-        yield mock_hls_stream_source
-
-
-@pytest.mark.usefixtures(
-    "mock_camera",
-    "mock_hls_stream_source",  # Not an RTSP stream source
-    "mock_camera_webrtc_frontendtype_only",
-)
-async def test_unsupported_rtsp_to_webrtc_stream_type(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test rtsp-to-webrtc is not registered for non-RTSP streams."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.demo_camera",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "error",
-        "code": "webrtc_offer_failed",
-        "message": "Camera does not support WebRTC",
-    }
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
-async def test_rtsp_to_webrtc_provider_unregistered(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test creating a webrtc offer from an rstp provider."""
-    mock_provider = Mock(side_effect=provide_webrtc_answer)
-    unsub = async_register_rtsp_to_web_rtc_provider(hass, "mock_domain", mock_provider)
-
-    client = await hass_ws_client(hass)
-
-    # Registered provider can handle the WebRTC offer
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.demo_camera",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "answer",
-        "answer": WEBRTC_ANSWER,
-    }
-
-    assert mock_provider.called
-    mock_provider.reset_mock()
-
-    # Unregister provider, then verify the WebRTC offer cannot be handled
-    unsub()
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.demo_camera",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-    assert response.get("type") == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"] == {
-        "code": "webrtc_offer_failed",
-        "message": "Camera does not support WebRTC, frontend_stream_type=hls",
-    }
-
-    assert not mock_provider.called
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
-async def test_rtsp_to_webrtc_offer_not_accepted(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test a provider that can't satisfy the rtsp to webrtc offer."""
-
-    async def provide_none(
-        stream_source: str, offer: str, stream_id: str
-    ) -> str | None:
-        """Simulate a provider that can't accept the offer."""
-        return None
-
-    mock_provider = Mock(side_effect=provide_none)
-    unsub = async_register_rtsp_to_web_rtc_provider(hass, "mock_domain", mock_provider)
-    client = await hass_ws_client(hass)
-
-    # Registered provider can handle the WebRTC offer
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.demo_camera",
-            "offer": WEBRTC_OFFER,
-        }
-    )
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "error",
-        "code": "webrtc_offer_failed",
-        "message": "Camera does not support WebRTC",
-    }
-
-    assert mock_provider.called
-
-    unsub()
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_ws_webrtc_candidate(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test ws webrtc candidate command."""
-    client = await hass_ws_client(hass)
-    session_id = "session_id"
-    candidate = "candidate"
-    with patch.object(
-        get_camera_from_entity_id(hass, "camera.async"), "async_on_webrtc_candidate"
-    ) as mock_on_webrtc_candidate:
-        await client.send_json_auto_id(
-            {
-                "type": "camera/webrtc/candidate",
-                "entity_id": "camera.async",
-                "session_id": session_id,
-                "candidate": candidate,
-            }
-        )
-        response = await client.receive_json()
-        assert response["type"] == TYPE_RESULT
-        assert response["success"]
-        mock_on_webrtc_candidate.assert_called_once_with(
-            session_id, RTCIceCandidate(candidate)
-        )
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_ws_webrtc_candidate_not_supported(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test ws webrtc candidate command is raising if not supported."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/candidate",
-            "entity_id": "camera.sync",
-            "session_id": "session_id",
-            "candidate": "candidate",
-        }
-    )
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"] == {
-        "code": "home_assistant_error",
-        "message": "Cannot handle WebRTC candidate",
-    }
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
-async def test_ws_webrtc_candidate_webrtc_provider(
-    hass: HomeAssistant,
-    hass_ws_client: WebSocketGenerator,
-    register_test_provider: SomeTestProvider,
-) -> None:
-    """Test ws webrtc candidate command with WebRTC provider."""
-    with patch.object(
-        register_test_provider, "async_on_webrtc_candidate"
-    ) as mock_on_webrtc_candidate:
-        client = await hass_ws_client(hass)
-        session_id = "session_id"
-        candidate = "candidate"
-        await client.send_json_auto_id(
-            {
-                "type": "camera/webrtc/candidate",
-                "entity_id": "camera.demo_camera",
-                "session_id": session_id,
-                "candidate": candidate,
-            }
-        )
-        response = await client.receive_json()
-        assert response["type"] == TYPE_RESULT
-        assert response["success"]
-        mock_on_webrtc_candidate.assert_called_once_with(
-            session_id, RTCIceCandidate(candidate)
-        )
-
-
-async def test_ws_webrtc_candidate_invalid_entity(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test ws WebRTC candidate command with a camera entity that does not exist."""
-    await async_setup_component(hass, "camera", {})
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/candidate",
-            "entity_id": "camera.does_not_exist",
-            "session_id": "session_id",
-            "candidate": "candidate",
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"] == {
-        "code": "home_assistant_error",
-        "message": "Camera not found",
-    }
-
-
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
-async def test_ws_webrtc_canidate_missing_candidate(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test ws WebRTC candidate command with missing required fields."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/candidate",
-            "entity_id": "camera.async",
-            "session_id": "session_id",
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"]["code"] == "invalid_format"
-
-
-@pytest.mark.usefixtures("mock_camera")
-async def test_ws_webrtc_candidate_invalid_stream_type(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test ws WebRTC candidate command for a camera with a different stream_type."""
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/candidate",
-            "entity_id": "camera.demo_camera",
-            "session_id": "session_id",
-            "candidate": "candidate",
-        }
-    )
-    response = await client.receive_json()
-
-    assert response["type"] == TYPE_RESULT
-    assert not response["success"]
-    assert response["error"] == {
-        "code": "webrtc_candidate_failed",
-        "message": "Camera does not support WebRTC, frontend_stream_type=hls",
-    }
-
-
-async def test_webrtc_provider_optional_interface(hass: HomeAssistant) -> None:
-    """Test optional interface for WebRTC provider."""
-
-    class OnlyRequiredInterfaceProvider(CameraWebRTCProvider):
-        """Test provider."""
-
-        @property
-        def domain(self) -> str:
-            """Return the domain of the provider."""
-            return "test"
-
-        @callback
-        def async_is_supported(self, stream_source: str) -> bool:
-            """Determine if the provider supports the stream source."""
-            return True
-
-        async def async_handle_async_webrtc_offer(
-            self,
-            camera: Camera,
-            offer_sdp: str,
-            session_id: str,
-            send_message: WebRTCSendMessage,
-        ) -> None:
-            """Handle the WebRTC offer and return the answer via the provided callback.
-
-            Return value determines if the offer was handled successfully.
-            """
-            send_message(WebRTCAnswer(answer="answer"))
-
-        async def async_on_webrtc_candidate(
-            self, session_id: str, candidate: RTCIceCandidate
-        ) -> None:
-            """Handle the WebRTC candidate."""
-
-    provider = OnlyRequiredInterfaceProvider()
-    # Call all interface methods
-    assert provider.async_is_supported("stream_source") is True
-    await provider.async_handle_async_webrtc_offer(
-        Mock(), "offer_sdp", "session_id", Mock()
-    )
-    await provider.async_on_webrtc_candidate("session_id", RTCIceCandidate("candidate"))
-    provider.async_close_session("session_id")
-
-
-@pytest.mark.usefixtures("mock_camera")
-async def test_repair_issue_legacy_provider(
-    hass: HomeAssistant,
-    issue_registry: ir.IssueRegistry,
-) -> None:
-    """Test repair issue created for legacy provider."""
-    # Ensure no issue if no provider is registered
-    assert not issue_registry.async_get_issue(
-        "camera", "legacy_webrtc_provider_mock_domain"
-    )
-
-    # Register a legacy provider
-    legacy_provider = Mock(side_effect=provide_webrtc_answer)
-    unsub_legacy_provider = async_register_rtsp_to_web_rtc_provider(
-        hass, "mock_domain", legacy_provider
-    )
-    await hass.async_block_till_done()
-
-    # Ensure no issue if only legacy provider is registered
-    assert not issue_registry.async_get_issue(
-        "camera", "legacy_webrtc_provider_mock_domain"
-    )
-
-    provider = Go2RTCProvider()
-    unsub_go2rtc_provider = async_register_webrtc_provider(hass, provider)
-    await hass.async_block_till_done()
-
-    # Ensure issue when legacy and builtin provider are registered
-    issue = issue_registry.async_get_issue(
-        "camera", "legacy_webrtc_provider_mock_domain"
-    )
-    assert issue
-    assert issue.is_fixable is False
-    assert issue.is_persistent is False
-    assert issue.issue_domain == "mock_domain"
-    assert issue.learn_more_url == "https://www.home-assistant.io/integrations/go2rtc/"
-    assert issue.severity == ir.IssueSeverity.WARNING
-    assert issue.issue_id == "legacy_webrtc_provider_mock_domain"
-    assert issue.translation_key == "legacy_webrtc_provider"
-    assert issue.translation_placeholders == {
-        "legacy_integration": "mock_domain",
-        "builtin_integration": "go2rtc",
-    }
-
-    unsub_legacy_provider()
-    unsub_go2rtc_provider()
-
-
-@pytest.mark.usefixtures("mock_camera", "register_test_provider", "mock_rtsp_to_webrtc")
-async def test_no_repair_issue_without_new_provider(
-    hass: HomeAssistant,
-    issue_registry: ir.IssueRegistry,
-) -> None:
-    """Test repair issue not created if no go2rtc provider exists."""
-    assert not issue_registry.async_get_issue(
-        "camera", "legacy_webrtc_provider_mock_domain"
-    )
-
-
-@pytest.mark.usefixtures("mock_camera", "mock_rtsp_to_webrtc")
-async def test_registering_same_legacy_provider(
-    hass: HomeAssistant,
-) -> None:
-    """Test registering the same legacy provider twice."""
-    legacy_provider = Mock(side_effect=provide_webrtc_answer)
-    with pytest.raises(ValueError, match="Provider already registered"):
-        async_register_rtsp_to_web_rtc_provider(hass, "mock_domain", legacy_provider)
-
-
-@pytest.mark.usefixtures("mock_hls_stream_source", "mock_camera", "mock_rtsp_to_webrtc")
-async def test_get_not_supported_legacy_provider(hass: HomeAssistant) -> None:
-    """Test getting a not supported legacy provider."""
-    camera = get_camera_from_entity_id(hass, "camera.demo_camera")
-    assert await async_get_supported_legacy_provider(hass, camera) is None
diff --git a/tests/components/canary/test_alarm_control_panel.py b/tests/components/canary/test_alarm_control_panel.py
index a194621b0d9..83e801d67c4 100644
--- a/tests/components/canary/test_alarm_control_panel.py
+++ b/tests/components/canary/test_alarm_control_panel.py
@@ -4,16 +4,17 @@ from unittest.mock import PropertyMock, patch
 
 from canary.const import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, LOCATION_MODE_NIGHT
 
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_DOMAIN,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN
 from homeassistant.components.canary import DOMAIN
 from homeassistant.const import (
     SERVICE_ALARM_ARM_AWAY,
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_ARM_NIGHT,
     SERVICE_ALARM_DISARM,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
@@ -66,7 +67,7 @@ async def test_alarm_control_panel(
 
     state = hass.states.get(entity_id)
     assert state
-    assert state.state == AlarmControlPanelState.DISARMED
+    assert state.state == STATE_ALARM_DISARMED
     assert state.attributes["private"]
 
     type(mocked_location).is_private = PropertyMock(return_value=False)
@@ -81,7 +82,7 @@ async def test_alarm_control_panel(
 
     state = hass.states.get(entity_id)
     assert state
-    assert state.state == AlarmControlPanelState.ARMED_HOME
+    assert state.state == STATE_ALARM_ARMED_HOME
 
     # test armed away
     type(mocked_location).mode = PropertyMock(
@@ -93,7 +94,7 @@ async def test_alarm_control_panel(
 
     state = hass.states.get(entity_id)
     assert state
-    assert state.state == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMED_AWAY
 
     # test armed night
     type(mocked_location).mode = PropertyMock(
@@ -105,7 +106,7 @@ async def test_alarm_control_panel(
 
     state = hass.states.get(entity_id)
     assert state
-    assert state.state == AlarmControlPanelState.ARMED_NIGHT
+    assert state.state == STATE_ALARM_ARMED_NIGHT
 
 
 async def test_alarm_control_panel_services(hass: HomeAssistant, canary) -> None:
diff --git a/tests/components/cast/test_home_assistant_cast.py b/tests/components/cast/test_home_assistant_cast.py
index 2fc348fd008..c9e311bb024 100644
--- a/tests/components/cast/test_home_assistant_cast.py
+++ b/tests/components/cast/test_home_assistant_cast.py
@@ -5,8 +5,8 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant.components.cast import DOMAIN, home_assistant_cast
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.exceptions import HomeAssistantError
 
 from tests.common import MockConfigEntry, async_mock_signal
diff --git a/tests/components/cast/test_media_player.py b/tests/components/cast/test_media_player.py
index b2ce60e9393..513f32b1ad6 100644
--- a/tests/components/cast/test_media_player.py
+++ b/tests/components/cast/test_media_player.py
@@ -27,13 +27,13 @@ from homeassistant.components.media_player import (
     MediaClass,
     MediaPlayerEntityFeature,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CAST_APP_ID_HOMEASSISTANT_LOVELACE,
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er, network
 from homeassistant.helpers.dispatcher import (
diff --git a/tests/components/cloud/conftest.py b/tests/components/cloud/conftest.py
index 7002f7c39ec..2edd9571bdd 100644
--- a/tests/components/cloud/conftest.py
+++ b/tests/components/cloud/conftest.py
@@ -3,14 +3,13 @@
 from collections.abc import AsyncGenerator, Callable, Coroutine, Generator
 from pathlib import Path
 from typing import Any
-from unittest.mock import DEFAULT, AsyncMock, MagicMock, PropertyMock, patch
+from unittest.mock import DEFAULT, MagicMock, PropertyMock, patch
 
 from hass_nabucasa import Cloud
 from hass_nabucasa.auth import CognitoAuth
 from hass_nabucasa.cloudhooks import Cloudhooks
 from hass_nabucasa.const import DEFAULT_SERVERS, DEFAULT_VALUES, STATE_CONNECTED
 from hass_nabucasa.google_report_state import GoogleReportState
-from hass_nabucasa.ice_servers import IceServers
 from hass_nabucasa.iot import CloudIoT
 from hass_nabucasa.remote import RemoteUI
 from hass_nabucasa.voice import Voice
@@ -69,12 +68,6 @@ async def cloud_fixture() -> AsyncGenerator[MagicMock]:
         )
         mock_cloud.voice = MagicMock(spec=Voice)
         mock_cloud.started = None
-        mock_cloud.ice_servers = MagicMock(
-            spec=IceServers,
-            async_register_ice_servers_listener=AsyncMock(
-                return_value=lambda: "mock-unregister"
-            ),
-        )
 
         def set_up_mock_cloud(
             cloud_client: CloudClient, mode: str, **kwargs: Any
diff --git a/tests/components/cloud/test_client.py b/tests/components/cloud/test_client.py
index 43eccc5ef9c..7af163cc49d 100644
--- a/tests/components/cloud/test_client.py
+++ b/tests/components/cloud/test_client.py
@@ -1,6 +1,5 @@
 """Test the cloud.iot module."""
 
-from collections.abc import Callable, Coroutine
 from datetime import timedelta
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, Mock, PropertyMock, patch
@@ -184,59 +183,6 @@ async def test_handler_google_actions_disabled(
     assert resp["payload"] == response_payload
 
 
-async def test_handler_ice_servers(
-    hass: HomeAssistant,
-    cloud: MagicMock,
-    set_cloud_prefs: Callable[[dict[str, Any]], Coroutine[Any, Any, None]],
-) -> None:
-    """Test handler ICE servers."""
-    assert await async_setup_component(hass, "cloud", {"cloud": {}})
-    await hass.async_block_till_done()
-    # make sure that preferences will not be reset
-    await cloud.client.prefs.async_set_username(cloud.username)
-    await set_cloud_prefs(
-        {
-            "alexa_enabled": False,
-            "google_enabled": False,
-        }
-    )
-
-    await cloud.login("test-user", "test-pass")
-    await cloud.client.cloud_connected()
-
-    assert cloud.client._cloud_ice_servers_listener is not None
-    assert cloud.client._cloud_ice_servers_listener() == "mock-unregister"
-
-
-async def test_handler_ice_servers_disabled(
-    hass: HomeAssistant,
-    cloud: MagicMock,
-    set_cloud_prefs: Callable[[dict[str, Any]], Coroutine[Any, Any, None]],
-) -> None:
-    """Test handler ICE servers when user has disabled it."""
-    assert await async_setup_component(hass, "cloud", {"cloud": {}})
-    await hass.async_block_till_done()
-    # make sure that preferences will not be reset
-    await cloud.client.prefs.async_set_username(cloud.username)
-    await set_cloud_prefs(
-        {
-            "alexa_enabled": False,
-            "google_enabled": False,
-        }
-    )
-
-    await cloud.login("test-user", "test-pass")
-    await cloud.client.cloud_connected()
-
-    await set_cloud_prefs(
-        {
-            "cloud_ice_servers_enabled": False,
-        }
-    )
-
-    assert cloud.client._cloud_ice_servers_listener is None
-
-
 async def test_webhook_msg(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -529,16 +475,13 @@ async def test_logged_out(
     await cloud.client.cloud_connected()
     await hass.async_block_till_done()
 
-    assert cloud.client._cloud_ice_servers_listener is not None
-
     # Simulate logged out
     await cloud.logout()
     await hass.async_block_till_done()
 
-    # Check we clean up Alexa, Google and ICE servers
+    # Check we clean up Alexa and Google
     assert cloud.client._alexa_config is None
     assert cloud.client._google_config is None
-    assert cloud.client._cloud_ice_servers_listener is None
     google_config_mock.async_deinitialize.assert_called_once_with()
     alexa_config_mock.async_deinitialize.assert_called_once_with()
 
diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py
index 216fc77db48..15339f43dae 100644
--- a/tests/components/cloud/test_http_api.py
+++ b/tests/components/cloud/test_http_api.py
@@ -784,7 +784,6 @@ async def test_websocket_status(
             "google_report_state": True,
             "remote_allow_remote_enable": True,
             "remote_enabled": False,
-            "cloud_ice_servers_enabled": True,
             "tts_default_voice": ["en-US", "JennyNeural"],
         },
         "alexa_entities": {
@@ -904,7 +903,6 @@ async def test_websocket_update_preferences(
     assert cloud.client.prefs.alexa_enabled
     assert cloud.client.prefs.google_secure_devices_pin is None
     assert cloud.client.prefs.remote_allow_remote_enable is True
-    assert cloud.client.prefs.cloud_ice_servers_enabled is True
 
     client = await hass_ws_client(hass)
 
@@ -916,7 +914,6 @@ async def test_websocket_update_preferences(
             "google_secure_devices_pin": "1234",
             "tts_default_voice": ["en-GB", "RyanNeural"],
             "remote_allow_remote_enable": False,
-            "cloud_ice_servers_enabled": False,
         }
     )
     response = await client.receive_json()
@@ -926,7 +923,6 @@ async def test_websocket_update_preferences(
     assert not cloud.client.prefs.alexa_enabled
     assert cloud.client.prefs.google_secure_devices_pin == "1234"
     assert cloud.client.prefs.remote_allow_remote_enable is False
-    assert cloud.client.prefs.cloud_ice_servers_enabled is False
     assert cloud.client.prefs.tts_default_voice == ("en-GB", "RyanNeural")
 
 
diff --git a/tests/components/cloud/test_system_health.py b/tests/components/cloud/test_system_health.py
index 6293f44067d..60b23e47fec 100644
--- a/tests/components/cloud/test_system_health.py
+++ b/tests/components/cloud/test_system_health.py
@@ -50,12 +50,7 @@ async def test_cloud_system_health(
 
     await cloud.client.async_system_message({"region": "xx-earth-616"})
     await set_cloud_prefs(
-        {
-            "alexa_enabled": True,
-            "google_enabled": False,
-            "remote_enabled": True,
-            "cloud_ice_servers_enabled": True,
-        }
+        {"alexa_enabled": True, "google_enabled": False, "remote_enabled": True}
     )
 
     info = await get_system_health_info(hass, "cloud")
@@ -75,7 +70,6 @@ async def test_cloud_system_health(
         "remote_server": "us-west-1",
         "alexa_enabled": True,
         "google_enabled": False,
-        "cloud_ice_servers_enabled": True,
         "can_reach_cert_server": "ok",
         "can_reach_cloud_auth": {"type": "failed", "error": "unreachable"},
         "can_reach_cloud": "ok",
diff --git a/tests/components/cloud/test_tts.py b/tests/components/cloud/test_tts.py
index 499981c643d..50ea5e87d82 100644
--- a/tests/components/cloud/test_tts.py
+++ b/tests/components/cloud/test_tts.py
@@ -25,9 +25,9 @@ from homeassistant.components.tts import (
     DOMAIN as TTS_DOMAIN,
     get_engine_instance,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.entity_registry import EntityRegistry
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/co2signal/test_config_flow.py b/tests/components/co2signal/test_config_flow.py
index f8f94d44126..92d9450b670 100644
--- a/tests/components/co2signal/test_config_flow.py
+++ b/tests/components/co2signal/test_config_flow.py
@@ -44,7 +44,7 @@ async def test_form_home(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     assert result2["type"] is FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Electricity Maps"
+    assert result2["title"] == "CO2 Signal"
     assert result2["data"] == {
         "api_key": "api_key",
     }
@@ -185,7 +185,7 @@ async def test_form_error_handling(
     await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Electricity Maps"
+    assert result["title"] == "CO2 Signal"
     assert result["data"] == {
         "api_key": "api_key",
     }
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index 363d39a2e63..00e440cd0a2 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -5,17 +5,10 @@ from __future__ import annotations
 from collections.abc import Callable, Generator
 from importlib.util import find_spec
 from pathlib import Path
-import string
 from typing import TYPE_CHECKING, Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from aiohasupervisor.models import (
-    Discovery,
-    Repository,
-    ResolutionInfo,
-    StoreAddon,
-    StoreInfo,
-)
+from aiohasupervisor.models import Repository, StoreAddon, StoreInfo
 import pytest
 
 from homeassistant.config_entries import (
@@ -26,12 +19,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import (
-    FlowContext,
-    FlowHandler,
-    FlowManager,
-    FlowResultType,
-)
+from homeassistant.data_entry_flow import FlowHandler, FlowManager, FlowResultType
 from homeassistant.helpers.translation import async_get_translations
 
 if TYPE_CHECKING:
@@ -217,9 +205,12 @@ def addon_manager_fixture(
 
 
 @pytest.fixture(name="discovery_info")
-def discovery_info_fixture() -> list[Discovery]:
+def discovery_info_fixture() -> Any:
     """Return the discovery info from the supervisor."""
-    return []
+    # pylint: disable-next=import-outside-toplevel
+    from .hassio.common import mock_discovery_info
+
+    return mock_discovery_info()
 
 
 @pytest.fixture(name="discovery_info_side_effect")
@@ -230,29 +221,13 @@ def discovery_info_side_effect_fixture() -> Any | None:
 
 @pytest.fixture(name="get_addon_discovery_info")
 def get_addon_discovery_info_fixture(
-    supervisor_client: AsyncMock,
-    discovery_info: list[Discovery],
-    discovery_info_side_effect: Any | None,
-) -> AsyncMock:
+    discovery_info: dict[str, Any], discovery_info_side_effect: Any | None
+) -> Generator[AsyncMock]:
     """Mock get add-on discovery info."""
-    supervisor_client.discovery.list.return_value = discovery_info
-    supervisor_client.discovery.list.side_effect = discovery_info_side_effect
-    return supervisor_client.discovery.list
+    # pylint: disable-next=import-outside-toplevel
+    from .hassio.common import mock_get_addon_discovery_info
 
-
-@pytest.fixture(name="get_discovery_message_side_effect")
-def get_discovery_message_side_effect_fixture() -> Any | None:
-    """Side effect for getting a discovery message by uuid."""
-    return None
-
-
-@pytest.fixture(name="get_discovery_message")
-def get_discovery_message_fixture(
-    supervisor_client: AsyncMock, get_discovery_message_side_effect: Any | None
-) -> AsyncMock:
-    """Mock getting a discovery message by uuid."""
-    supervisor_client.discovery.get.side_effect = get_discovery_message_side_effect
-    return supervisor_client.discovery.get
+    yield from mock_get_addon_discovery_info(discovery_info, discovery_info_side_effect)
 
 
 @pytest.fixture(name="addon_store_info_side_effect")
@@ -410,10 +385,8 @@ def set_addon_options_fixture(
     set_addon_options_side_effect: Any | None,
 ) -> AsyncMock:
     """Mock set add-on options."""
-    supervisor_client.addons.set_addon_options.side_effect = (
-        set_addon_options_side_effect
-    )
-    return supervisor_client.addons.set_addon_options
+    supervisor_client.addons.addon_options.side_effect = set_addon_options_side_effect
+    return supervisor_client.addons.addon_options
 
 
 @pytest.fixture(name="uninstall_addon")
@@ -478,43 +451,11 @@ def addon_changelog_fixture(supervisor_client: AsyncMock) -> AsyncMock:
     return supervisor_client.store.addon_changelog
 
 
-@pytest.fixture(name="supervisor_is_connected")
-def supervisor_is_connected_fixture(supervisor_client: AsyncMock) -> AsyncMock:
-    """Mock supervisor is connected."""
-    supervisor_client.supervisor.ping.return_value = None
-    return supervisor_client.supervisor.ping
-
-
-@pytest.fixture(name="resolution_info")
-def resolution_info_fixture(supervisor_client: AsyncMock) -> AsyncMock:
-    """Mock resolution info from supervisor."""
-    supervisor_client.resolution.info.return_value = ResolutionInfo(
-        suggestions=[],
-        unsupported=[],
-        unhealthy=[],
-        issues=[],
-        checks=[],
-    )
-    return supervisor_client.resolution.info
-
-
-@pytest.fixture(name="resolution_suggestions_for_issue")
-def resolution_suggestions_for_issue_fixture(supervisor_client: AsyncMock) -> AsyncMock:
-    """Mock suggestions by issue from supervisor resolution."""
-    supervisor_client.resolution.suggestions_for_issue.return_value = []
-    return supervisor_client.resolution.suggestions_for_issue
-
-
 @pytest.fixture(name="supervisor_client")
 def supervisor_client() -> Generator[AsyncMock]:
     """Mock the supervisor client."""
     supervisor_client = AsyncMock()
     supervisor_client.addons = AsyncMock()
-    supervisor_client.discovery = AsyncMock()
-    supervisor_client.homeassistant = AsyncMock()
-    supervisor_client.os = AsyncMock()
-    supervisor_client.resolution = AsyncMock()
-    supervisor_client.supervisor = AsyncMock()
     with (
         patch(
             "homeassistant.components.hassio.get_supervisor_client",
@@ -537,63 +478,50 @@ def supervisor_client() -> Generator[AsyncMock]:
             return_value=supervisor_client,
         ),
         patch(
-            "homeassistant.components.hassio.issues.get_supervisor_client",
+            "homeassistant.components.hassio.update.get_supervisor_client",
             return_value=supervisor_client,
         ),
         patch(
-            "homeassistant.components.hassio.repairs.get_supervisor_client",
+            "homeassistant.components.hassio.get_supervisor_client",
             return_value=supervisor_client,
         ),
     ):
         yield supervisor_client
 
 
-def _validate_translation_placeholders(
-    full_key: str,
-    translation: str,
-    description_placeholders: dict[str, str] | None,
-) -> str | None:
-    """Raise if translation exists with missing placeholders."""
-    tuples = list(string.Formatter().parse(translation))
-    for _, placeholder, _, _ in tuples:
-        if placeholder is None:
-            continue
-        if (
-            description_placeholders is None
-            or placeholder not in description_placeholders
-        ):
-            ignore_translations[full_key] = (
-                f"Description not found for placeholder `{placeholder}` in {full_key}"
-            )
-
-
-async def _validate_translation(
+async def _ensure_translation_exists(
     hass: HomeAssistant,
     ignore_translations: dict[str, StoreInfo],
     category: str,
     component: str,
     key: str,
-    description_placeholders: dict[str, str] | None,
-    *,
-    translation_required: bool = True,
 ) -> None:
     """Raise if translation doesn't exist."""
     full_key = f"component.{component}.{category}.{key}"
     translations = await async_get_translations(hass, "en", category, [component])
-    if (translation := translations.get(full_key)) is not None:
-        _validate_translation_placeholders(
-            full_key, translation, description_placeholders
-        )
-        return
-
-    if not translation_required:
+    if full_key in translations:
         return
 
     if full_key in ignore_translations:
         ignore_translations[full_key] = "used"
         return
 
-    ignore_translations[full_key] = (
+    key_parts = key.split(".")
+    # Ignore step data translations if title or description exists
+    if (
+        len(key_parts) >= 3
+        and key_parts[0] == "step"
+        and key_parts[2] == "data"
+        and (
+            f"component.{component}.{category}.{key_parts[0]}.{key_parts[1]}.description"
+            in translations
+            or f"component.{component}.{category}.{key_parts[0]}.{key_parts[1]}.title"
+            in translations
+        )
+    ):
+        return
+
+    pytest.fail(
         f"Translation not found for {component}: `{category}.{key}`. "
         f"Please add to homeassistant/components/{component}/strings.json"
     )
@@ -609,106 +537,68 @@ def ignore_translations() -> str | list[str]:
     return []
 
 
-async def _check_config_flow_result_translations(
-    manager: FlowManager,
-    flow: FlowHandler,
-    result: FlowResult[FlowContext, str],
-    ignore_translations: dict[str, str],
-) -> None:
-    if isinstance(manager, ConfigEntriesFlowManager):
-        category = "config"
-        integration = flow.handler
-    elif isinstance(manager, OptionsFlowManager):
-        category = "options"
-        integration = flow.hass.config_entries.async_get_entry(flow.handler).domain
-    else:
-        return
-
-    # Check if this flow has been seen before
-    # Gets set to False on first run, and to True on subsequent runs
-    setattr(flow, "__flow_seen_before", hasattr(flow, "__flow_seen_before"))
-
-    if result["type"] is FlowResultType.FORM:
-        if step_id := result.get("step_id"):
-            # neither title nor description are required
-            # - title defaults to integration name
-            # - description is optional
-            for header in ("title", "description"):
-                await _validate_translation(
-                    flow.hass,
-                    ignore_translations,
-                    category,
-                    integration,
-                    f"step.{step_id}.{header}",
-                    result["description_placeholders"],
-                    translation_required=False,
-                )
-        if errors := result.get("errors"):
-            for error in errors.values():
-                await _validate_translation(
-                    flow.hass,
-                    ignore_translations,
-                    category,
-                    integration,
-                    f"error.{error}",
-                    result["description_placeholders"],
-                )
-        return
-
-    if result["type"] is FlowResultType.ABORT:
-        # We don't need translations for a discovery flow which immediately
-        # aborts, since such flows won't be seen by users
-        if not flow.__flow_seen_before and flow.source in DISCOVERY_SOURCES:
-            return
-        await _validate_translation(
-            flow.hass,
-            ignore_translations,
-            category,
-            integration,
-            f"abort.{result["reason"]}",
-            result["description_placeholders"],
-        )
-
-
 @pytest.fixture(autouse=True)
-def check_translations(ignore_translations: str | list[str]) -> Generator[None]:
-    """Check that translation requirements are met.
-
-    Current checks:
-    - data entry flow results (ConfigFlow/OptionsFlow)
-    """
+def check_config_translations(ignore_translations: str | list[str]) -> Generator[None]:
+    """Ensure config_flow translations are available."""
     if not isinstance(ignore_translations, list):
         ignore_translations = [ignore_translations]
 
     _ignore_translations = {k: "unused" for k in ignore_translations}
+    _original = FlowManager._async_handle_step
 
-    # Keep reference to original functions
-    _original_flow_manager_async_handle_step = FlowManager._async_handle_step
-
-    # Prepare override functions
-    async def _flow_manager_async_handle_step(
+    async def _async_handle_step(
         self: FlowManager, flow: FlowHandler, *args
     ) -> FlowResult:
-        result = await _original_flow_manager_async_handle_step(self, flow, *args)
-        await _check_config_flow_result_translations(
-            self, flow, result, _ignore_translations
-        )
+        result = await _original(self, flow, *args)
+        if isinstance(self, ConfigEntriesFlowManager):
+            category = "config"
+            component = flow.handler
+        elif isinstance(self, OptionsFlowManager):
+            category = "options"
+            component = flow.hass.config_entries.async_get_entry(flow.handler).domain
+        else:
+            return result
+
+        # Check if this flow has been seen before
+        # Gets set to False on first run, and to True on subsequent runs
+        setattr(flow, "__flow_seen_before", hasattr(flow, "__flow_seen_before"))
+
+        if result["type"] is FlowResultType.FORM:
+            if errors := result.get("errors"):
+                for error in errors.values():
+                    await _ensure_translation_exists(
+                        flow.hass,
+                        _ignore_translations,
+                        category,
+                        component,
+                        f"error.{error}",
+                    )
+            return result
+
+        if result["type"] is FlowResultType.ABORT:
+            # We don't need translations for a discovery flow which immediately
+            # aborts, since such flows won't be seen by users
+            if not flow.__flow_seen_before and flow.source in DISCOVERY_SOURCES:
+                return result
+            await _ensure_translation_exists(
+                flow.hass,
+                _ignore_translations,
+                category,
+                component,
+                f"abort.{result["reason"]}",
+            )
+
         return result
 
-    # Use override functions
     with patch(
         "homeassistant.data_entry_flow.FlowManager._async_handle_step",
-        _flow_manager_async_handle_step,
+        _async_handle_step,
     ):
         yield
 
-    # Run final checks
     unused_ignore = [k for k, v in _ignore_translations.items() if v == "unused"]
     if unused_ignore:
         pytest.fail(
             f"Unused ignore translations: {', '.join(unused_ignore)}. "
             "Please remove them from the ignore_translations fixture."
         )
-    for description in _ignore_translations.values():
-        if description not in {"used", "unused"}:
-            pytest.fail(description)
diff --git a/tests/components/conversation/snapshots/test_http.ambr b/tests/components/conversation/snapshots/test_http.ambr
index d9d859113f8..fd02646df48 100644
--- a/tests/components/conversation/snapshots/test_http.ambr
+++ b/tests/components/conversation/snapshots/test_http.ambr
@@ -23,6 +23,7 @@
           'fa',
           'fi',
           'fr',
+          'fr-CA',
           'gl',
           'gu',
           'he',
@@ -54,7 +55,6 @@
           'sv',
           'sw',
           'te',
-          'th',
           'tr',
           'uk',
           'ur',
@@ -639,7 +639,7 @@
         'details': dict({
           'brightness': dict({
             'name': 'brightness',
-            'text': '100',
+            'text': '100%',
             'value': 100,
           }),
           'name': dict({
@@ -654,7 +654,7 @@
         'match': True,
         'sentence_template': '[<numeric_value_set>] <name> brightness [to] <brightness>',
         'slots': dict({
-          'brightness': '100',
+          'brightness': '100%',
           'name': 'test light',
         }),
         'source': 'builtin',
diff --git a/tests/components/conversation/test_default_agent.py b/tests/components/conversation/test_default_agent.py
index 3c6b463670a..e06ba8b4750 100644
--- a/tests/components/conversation/test_default_agent.py
+++ b/tests/components/conversation/test_default_agent.py
@@ -418,44 +418,6 @@ async def test_trigger_sentences(hass: HomeAssistant) -> None:
     assert len(callback.mock_calls) == 0
 
 
-@pytest.mark.parametrize(
-    ("language", "expected"),
-    [("en", "English done"), ("de", "German done"), ("not_translated", "Done")],
-)
-@pytest.mark.usefixtures("init_components")
-async def test_trigger_sentence_response_translation(
-    hass: HomeAssistant, language: str, expected: str
-) -> None:
-    """Test translation of default response 'done'."""
-    hass.config.language = language
-
-    agent = hass.data[DATA_DEFAULT_ENTITY]
-    assert isinstance(agent, default_agent.DefaultAgent)
-
-    translations = {
-        "en": {"component.conversation.conversation.agent.done": "English done"},
-        "de": {"component.conversation.conversation.agent.done": "German done"},
-        "not_translated": {},
-    }
-
-    with patch(
-        "homeassistant.components.conversation.default_agent.translation.async_get_translations",
-        return_value=translations.get(language),
-    ):
-        unregister = agent.register_trigger(
-            ["test sentence"], AsyncMock(return_value=None)
-        )
-        result = await conversation.async_converse(
-            hass, "test sentence", None, Context()
-        )
-        assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
-        assert result.response.speech == {
-            "plain": {"speech": expected, "extra_data": None}
-        }
-
-        unregister()
-
-
 @pytest.mark.usefixtures("init_components", "sl_setup")
 async def test_shopping_list_add_item(hass: HomeAssistant) -> None:
     """Test adding an item to the shopping list through the default agent."""
@@ -469,7 +431,7 @@ async def test_shopping_list_add_item(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.usefixtures("init_components")
-async def test_nevermind_intent(hass: HomeAssistant) -> None:
+async def test_nevermind_item(hass: HomeAssistant) -> None:
     """Test HassNevermind intent through the default agent."""
     result = await conversation.async_converse(hass, "nevermind", None, Context())
     assert result.response.intent is not None
@@ -479,17 +441,6 @@ async def test_nevermind_intent(hass: HomeAssistant) -> None:
     assert not result.response.speech
 
 
-@pytest.mark.usefixtures("init_components")
-async def test_respond_intent(hass: HomeAssistant) -> None:
-    """Test HassRespond intent through the default agent."""
-    result = await conversation.async_converse(hass, "hello", None, Context())
-    assert result.response.intent is not None
-    assert result.response.intent.intent_type == intent.INTENT_RESPOND
-
-    assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
-    assert result.response.speech["plain"]["speech"] == "Hello from Home Assistant."
-
-
 @pytest.mark.usefixtures("init_components")
 async def test_device_area_context(
     hass: HomeAssistant,
@@ -770,8 +721,8 @@ async def test_error_no_device_on_floor_exposed(
     )
 
     with patch(
-        "homeassistant.components.conversation.default_agent.recognize_best",
-        return_value=recognize_result,
+        "homeassistant.components.conversation.default_agent.recognize_all",
+        return_value=[recognize_result],
     ):
         result = await conversation.async_converse(
             hass, "turn on test light on the ground floor", None, Context(), None
@@ -838,8 +789,8 @@ async def test_error_no_domain(hass: HomeAssistant) -> None:
     )
 
     with patch(
-        "homeassistant.components.conversation.default_agent.recognize_best",
-        return_value=recognize_result,
+        "homeassistant.components.conversation.default_agent.recognize_all",
+        return_value=[recognize_result],
     ):
         result = await conversation.async_converse(
             hass, "turn on the fans", None, Context(), None
@@ -873,8 +824,8 @@ async def test_error_no_domain_exposed(hass: HomeAssistant) -> None:
     )
 
     with patch(
-        "homeassistant.components.conversation.default_agent.recognize_best",
-        return_value=recognize_result,
+        "homeassistant.components.conversation.default_agent.recognize_all",
+        return_value=[recognize_result],
     ):
         result = await conversation.async_converse(
             hass, "turn on the fans", None, Context(), None
@@ -1047,8 +998,8 @@ async def test_error_no_device_class(hass: HomeAssistant) -> None:
     )
 
     with patch(
-        "homeassistant.components.conversation.default_agent.recognize_best",
-        return_value=recognize_result,
+        "homeassistant.components.conversation.default_agent.recognize_all",
+        return_value=[recognize_result],
     ):
         result = await conversation.async_converse(
             hass, "open the windows", None, Context(), None
@@ -1096,8 +1047,8 @@ async def test_error_no_device_class_exposed(hass: HomeAssistant) -> None:
     )
 
     with patch(
-        "homeassistant.components.conversation.default_agent.recognize_best",
-        return_value=recognize_result,
+        "homeassistant.components.conversation.default_agent.recognize_all",
+        return_value=[recognize_result],
     ):
         result = await conversation.async_converse(
             hass, "open all the windows", None, Context(), None
@@ -1207,8 +1158,8 @@ async def test_error_no_device_class_on_floor_exposed(
     )
 
     with patch(
-        "homeassistant.components.conversation.default_agent.recognize_best",
-        return_value=recognize_result,
+        "homeassistant.components.conversation.default_agent.recognize_all",
+        return_value=[recognize_result],
     ):
         result = await conversation.async_converse(
             hass, "open ground floor windows", None, Context(), None
@@ -1229,8 +1180,8 @@ async def test_error_no_device_class_on_floor_exposed(
 async def test_error_no_intent(hass: HomeAssistant) -> None:
     """Test response with an intent match failure."""
     with patch(
-        "homeassistant.components.conversation.default_agent.recognize_best",
-        return_value=None,
+        "homeassistant.components.conversation.default_agent.recognize_all",
+        return_value=[],
     ):
         result = await conversation.async_converse(
             hass, "do something", None, Context(), None
diff --git a/tests/components/conversation/test_trace.py b/tests/components/conversation/test_trace.py
index 7c00b9a80b2..59cd10d2510 100644
--- a/tests/components/conversation/test_trace.py
+++ b/tests/components/conversation/test_trace.py
@@ -56,7 +56,7 @@ async def test_converation_trace(
         "intent_name": "HassListAddItem",
         "slots": {
             "name": "Shopping List",
-            "item": "apples",
+            "item": "apples ",
         },
     }
 
diff --git a/tests/components/deconz/test_alarm_control_panel.py b/tests/components/deconz/test_alarm_control_panel.py
index dbe75584df7..6c47146f9b0 100644
--- a/tests/components/deconz/test_alarm_control_panel.py
+++ b/tests/components/deconz/test_alarm_control_panel.py
@@ -9,7 +9,6 @@ from syrupy import SnapshotAssertion
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
-    AlarmControlPanelState,
 )
 from homeassistant.const import (
     ATTR_CODE,
@@ -18,6 +17,13 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_ARM_NIGHT,
     SERVICE_ALARM_DISARM,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
     Platform,
 )
 from homeassistant.core import HomeAssistant
@@ -111,21 +117,21 @@ async def test_alarm_control_panel(
 
     for action, state in (
         # Event signals alarm control panel armed state
-        (AncillaryControlPanel.ARMED_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (AncillaryControlPanel.ARMED_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (AncillaryControlPanel.ARMED_STAY, AlarmControlPanelState.ARMED_HOME),
-        (AncillaryControlPanel.DISARMED, AlarmControlPanelState.DISARMED),
+        (AncillaryControlPanel.ARMED_AWAY, STATE_ALARM_ARMED_AWAY),
+        (AncillaryControlPanel.ARMED_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (AncillaryControlPanel.ARMED_STAY, STATE_ALARM_ARMED_HOME),
+        (AncillaryControlPanel.DISARMED, STATE_ALARM_DISARMED),
         # Event signals alarm control panel arming state
-        (AncillaryControlPanel.ARMING_AWAY, AlarmControlPanelState.ARMING),
-        (AncillaryControlPanel.ARMING_NIGHT, AlarmControlPanelState.ARMING),
-        (AncillaryControlPanel.ARMING_STAY, AlarmControlPanelState.ARMING),
+        (AncillaryControlPanel.ARMING_AWAY, STATE_ALARM_ARMING),
+        (AncillaryControlPanel.ARMING_NIGHT, STATE_ALARM_ARMING),
+        (AncillaryControlPanel.ARMING_STAY, STATE_ALARM_ARMING),
         # Event signals alarm control panel pending state
-        (AncillaryControlPanel.ENTRY_DELAY, AlarmControlPanelState.PENDING),
-        (AncillaryControlPanel.EXIT_DELAY, AlarmControlPanelState.PENDING),
+        (AncillaryControlPanel.ENTRY_DELAY, STATE_ALARM_PENDING),
+        (AncillaryControlPanel.EXIT_DELAY, STATE_ALARM_PENDING),
         # Event signals alarm control panel triggered state
-        (AncillaryControlPanel.IN_ALARM, AlarmControlPanelState.TRIGGERED),
+        (AncillaryControlPanel.IN_ALARM, STATE_ALARM_TRIGGERED),
         # Event signals alarm control panel unknown state keeps previous state
-        (AncillaryControlPanel.NOT_READY, AlarmControlPanelState.TRIGGERED),
+        (AncillaryControlPanel.NOT_READY, STATE_ALARM_TRIGGERED),
     ):
         await sensor_ws_data({"state": {"panel": action}})
         assert hass.states.get("alarm_control_panel.keypad").state == state
diff --git a/tests/components/deconz/test_config_flow.py b/tests/components/deconz/test_config_flow.py
index ce13bbfa5d4..8555a6e333b 100644
--- a/tests/components/deconz/test_config_flow.py
+++ b/tests/components/deconz/test_config_flow.py
@@ -20,12 +20,12 @@ from homeassistant.components.deconz.const import (
     DOMAIN as DECONZ_DOMAIN,
     HASSIO_CONFIGURATION_URL,
 )
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.components.ssdp import ATTR_UPNP_MANUFACTURER_URL, ATTR_UPNP_SERIAL
 from homeassistant.config_entries import SOURCE_HASSIO, SOURCE_SSDP, SOURCE_USER
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT, CONTENT_TYPE_JSON
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .conftest import API_KEY, BRIDGE_ID
 
diff --git a/tests/components/deconz/test_logbook.py b/tests/components/deconz/test_logbook.py
index 57cf8748762..d23680225f1 100644
--- a/tests/components/deconz/test_logbook.py
+++ b/tests/components/deconz/test_logbook.py
@@ -16,6 +16,7 @@ from homeassistant.const import (
     CONF_EVENT,
     CONF_ID,
     CONF_UNIQUE_ID,
+    STATE_ALARM_ARMED_AWAY,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
@@ -82,7 +83,7 @@ async def test_humanifying_deconz_alarm_event(
                 {
                     CONF_CODE: 1234,
                     CONF_DEVICE_ID: keypad_entry.id,
-                    CONF_EVENT: "armed_away",
+                    CONF_EVENT: STATE_ALARM_ARMED_AWAY,
                     CONF_ID: keypad_event_id,
                     CONF_UNIQUE_ID: keypad_serial,
                 },
@@ -93,7 +94,7 @@ async def test_humanifying_deconz_alarm_event(
                 {
                     CONF_CODE: 1234,
                     CONF_DEVICE_ID: "ff99ff99ff99ff99ff99ff99ff99ff99",
-                    CONF_EVENT: "armed_away",
+                    CONF_EVENT: STATE_ALARM_ARMED_AWAY,
                     CONF_ID: removed_device_event_id,
                     CONF_UNIQUE_ID: removed_device_serial,
                 },
diff --git a/tests/components/demo/test_update.py b/tests/components/demo/test_update.py
index 93a9f272aeb..1fa34ef0a13 100644
--- a/tests/components/demo/test_update.py
+++ b/tests/components/demo/test_update.py
@@ -126,18 +126,9 @@ def test_setup_params(hass: HomeAssistant) -> None:
     )
 
 
-@pytest.mark.parametrize(
-    ("entity_id", "steps"),
-    [
-        ("update.demo_update_with_progress", 10),
-        ("update.demo_update_with_decimal_progress", 1000),
-    ],
-)
-async def test_update_with_progress(
-    hass: HomeAssistant, entity_id: str, steps: int
-) -> None:
+async def test_update_with_progress(hass: HomeAssistant) -> None:
     """Test update with progress."""
-    state = hass.states.get(entity_id)
+    state = hass.states.get("update.demo_update_with_progress")
     assert state
     assert state.state == STATE_ON
     assert state.attributes[ATTR_IN_PROGRESS] is False
@@ -146,7 +137,7 @@ async def test_update_with_progress(
     events = []
     async_track_state_change_event(
         hass,
-        entity_id,
+        "update.demo_update_with_progress",
         # pylint: disable-next=unnecessary-lambda
         callback(lambda event: events.append(event)),
     )
@@ -155,35 +146,40 @@ async def test_update_with_progress(
         await hass.services.async_call(
             UPDATE_DOMAIN,
             SERVICE_INSTALL,
-            {ATTR_ENTITY_ID: entity_id},
+            {ATTR_ENTITY_ID: "update.demo_update_with_progress"},
             blocking=True,
         )
 
-    assert len(events) == steps + 1
-    for i, event in enumerate(events[:steps]):
-        new_state = event.data["new_state"]
-        assert new_state.state == STATE_ON
-        assert new_state.attributes[ATTR_UPDATE_PERCENTAGE] == pytest.approx(
-            100 / steps * i
-        )
-    new_state = events[steps].data["new_state"]
-    assert new_state.attributes[ATTR_IN_PROGRESS] is False
-    assert new_state.attributes[ATTR_UPDATE_PERCENTAGE] is None
-    assert new_state.state == STATE_OFF
+    assert len(events) == 11
+    assert events[0].data["new_state"].state == STATE_ON
+    assert events[0].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[0].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 0
+    assert events[1].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[1].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 10
+    assert events[2].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[2].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 20
+    assert events[3].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[3].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 30
+    assert events[4].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[4].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 40
+    assert events[5].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[5].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 50
+    assert events[6].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[6].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 60
+    assert events[7].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[7].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 70
+    assert events[8].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[8].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 80
+    assert events[9].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[9].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 90
+    assert events[10].data["new_state"].attributes[ATTR_IN_PROGRESS] is False
+    assert events[10].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] is None
+    assert events[10].data["new_state"].state == STATE_OFF
 
 
-@pytest.mark.parametrize(
-    ("entity_id", "steps"),
-    [
-        ("update.demo_update_with_progress", 10),
-        ("update.demo_update_with_decimal_progress", 1000),
-    ],
-)
-async def test_update_with_progress_raising(
-    hass: HomeAssistant, entity_id: str, steps: int
-) -> None:
+async def test_update_with_progress_raising(hass: HomeAssistant) -> None:
     """Test update with progress failing to install."""
-    state = hass.states.get(entity_id)
+    state = hass.states.get("update.demo_update_with_progress")
     assert state
     assert state.state == STATE_ON
     assert state.attributes[ATTR_IN_PROGRESS] is False
@@ -192,7 +188,7 @@ async def test_update_with_progress_raising(
     events = []
     async_track_state_change_event(
         hass,
-        entity_id,
+        "update.demo_update_with_progress",
         # pylint: disable-next=unnecessary-lambda
         callback(lambda event: events.append(event)),
     )
@@ -207,19 +203,24 @@ async def test_update_with_progress_raising(
         await hass.services.async_call(
             UPDATE_DOMAIN,
             SERVICE_INSTALL,
-            {ATTR_ENTITY_ID: entity_id},
+            {ATTR_ENTITY_ID: "update.demo_update_with_progress"},
             blocking=True,
         )
     await hass.async_block_till_done()
 
     assert fake_sleep.call_count == 5
     assert len(events) == 6
-    for i, event in enumerate(events[:5]):
-        new_state = event.data["new_state"]
-        assert new_state.state == STATE_ON
-        assert new_state.attributes[ATTR_UPDATE_PERCENTAGE] == pytest.approx(
-            100 / steps * i
-        )
+    assert events[0].data["new_state"].state == STATE_ON
+    assert events[0].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[0].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 0
+    assert events[1].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[1].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 10
+    assert events[2].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[2].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 20
+    assert events[3].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[3].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 30
+    assert events[4].data["new_state"].attributes[ATTR_IN_PROGRESS] is True
+    assert events[4].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] == 40
     assert events[5].data["new_state"].attributes[ATTR_IN_PROGRESS] is False
     assert events[5].data["new_state"].attributes[ATTR_UPDATE_PERCENTAGE] is None
     assert events[5].data["new_state"].state == STATE_ON
diff --git a/tests/components/device_sun_light_trigger/test_init.py b/tests/components/device_sun_light_trigger/test_init.py
index 24996482916..1de0794b9ee 100644
--- a/tests/components/device_sun_light_trigger/test_init.py
+++ b/tests/components/device_sun_light_trigger/test_init.py
@@ -177,9 +177,6 @@ async def test_lights_turn_on_when_coming_home_after_sun_set_person(
     hass: HomeAssistant, freezer: FrozenDateTimeFactory
 ) -> None:
     """Test lights turn on when coming home after sun set."""
-    # Ensure all setup tasks are done (avoid flaky tests)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
     device_1 = f"{DEVICE_TRACKER_DOMAIN}.device_1"
     device_2 = f"{DEVICE_TRACKER_DOMAIN}.device_2"
 
diff --git a/tests/components/devolo_home_network/mock.py b/tests/components/devolo_home_network/mock.py
index 82bf3e5ad76..fc7786669b7 100644
--- a/tests/components/devolo_home_network/mock.py
+++ b/tests/components/devolo_home_network/mock.py
@@ -50,7 +50,7 @@ class MockDevice(Device):
         self, session_instance: httpx.AsyncClient | None = None
     ) -> None:
         """Give a mocked device the needed properties."""
-        self.mac = DISCOVERY_INFO.properties["PlcMacAddress"] if self.plcnet else None
+        self.mac = DISCOVERY_INFO.properties["PlcMacAddress"]
         self.mt_number = DISCOVERY_INFO.properties["MT"]
         self.product = DISCOVERY_INFO.properties["Product"]
         self.serial_number = DISCOVERY_INFO.properties["SN"]
diff --git a/tests/components/devolo_home_network/snapshots/test_init.ambr b/tests/components/devolo_home_network/snapshots/test_init.ambr
index 297c9a25183..619a8ce1121 100644
--- a/tests/components/devolo_home_network/snapshots/test_init.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_init.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_setup_entry[mock_device]
+# name: test_setup_entry
   DeviceRegistryEntrySnapshot({
     'area_id': None,
     'config_entries': <ANY>,
@@ -35,35 +35,3 @@
     'via_device_id': None,
   })
 # ---
-# name: test_setup_entry[mock_repeater_device]
-  DeviceRegistryEntrySnapshot({
-    'area_id': None,
-    'config_entries': <ANY>,
-    'configuration_url': 'http://192.0.2.1',
-    'connections': set({
-    }),
-    'disabled_by': None,
-    'entry_type': None,
-    'hw_version': None,
-    'id': <ANY>,
-    'identifiers': set({
-      tuple(
-        'devolo_home_network',
-        '1234567890',
-      ),
-    }),
-    'is_new': False,
-    'labels': set({
-    }),
-    'manufacturer': 'devolo',
-    'model': 'dLAN pro 1200+ WiFi ac',
-    'model_id': '2730',
-    'name': 'Mock Title',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': '1234567890',
-    'suggested_area': None,
-    'sw_version': '5.6.1',
-    'via_device_id': None,
-  })
-# ---
diff --git a/tests/components/devolo_home_network/snapshots/test_update.ambr b/tests/components/devolo_home_network/snapshots/test_update.ambr
index 8a1065f9a60..de6a67d5e3d 100644
--- a/tests/components/devolo_home_network/snapshots/test_update.ambr
+++ b/tests/components/devolo_home_network/snapshots/test_update.ambr
@@ -4,7 +4,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/devolo_home_network/icon.png',
       'friendly_name': 'Mock Title Firmware',
       'in_progress': False,
diff --git a/tests/components/devolo_home_network/test_init.py b/tests/components/devolo_home_network/test_init.py
index 71823eabe82..1b8903c568e 100644
--- a/tests/components/devolo_home_network/test_init.py
+++ b/tests/components/devolo_home_network/test_init.py
@@ -27,16 +27,13 @@ from .mock import MockDevice
 from tests.common import MockConfigEntry
 
 
-@pytest.mark.parametrize("device", ["mock_device", "mock_repeater_device"])
 async def test_setup_entry(
     hass: HomeAssistant,
-    device: str,
+    mock_device: MockDevice,
     device_registry: dr.DeviceRegistry,
     snapshot: SnapshotAssertion,
-    request: pytest.FixtureRequest,
 ) -> None:
     """Test setup entry."""
-    mock_device: MockDevice = request.getfixturevalue(device)
     entry = configure_integration(hass)
     assert await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
diff --git a/tests/components/dialogflow/test_init.py b/tests/components/dialogflow/test_init.py
index 8144bef7c1c..4c36a6887aa 100644
--- a/tests/components/dialogflow/test_init.py
+++ b/tests/components/dialogflow/test_init.py
@@ -8,8 +8,8 @@ import pytest
 
 from homeassistant import config_entries
 from homeassistant.components import dialogflow, intent_script
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/ecobee/fixtures/ecobee-data.json b/tests/components/ecobee/fixtures/ecobee-data.json
index e0e82d68863..1573484795f 100644
--- a/tests/components/ecobee/fixtures/ecobee-data.json
+++ b/tests/components/ecobee/fixtures/ecobee-data.json
@@ -160,7 +160,6 @@
         "hasHumidifier": true,
         "humidifierMode": "manual",
         "hasHeatPump": true,
-        "compressorProtectionMinTemp": 100,
         "humidity": "30"
       },
       "equipmentStatus": "fan",
diff --git a/tests/components/ecobee/test_number.py b/tests/components/ecobee/test_number.py
index be65b6dbb30..5b01fe8c5ba 100644
--- a/tests/components/ecobee/test_number.py
+++ b/tests/components/ecobee/test_number.py
@@ -12,8 +12,8 @@ from homeassistant.core import HomeAssistant
 
 from .common import setup_platform
 
-VENTILATOR_MIN_HOME_ID = "number.ecobee_ventilator_minimum_time_home"
-VENTILATOR_MIN_AWAY_ID = "number.ecobee_ventilator_minimum_time_away"
+VENTILATOR_MIN_HOME_ID = "number.ecobee_ventilator_min_time_home"
+VENTILATOR_MIN_AWAY_ID = "number.ecobee_ventilator_min_time_away"
 THERMOSTAT_ID = 0
 
 
@@ -26,9 +26,7 @@ async def test_ventilator_min_on_home_attributes(hass: HomeAssistant) -> None:
     assert state.attributes.get("min") == 0
     assert state.attributes.get("max") == 60
     assert state.attributes.get("step") == 5
-    assert (
-        state.attributes.get("friendly_name") == "ecobee Ventilator minimum time home"
-    )
+    assert state.attributes.get("friendly_name") == "ecobee Ventilator min time home"
     assert state.attributes.get("unit_of_measurement") == UnitOfTime.MINUTES
 
 
@@ -41,9 +39,7 @@ async def test_ventilator_min_on_away_attributes(hass: HomeAssistant) -> None:
     assert state.attributes.get("min") == 0
     assert state.attributes.get("max") == 60
     assert state.attributes.get("step") == 5
-    assert (
-        state.attributes.get("friendly_name") == "ecobee Ventilator minimum time away"
-    )
+    assert state.attributes.get("friendly_name") == "ecobee Ventilator min time away"
     assert state.attributes.get("unit_of_measurement") == UnitOfTime.MINUTES
 
 
@@ -81,42 +77,3 @@ async def test_set_min_time_away(hass: HomeAssistant) -> None:
         )
         await hass.async_block_till_done()
         mock_set_min_away_time.assert_called_once_with(THERMOSTAT_ID, target_value)
-
-
-COMPRESSOR_MIN_TEMP_ID = "number.ecobee2_compressor_minimum_temperature"
-
-
-async def test_compressor_protection_min_temp_attributes(hass: HomeAssistant) -> None:
-    """Test the compressor min temp value is correct.
-
-    Ecobee runs in Fahrenheit; the test rig runs in Celsius. Conversions are necessary.
-    """
-    await setup_platform(hass, NUMBER_DOMAIN)
-
-    state = hass.states.get(COMPRESSOR_MIN_TEMP_ID)
-    assert state.state == "-12.2"
-    assert (
-        state.attributes.get("friendly_name")
-        == "ecobee2 Compressor minimum temperature"
-    )
-
-
-async def test_set_compressor_protection_min_temp(hass: HomeAssistant) -> None:
-    """Test the number can set minimum compressor operating temp.
-
-    Ecobee runs in Fahrenheit; the test rig runs in Celsius. Conversions are necessary
-    """
-    target_value = 0
-    with patch(
-        "homeassistant.components.ecobee.Ecobee.set_aux_cutover_threshold"
-    ) as mock_set_compressor_min_temp:
-        await setup_platform(hass, NUMBER_DOMAIN)
-
-        await hass.services.async_call(
-            NUMBER_DOMAIN,
-            SERVICE_SET_VALUE,
-            {ATTR_ENTITY_ID: COMPRESSOR_MIN_TEMP_ID, ATTR_VALUE: target_value},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
-        mock_set_compressor_min_temp.assert_called_once_with(1, 32)
diff --git a/tests/components/ecobee/test_switch.py b/tests/components/ecobee/test_switch.py
index b3c4c4f8296..31c8ce8f72d 100644
--- a/tests/components/ecobee/test_switch.py
+++ b/tests/components/ecobee/test_switch.py
@@ -118,7 +118,7 @@ async def test_turn_off_20min_ventilator(hass: HomeAssistant) -> None:
         mock_set_20min_ventilator.assert_called_once_with(THERMOSTAT_ID, False)
 
 
-DEVICE_ID = "switch.ecobee2_auxiliary_heat_only"
+DEVICE_ID = "switch.ecobee2_aux_heat_only"
 
 
 async def test_aux_heat_only_turn_on(hass: HomeAssistant) -> None:
diff --git a/tests/components/elevenlabs/test_tts.py b/tests/components/elevenlabs/test_tts.py
index 7151aab10f2..37866a53c5b 100644
--- a/tests/components/elevenlabs/test_tts.py
+++ b/tests/components/elevenlabs/test_tts.py
@@ -32,9 +32,9 @@ from homeassistant.components.media_player import (
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import ATTR_ENTITY_ID, CONF_API_KEY
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.core_config import async_process_ha_core_config
 
 from .const import MOCK_MODELS, MOCK_VOICES
 
diff --git a/tests/components/emoncms/conftest.py b/tests/components/emoncms/conftest.py
index 4bd1d68217a..29e86f3c59d 100644
--- a/tests/components/emoncms/conftest.py
+++ b/tests/components/emoncms/conftest.py
@@ -91,21 +91,6 @@ def config_entry() -> MockConfigEntry:
     )
 
 
-FLOW_RESULT_SECOND_URL = copy.deepcopy(FLOW_RESULT)
-FLOW_RESULT_SECOND_URL[CONF_URL] = "http://1.1.1.2"
-
-
-@pytest.fixture
-def config_entry_unique_id() -> MockConfigEntry:
-    """Mock emoncms config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        title=SENSOR_NAME,
-        data=FLOW_RESULT_SECOND_URL,
-        unique_id="123-53535292",
-    )
-
-
 FLOW_RESULT_NO_FEED = copy.deepcopy(FLOW_RESULT)
 FLOW_RESULT_NO_FEED[CONF_ONLY_INCLUDE_FEEDID] = None
 
@@ -158,5 +143,4 @@ async def emoncms_client() -> AsyncGenerator[AsyncMock]:
     ):
         client = mock_client.return_value
         client.async_request.return_value = {"success": True, "message": FEEDS}
-        client.async_get_uuid.return_value = "123-53535292"
         yield client
diff --git a/tests/components/emoncms/snapshots/test_sensor.ambr b/tests/components/emoncms/snapshots/test_sensor.ambr
index f6a2745fb1a..5e718c1d8e8 100644
--- a/tests/components/emoncms/snapshots/test_sensor.ambr
+++ b/tests/components/emoncms/snapshots/test_sensor.ambr
@@ -30,7 +30,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': '123-53535292-1',
+    'unique_id': 'XXXXXXXX-1',
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
diff --git a/tests/components/emoncms/test_config_flow.py b/tests/components/emoncms/test_config_flow.py
index 1914f23fb0b..b554466639e 100644
--- a/tests/components/emoncms/test_config_flow.py
+++ b/tests/components/emoncms/test_config_flow.py
@@ -2,6 +2,8 @@
 
 from unittest.mock import AsyncMock
 
+import pytest
+
 from homeassistant.components.emoncms.const import CONF_ONLY_INCLUDE_FEEDID, DOMAIN
 from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
 from homeassistant.const import CONF_API_KEY, CONF_URL
@@ -42,7 +44,7 @@ async def test_flow_import_failure(
         data=YAML,
     )
     assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "api_error"
+    assert result["reason"] == EMONCMS_FAILURE["message"]
 
 
 async def test_flow_import_already_configured(
@@ -97,6 +99,10 @@ async def test_user_flow(
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+USER_OPTIONS = {
+    CONF_ONLY_INCLUDE_FEEDID: ["1"],
+}
+
 CONFIG_ENTRY = {
     CONF_API_KEY: "my_api_key",
     CONF_ONLY_INCLUDE_FEEDID: ["1"],
@@ -106,26 +112,27 @@ CONFIG_ENTRY = {
 
 async def test_options_flow(
     hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
     emoncms_client: AsyncMock,
     config_entry: MockConfigEntry,
 ) -> None:
     """Options flow - success test."""
     await setup_integration(hass, config_entry)
-    assert config_entry.options == {}
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     await hass.async_block_till_done()
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={
-            CONF_ONLY_INCLUDE_FEEDID: ["1"],
-        },
+        user_input=USER_OPTIONS,
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert config_entry.options == {
-        CONF_ONLY_INCLUDE_FEEDID: ["1"],
-    }
+    assert result["data"] == CONFIG_ENTRY
+    assert config_entry.options == CONFIG_ENTRY
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.emoncms.options.error.failure"],
+)
 async def test_options_flow_failure(
     hass: HomeAssistant,
     mock_setup_entry: AsyncMock,
@@ -137,25 +144,6 @@ async def test_options_flow_failure(
     await setup_integration(hass, config_entry)
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     await hass.async_block_till_done()
-    assert result["errors"]["base"] == "api_error"
-    assert result["description_placeholders"]["details"] == "failure"
+    assert result["errors"]["base"] == "failure"
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "init"
-
-
-async def test_unique_id_exists(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    emoncms_client: AsyncMock,
-    config_entry_unique_id: MockConfigEntry,
-) -> None:
-    """Test when entry with same unique id already exists."""
-    config_entry_unique_id.add_to_hass(hass)
-    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
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
diff --git a/tests/components/emoncms/test_init.py b/tests/components/emoncms/test_init.py
index abe1a020034..b89b6e65a66 100644
--- a/tests/components/emoncms/test_init.py
+++ b/tests/components/emoncms/test_init.py
@@ -4,14 +4,11 @@ from __future__ import annotations
 
 from unittest.mock import AsyncMock
 
-from homeassistant.components.emoncms.const import DOMAIN, FEED_ID, FEED_NAME
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er, issue_registry as ir
 
 from . import setup_integration
-from .conftest import EMONCMS_FAILURE, FEEDS
+from .conftest import EMONCMS_FAILURE
 
 from tests.common import MockConfigEntry
 
@@ -41,49 +38,3 @@ async def test_failure(
     emoncms_client.async_request.return_value = EMONCMS_FAILURE
     config_entry.add_to_hass(hass)
     assert not await hass.config_entries.async_setup(config_entry.entry_id)
-
-
-async def test_migrate_uuid(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-    emoncms_client: AsyncMock,
-) -> None:
-    """Test migration from home assistant uuid to emoncms uuid."""
-    config_entry.add_to_hass(hass)
-    assert config_entry.unique_id is None
-    for _, feed in enumerate(FEEDS):
-        entity_registry.async_get_or_create(
-            Platform.SENSOR,
-            DOMAIN,
-            f"{config_entry.entry_id}-{feed[FEED_ID]}",
-            config_entry=config_entry,
-            suggested_object_id=f"{DOMAIN}_{feed[FEED_NAME]}",
-        )
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    emoncms_uuid = emoncms_client.async_get_uuid.return_value
-    assert config_entry.unique_id == emoncms_uuid
-    entity_entries = er.async_entries_for_config_entry(
-        entity_registry, config_entry.entry_id
-    )
-
-    for nb, feed in enumerate(FEEDS):
-        assert entity_entries[nb].unique_id == f"{emoncms_uuid}-{feed[FEED_ID]}"
-        assert (
-            entity_entries[nb].previous_unique_id
-            == f"{config_entry.entry_id}-{feed[FEED_ID]}"
-        )
-
-
-async def test_no_uuid(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    issue_registry: ir.IssueRegistry,
-    emoncms_client: AsyncMock,
-) -> None:
-    """Test an issue is created when the emoncms server does not ship an uuid."""
-    emoncms_client.async_get_uuid.return_value = None
-    await setup_integration(hass, config_entry)
-
-    assert issue_registry.async_get_issue(domain=DOMAIN, issue_id="migrate database")
diff --git a/tests/components/esphome/test_alarm_control_panel.py b/tests/components/esphome/test_alarm_control_panel.py
index a3bfc72f3e2..af717ac1b49 100644
--- a/tests/components/esphome/test_alarm_control_panel.py
+++ b/tests/components/esphome/test_alarm_control_panel.py
@@ -4,9 +4,9 @@ from unittest.mock import call
 
 from aioesphomeapi import (
     AlarmControlPanelCommand,
-    AlarmControlPanelEntityState as ESPHomeAlarmEntityState,
+    AlarmControlPanelEntityState,
     AlarmControlPanelInfo,
-    AlarmControlPanelState as ESPHomeAlarmState,
+    AlarmControlPanelState,
     APIClient,
 )
 
@@ -20,10 +20,9 @@ from homeassistant.components.alarm_control_panel import (
     SERVICE_ALARM_ARM_VACATION,
     SERVICE_ALARM_DISARM,
     SERVICE_ALARM_TRIGGER,
-    AlarmControlPanelState,
 )
 from homeassistant.components.esphome.alarm_control_panel import EspHomeACPFeatures
-from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
+from homeassistant.const import ATTR_ENTITY_ID, STATE_ALARM_ARMED_AWAY, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
 
@@ -49,7 +48,9 @@ async def test_generic_alarm_control_panel_requires_code(
             requires_code_to_arm=True,
         )
     ]
-    states = [ESPHomeAlarmEntityState(key=1, state=ESPHomeAlarmState.ARMED_AWAY)]
+    states = [
+        AlarmControlPanelEntityState(key=1, state=AlarmControlPanelState.ARMED_AWAY)
+    ]
     user_service = []
     await mock_generic_device_entry(
         mock_client=mock_client,
@@ -59,7 +60,7 @@ async def test_generic_alarm_control_panel_requires_code(
     )
     state = hass.states.get("alarm_control_panel.test_myalarm_control_panel")
     assert state is not None
-    assert state.state == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMED_AWAY
 
     await hass.services.async_call(
         ALARM_CONTROL_PANEL_DOMAIN,
@@ -182,7 +183,9 @@ async def test_generic_alarm_control_panel_no_code(
             requires_code_to_arm=False,
         )
     ]
-    states = [ESPHomeAlarmEntityState(key=1, state=ESPHomeAlarmState.ARMED_AWAY)]
+    states = [
+        AlarmControlPanelEntityState(key=1, state=AlarmControlPanelState.ARMED_AWAY)
+    ]
     user_service = []
     await mock_generic_device_entry(
         mock_client=mock_client,
@@ -192,7 +195,7 @@ async def test_generic_alarm_control_panel_no_code(
     )
     state = hass.states.get("alarm_control_panel.test_myalarm_control_panel")
     assert state is not None
-    assert state.state == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMED_AWAY
 
     await hass.services.async_call(
         ALARM_CONTROL_PANEL_DOMAIN,
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
index 0a389969c78..2f91921e7f2 100644
--- a/tests/components/esphome/test_config_flow.py
+++ b/tests/components/esphome/test_config_flow.py
@@ -27,10 +27,10 @@ from homeassistant.components.esphome.const import (
     DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
     DOMAIN,
 )
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.helpers.service_info.mqtt import MqttServiceInfo
 
 from . import VALID_NOISE_PSK
@@ -1400,14 +1400,6 @@ async def test_discovery_mqtt_no_mac(
     await mqtt_discovery_test_abort(hass, "{}", "mqtt_missing_mac")
 
 
-@pytest.mark.usefixtures("mock_zeroconf")
-async def test_discovery_mqtt_empty_payload(
-    hass: HomeAssistant, mock_client, mock_setup_entry: None
-) -> None:
-    """Test discovery aborted if MQTT payload is empty."""
-    await mqtt_discovery_test_abort(hass, "", "mqtt_missing_payload")
-
-
 @pytest.mark.usefixtures("mock_zeroconf")
 async def test_discovery_mqtt_no_api(
     hass: HomeAssistant, mock_client, mock_setup_entry: None
diff --git a/tests/components/esphome/test_ffmpeg_proxy.py b/tests/components/esphome/test_ffmpeg_proxy.py
index 295d8d2fda9..ef657ed8c7b 100644
--- a/tests/components/esphome/test_ffmpeg_proxy.py
+++ b/tests/components/esphome/test_ffmpeg_proxy.py
@@ -1,17 +1,13 @@
 """Tests for ffmpeg proxy view."""
 
-from collections.abc import Generator
 from http import HTTPStatus
 import io
-import os
 import tempfile
 from unittest.mock import patch
 from urllib.request import pathname2url
 import wave
 
-from aiohttp import client_exceptions
 import mutagen
-import pytest
 
 from homeassistant.components import esphome
 from homeassistant.components.esphome.ffmpeg_proxy import async_create_proxy_url
@@ -21,29 +17,6 @@ from homeassistant.setup import async_setup_component
 from tests.typing import ClientSessionGenerator
 
 
-@pytest.fixture(name="wav_file_length")
-def wav_file_length_fixture() -> int:
-    """Wanted length of temporary wave file."""
-    return 1
-
-
-@pytest.fixture(name="wav_file")
-def wav_file_fixture(wav_file_length: int) -> Generator[str]:
-    """Create a temporary file and fill it with 1s of silence."""
-    with tempfile.NamedTemporaryFile(mode="wb+", suffix=".wav") as temp_file:
-        _write_silence(temp_file.name, wav_file_length)
-        yield temp_file.name
-
-
-def _write_silence(filename: str, length: int) -> None:
-    """Write silence to a file."""
-    with wave.open(filename, "wb") as wav_file:
-        wav_file.setframerate(16000)
-        wav_file.setsampwidth(2)
-        wav_file.setnchannels(1)
-        wav_file.writeframes(bytes(16000 * 2 * length))  # length s
-
-
 async def test_async_create_proxy_url(hass: HomeAssistant) -> None:
     """Test that async_create_proxy_url returns the correct format."""
     assert await async_setup_component(hass, "esphome", {})
@@ -67,7 +40,6 @@ async def test_async_create_proxy_url(hass: HomeAssistant) -> None:
 async def test_proxy_view(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
-    wav_file: str,
 ) -> None:
     """Test proxy HTTP view for converting audio."""
     device_id = "1234"
@@ -75,36 +47,44 @@ async def test_proxy_view(
     await async_setup_component(hass, esphome.DOMAIN, {esphome.DOMAIN: {}})
     client = await hass_client()
 
-    wav_url = pathname2url(wav_file)
-    convert_id = "test-id"
-    url = f"/api/esphome/ffmpeg_proxy/{device_id}/{convert_id}.mp3"
+    with tempfile.NamedTemporaryFile(mode="wb+", suffix=".wav") as temp_file:
+        with wave.open(temp_file.name, "wb") as wav_file:
+            wav_file.setframerate(16000)
+            wav_file.setsampwidth(2)
+            wav_file.setnchannels(1)
+            wav_file.writeframes(bytes(16000 * 2))  # 1s
 
-    # Should fail because we haven't allowed the URL yet
-    req = await client.get(url)
-    assert req.status == HTTPStatus.NOT_FOUND
+        temp_file.seek(0)
+        wav_url = pathname2url(temp_file.name)
+        convert_id = "test-id"
+        url = f"/api/esphome/ffmpeg_proxy/{device_id}/{convert_id}.mp3"
 
-    # Allow the URL
-    with patch(
-        "homeassistant.components.esphome.ffmpeg_proxy.secrets.token_urlsafe",
-        return_value=convert_id,
-    ):
-        assert (
-            async_create_proxy_url(
-                hass, device_id, wav_url, media_format="mp3", rate=22050, channels=2
+        # Should fail because we haven't allowed the URL yet
+        req = await client.get(url)
+        assert req.status == HTTPStatus.NOT_FOUND
+
+        # Allow the URL
+        with patch(
+            "homeassistant.components.esphome.ffmpeg_proxy.secrets.token_urlsafe",
+            return_value=convert_id,
+        ):
+            assert (
+                async_create_proxy_url(
+                    hass, device_id, wav_url, media_format="mp3", rate=22050, channels=2
+                )
+                == url
             )
-            == url
-        )
 
-    # Requesting the wrong media format should fail
-    wrong_url = f"/api/esphome/ffmpeg_proxy/{device_id}/{convert_id}.flac"
-    req = await client.get(wrong_url)
-    assert req.status == HTTPStatus.BAD_REQUEST
+        # Requesting the wrong media format should fail
+        wrong_url = f"/api/esphome/ffmpeg_proxy/{device_id}/{convert_id}.flac"
+        req = await client.get(wrong_url)
+        assert req.status == HTTPStatus.BAD_REQUEST
 
-    # Correct URL
-    req = await client.get(url)
-    assert req.status == HTTPStatus.OK
+        # Correct URL
+        req = await client.get(url)
+        assert req.status == HTTPStatus.OK
 
-    mp3_data = await req.content.read()
+        mp3_data = await req.content.read()
 
     # Verify conversion
     with io.BytesIO(mp3_data) as mp3_io:
@@ -140,7 +120,6 @@ async def test_ffmpeg_file_doesnt_exist(
 async def test_lingering_process(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
-    wav_file: str,
 ) -> None:
     """Test that a new request stops the old ffmpeg process."""
     device_id = "1234"
@@ -148,157 +127,6 @@ async def test_lingering_process(
     await async_setup_component(hass, esphome.DOMAIN, {esphome.DOMAIN: {}})
     client = await hass_client()
 
-    wav_url = pathname2url(wav_file)
-    url1 = async_create_proxy_url(
-        hass,
-        device_id,
-        wav_url,
-        media_format="wav",
-        rate=22050,
-        channels=2,
-        width=2,
-    )
-
-    # First request will start ffmpeg
-    req1 = await client.get(url1)
-    assert req1.status == HTTPStatus.OK
-
-    # Only read part of the data
-    await req1.content.readexactly(100)
-
-    # Allow another URL
-    url2 = async_create_proxy_url(
-        hass,
-        device_id,
-        wav_url,
-        media_format="wav",
-        rate=22050,
-        channels=2,
-        width=2,
-    )
-
-    req2 = await client.get(url2)
-    assert req2.status == HTTPStatus.OK
-
-    wav_data = await req2.content.read()
-
-    # All of the data should be there because this is a new ffmpeg process
-    with io.BytesIO(wav_data) as wav_io, wave.open(wav_io, "rb") as received_wav_file:
-        # We can't use getnframes() here because the WAV header will be incorrect.
-        # WAV encoders usually go back and update the WAV header after all of
-        # the frames are written, but ffmpeg can't do that because we're
-        # streaming the data.
-        # So instead, we just read and count frames until we run out.
-        num_frames = 0
-        while chunk := received_wav_file.readframes(1024):
-            num_frames += len(chunk) // (2 * 2)  # 2 channels, 16-bit samples
-
-        assert num_frames == 22050  # 1s
-
-
-@pytest.mark.parametrize("wav_file_length", [10])
-async def test_request_same_url_multiple_times(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    wav_file: str,
-) -> None:
-    """Test that the ffmpeg process is restarted if the same URL is requested multiple times."""
-    device_id = "1234"
-
-    await async_setup_component(hass, esphome.DOMAIN, {esphome.DOMAIN: {}})
-    client = await hass_client()
-
-    wav_url = pathname2url(wav_file)
-    url = async_create_proxy_url(
-        hass,
-        device_id,
-        wav_url,
-        media_format="wav",
-        rate=22050,
-        channels=2,
-        width=2,
-    )
-
-    # First request will start ffmpeg
-    req1 = await client.get(url)
-    assert req1.status == HTTPStatus.OK
-
-    # Only read part of the data
-    await req1.content.readexactly(100)
-
-    # Second request should restart ffmpeg
-    req2 = await client.get(url)
-    assert req2.status == HTTPStatus.OK
-
-    wav_data = await req2.content.read()
-
-    # All of the data should be there because this is a new ffmpeg process
-    with io.BytesIO(wav_data) as wav_io, wave.open(wav_io, "rb") as received_wav_file:
-        num_frames = 0
-        while chunk := received_wav_file.readframes(1024):
-            num_frames += len(chunk) // (2 * 2)  # 2 channels, 16-bit samples
-
-        assert num_frames == 22050 * 10  # 10s
-
-
-async def test_max_conversions_per_device(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-) -> None:
-    """Test that each device has a maximum number of conversions (currently 2)."""
-    max_conversions = 2
-    device_ids = ["1234", "5678"]
-
-    await async_setup_component(hass, esphome.DOMAIN, {esphome.DOMAIN: {}})
-    client = await hass_client()
-
-    with tempfile.TemporaryDirectory() as temp_dir:
-        wav_paths = [
-            os.path.join(temp_dir, f"{i}.wav") for i in range(max_conversions + 1)
-        ]
-        for wav_path in wav_paths:
-            _write_silence(wav_path, 10)
-
-        wav_urls = [pathname2url(p) for p in wav_paths]
-
-        # Each device will have max + 1 conversions
-        device_urls = {
-            device_id: [
-                async_create_proxy_url(
-                    hass,
-                    device_id,
-                    wav_url,
-                    media_format="wav",
-                    rate=22050,
-                    channels=2,
-                    width=2,
-                )
-                for wav_url in wav_urls
-            ]
-            for device_id in device_ids
-        }
-
-        for urls in device_urls.values():
-            # First URL should fail because it was overwritten by the others
-            req = await client.get(urls[0])
-            assert req.status == HTTPStatus.BAD_REQUEST
-
-            # All other URLs should succeed
-            for url in urls[1:]:
-                req = await client.get(url)
-                assert req.status == HTTPStatus.OK
-
-
-async def test_abort_on_shutdown(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-) -> None:
-    """Test we abort on Home Assistant shutdown."""
-    device_id = "1234"
-
-    await async_setup_component(hass, esphome.DOMAIN, {esphome.DOMAIN: {}})
-    client = await hass_client()
-
     with tempfile.NamedTemporaryFile(mode="wb+", suffix=".wav") as temp_file:
         with wave.open(temp_file.name, "wb") as wav_file:
             wav_file.setframerate(16000)
@@ -306,10 +134,73 @@ async def test_abort_on_shutdown(
             wav_file.setnchannels(1)
             wav_file.writeframes(bytes(16000 * 2))  # 1s
 
+        temp_file.seek(0)
         wav_url = pathname2url(temp_file.name)
-        convert_id = "test-id"
-        url = f"/api/esphome/ffmpeg_proxy/{device_id}/{convert_id}.mp3"
+        url1 = async_create_proxy_url(
+            hass,
+            device_id,
+            wav_url,
+            media_format="wav",
+            rate=22050,
+            channels=2,
+            width=2,
+        )
 
+        # First request will start ffmpeg
+        req1 = await client.get(url1)
+        assert req1.status == HTTPStatus.OK
+
+        # Only read part of the data
+        await req1.content.readexactly(100)
+
+        # Allow another URL
+        url2 = async_create_proxy_url(
+            hass,
+            device_id,
+            wav_url,
+            media_format="wav",
+            rate=22050,
+            channels=2,
+            width=2,
+        )
+
+        req2 = await client.get(url2)
+        assert req2.status == HTTPStatus.OK
+
+        wav_data = await req2.content.read()
+
+    # All of the data should be there because this is a new ffmpeg process
+    with io.BytesIO(wav_data) as wav_io, wave.open(wav_io, "rb") as wav_file:
+        # We can't use getnframes() here because the WAV header will be incorrect.
+        # WAV encoders usually go back and update the WAV header after all of
+        # the frames are written, but ffmpeg can't do that because we're
+        # streaming the data.
+        # So instead, we just read and count frames until we run out.
+        num_frames = 0
+        while chunk := wav_file.readframes(1024):
+            num_frames += len(chunk) // (2 * 2)  # 2 channels, 16-bit samples
+
+        assert num_frames == 22050  # 1s
+
+
+async def test_request_same_url_multiple_times(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test that the ffmpeg process is restarted if the same URL is requested multiple times."""
+    device_id = "1234"
+
+    await async_setup_component(hass, esphome.DOMAIN, {esphome.DOMAIN: {}})
+    client = await hass_client()
+
+    with tempfile.NamedTemporaryFile(mode="wb+", suffix=".wav") as temp_file:
+        with wave.open(temp_file.name, "wb") as wav_file:
+            wav_file.setframerate(16000)
+            wav_file.setsampwidth(2)
+            wav_file.setnchannels(1)
+            wav_file.writeframes(bytes(16000 * 2 * 10))  # 10s
+
+        temp_file.seek(0)
         wav_url = pathname2url(temp_file.name)
         url = async_create_proxy_url(
             hass,
@@ -321,14 +212,23 @@ async def test_abort_on_shutdown(
             width=2,
         )
 
-        # Get URL and start reading
-        req = await client.get(url)
-        assert req.status == HTTPStatus.OK
-        initial_mp3_data = await req.content.read(4)
-        assert initial_mp3_data == b"RIFF"
+        # First request will start ffmpeg
+        req1 = await client.get(url)
+        assert req1.status == HTTPStatus.OK
 
-        # Shut down Home Assistant
-        await hass.async_stop()
+        # Only read part of the data
+        await req1.content.readexactly(100)
 
-        with pytest.raises(client_exceptions.ClientPayloadError):
-            await req.content.read()
+        # Second request should restart ffmpeg
+        req2 = await client.get(url)
+        assert req2.status == HTTPStatus.OK
+
+        wav_data = await req2.content.read()
+
+    # All of the data should be there because this is a new ffmpeg process
+    with io.BytesIO(wav_data) as wav_io, wave.open(wav_io, "rb") as wav_file:
+        num_frames = 0
+        while chunk := wav_file.readframes(1024):
+            num_frames += len(chunk) // (2 * 2)  # 2 channels, 16-bit samples
+
+        assert num_frames == 22050 * 10  # 10s
diff --git a/tests/components/evohome/conftest.py b/tests/components/evohome/conftest.py
index 6daab3f32bb..b46c62f8651 100644
--- a/tests/components/evohome/conftest.py
+++ b/tests/components/evohome/conftest.py
@@ -11,15 +11,12 @@ from unittest.mock import MagicMock, patch
 from aiohttp import ClientSession
 from evohomeasync2 import EvohomeClient
 from evohomeasync2.broker import Broker
-from evohomeasync2.controlsystem import ControlSystem
-from evohomeasync2.zone import Zone
 import pytest
 
 from homeassistant.components.evohome import CONF_PASSWORD, CONF_USERNAME, DOMAIN
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt as dt_util, slugify
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import JsonArrayType, JsonObjectType
 
 from .const import ACCESS_TOKEN, REFRESH_TOKEN, USERNAME
@@ -141,14 +138,7 @@ async def setup_evohome(
         patch("homeassistant.components.evohome.ev1.EvohomeClient", return_value=None),
         patch("evohomeasync2.broker.Broker.get", mock_get_factory(install)),
     ):
-        evo: EvohomeClient | None = None
-
-        def evohome_client(*args, **kwargs) -> EvohomeClient:
-            nonlocal evo
-            evo = EvohomeClient(*args, **kwargs)
-            return evo
-
-        mock_client.side_effect = evohome_client
+        mock_client.side_effect = EvohomeClient
 
         assert await async_setup_component(hass, DOMAIN, {DOMAIN: config})
         await hass.async_block_till_done()
@@ -160,49 +150,6 @@ async def setup_evohome(
 
         assert isinstance(mock_client.call_args.kwargs["session"], ClientSession)
 
-        assert evo and evo.account_info is not None
+        assert mock_client.account_info is not None
 
-        mock_client.return_value = evo
         yield mock_client
-
-
-@pytest.fixture
-async def evohome(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    install: str,
-) -> AsyncGenerator[MagicMock]:
-    """Return the mocked evohome client for this install fixture."""
-
-    async for mock_client in setup_evohome(hass, config, install=install):
-        yield mock_client
-
-
-@pytest.fixture
-async def ctl_id(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    install: MagicMock,
-) -> AsyncGenerator[str]:
-    """Return the entity_id of the evohome integration's controller."""
-
-    async for mock_client in setup_evohome(hass, config, install=install):
-        evo: EvohomeClient = mock_client.return_value
-        ctl: ControlSystem = evo._get_single_tcs()
-
-        yield f"{Platform.CLIMATE}.{slugify(ctl.location.name)}"
-
-
-@pytest.fixture
-async def zone_id(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    install: MagicMock,
-) -> AsyncGenerator[str]:
-    """Return the entity_id of the evohome integration's first zone."""
-
-    async for mock_client in setup_evohome(hass, config, install=install):
-        evo: EvohomeClient = mock_client.return_value
-        zone: Zone = list(evo._get_single_tcs().zones.values())[0]
-
-        yield f"{Platform.CLIMATE}.{slugify(zone.name)}"
diff --git a/tests/components/evohome/snapshots/test_climate.ambr b/tests/components/evohome/snapshots/test_climate.ambr
index ce7fcf2744e..1a77cf0e80d 100644
--- a/tests/components/evohome/snapshots/test_climate.ambr
+++ b/tests/components/evohome/snapshots/test_climate.ambr
@@ -1,1459 +1,190 @@
 # serializer version: 1
-# name: test_ctl_set_hvac_mode[default]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_ctl_set_hvac_mode[h032585]
-  list([
-    tuple(
-      'Off',
-    ),
-    tuple(
-      'Heat',
-    ),
-  ])
-# ---
-# name: test_ctl_set_hvac_mode[h099625]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_ctl_set_hvac_mode[minimal]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_ctl_set_hvac_mode[sys_004]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_off[default]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_off[h032585]
-  list([
-    tuple(
-      'Off',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_off[h099625]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_off[minimal]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_off[sys_004]
-  list([
-    tuple(
-      'HeatingOff',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_on[default]
-  list([
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_on[h032585]
-  list([
-    tuple(
-      'Heat',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_on[h099625]
-  list([
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_on[minimal]
-  list([
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_ctl_turn_on[sys_004]
-  list([
-    tuple(
-      'Auto',
-    ),
-  ])
-# ---
-# name: test_setup_platform[botched][climate.bathroom_dn-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 20.0,
-      'friendly_name': 'Bathroom Dn',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 16.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 20.0,
-        }),
-        'zone_id': '3432579',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 16.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.bathroom_dn',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[botched][climate.dead_zone-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': None,
-      'friendly_name': 'Dead Zone',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': False,
-        }),
-        'zone_id': '3432521',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.dead_zone',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[botched][climate.front_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.0,
-      'friendly_name': 'Front Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'temporary',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-          dict({
-            'faultType': 'TempZoneActuatorLowBattery',
-            'since': '2022-03-02T04:50:20',
-          }),
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'TemporaryOverride',
-          'target_heat_temperature': 21.0,
-          'until': '2022-03-07T20:00:00+01:00',
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.0,
-        }),
-        'zone_id': '3432577',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 21.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.front_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[botched][climate.kids_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.5,
-      'friendly_name': 'Kids Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.5,
-        }),
-        'zone_id': '3449703',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.kids_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[botched][climate.kitchen-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 20.0,
-      'friendly_name': 'Kitchen',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 20.0,
-        }),
-        'zone_id': '3432578',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.kitchen',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[botched][climate.main_bedroom-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 21.0,
-      'friendly_name': 'Main Bedroom',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 16.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 21.0,
-        }),
-        'zone_id': '3432580',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 16.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.main_bedroom',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[botched][climate.main_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.0,
-      'friendly_name': 'Main Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'permanent',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-          dict({
-            'faultType': 'TempZoneActuatorCommunicationLost',
-            'since': '2022-03-02T15:56:01',
-          }),
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'PermanentOverride',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.0,
-        }),
-        'zone_id': '3432576',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.main_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[botched][climate.my_home-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.7,
-      'friendly_name': 'My Home',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'icon': 'mdi:thermostat',
-      'max_temp': 35,
-      'min_temp': 7,
-      'preset_mode': 'eco',
-      'preset_modes': list([
-        'Reset',
-        'eco',
-        'away',
-        'home',
-        'Custom',
-      ]),
-      'status': dict({
-        'active_system_faults': list([
-        ]),
-        'system_id': '3432522',
-        'system_mode_status': dict({
-          'is_permanent': True,
-          'mode': 'AutoWithEco',
-        }),
-      }),
-      'supported_features': <ClimateEntityFeature: 400>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.my_home',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.bathroom_dn-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 20.0,
-      'friendly_name': 'Bathroom Dn',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 16.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 20.0,
-        }),
-        'zone_id': '3432579',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 16.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.bathroom_dn',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.dead_zone-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': None,
-      'friendly_name': 'Dead Zone',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': False,
-        }),
-        'zone_id': '3432521',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.dead_zone',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.front_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.0,
-      'friendly_name': 'Front Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'temporary',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'TemporaryOverride',
-          'target_heat_temperature': 21.0,
-          'until': '2022-03-07T20:00:00+01:00',
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.0,
-        }),
-        'zone_id': '3432577',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 21.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.front_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.kids_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.5,
-      'friendly_name': 'Kids Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.5,
-        }),
-        'zone_id': '3449703',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.kids_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.kitchen-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 20.0,
-      'friendly_name': 'Kitchen',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 20.0,
-        }),
-        'zone_id': '3432578',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.kitchen',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.main_bedroom-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 21.0,
-      'friendly_name': 'Main Bedroom',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 16.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 21.0,
-        }),
-        'zone_id': '3432580',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 16.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.main_bedroom',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.main_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.0,
-      'friendly_name': 'Main Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'permanent',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'PermanentOverride',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.0,
-        }),
-        'zone_id': '3432576',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.main_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.my_home-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.7,
-      'friendly_name': 'My Home',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'icon': 'mdi:thermostat',
-      'max_temp': 35,
-      'min_temp': 7,
-      'preset_mode': 'eco',
-      'preset_modes': list([
-        'Reset',
-        'eco',
-        'away',
-        'home',
-        'Custom',
-      ]),
-      'status': dict({
-        'active_system_faults': list([
-        ]),
-        'system_id': '3432522',
-        'system_mode_status': dict({
-          'is_permanent': True,
-          'mode': 'AutoWithEco',
-        }),
-      }),
-      'supported_features': <ClimateEntityFeature: 400>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.my_home',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[default][climate.spare_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.5,
-      'friendly_name': 'Spare Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'permanent',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'PermanentOverride',
-          'target_heat_temperature': 14.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.5,
-        }),
-        'zone_id': '3450733',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 14.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.spare_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[h032585][climate.my_home-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 21.5,
-      'friendly_name': 'My Home',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'icon': 'mdi:thermostat',
-      'max_temp': 35,
-      'min_temp': 7,
-      'status': dict({
-        'active_system_faults': list([
-        ]),
-        'system_id': '416856',
-        'system_mode_status': dict({
-          'is_permanent': True,
-          'mode': 'Heat',
-        }),
-      }),
-      'supported_features': <ClimateEntityFeature: 384>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.my_home',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[h032585][climate.thermostat-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 21.5,
-      'friendly_name': 'THERMOSTAT',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 32.0,
-      'min_temp': 4.5,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 21.5,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 21.5,
-        }),
-        'zone_id': '416856',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 21.5,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.thermostat',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[h099625][climate.my_home-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 21.5,
-      'friendly_name': 'My Home',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'icon': 'mdi:thermostat',
-      'max_temp': 35,
-      'min_temp': 7,
-      'preset_mode': None,
-      'preset_modes': list([
-        'eco',
-        'away',
-      ]),
-      'status': dict({
-        'active_system_faults': list([
-        ]),
-        'system_id': '8557535',
-        'system_mode_status': dict({
-          'is_permanent': True,
-          'mode': 'Auto',
-        }),
-      }),
-      'supported_features': <ClimateEntityFeature: 400>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.my_home',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[h099625][climate.thermostat-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 21.5,
-      'friendly_name': 'THERMOSTAT',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 21.5,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+03:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+03:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 21.5,
-        }),
-        'zone_id': '8557539',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 21.5,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.thermostat',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[h099625][climate.thermostat_2-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 21.5,
-      'friendly_name': 'THERMOSTAT',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 21.5,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+03:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+03:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 21.5,
-        }),
-        'zone_id': '8557541',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 21.5,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.thermostat_2',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[minimal][climate.main_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.0,
-      'friendly_name': 'Main Room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'none',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'FollowSchedule',
-          'target_heat_temperature': 17.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+01:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+01:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.0,
-        }),
-        'zone_id': '3432576',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 17.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.main_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[minimal][climate.my_home-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.0,
-      'friendly_name': 'My Home',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'icon': 'mdi:thermostat',
-      'max_temp': 35,
-      'min_temp': 7,
-      'preset_mode': 'eco',
-      'preset_modes': list([
-        'Reset',
-        'eco',
-        'away',
-        'home',
-        'Custom',
-      ]),
-      'status': dict({
-        'active_system_faults': list([
-        ]),
-        'system_id': '3432522',
-        'system_mode_status': dict({
-          'is_permanent': True,
-          'mode': 'AutoWithEco',
-        }),
-      }),
-      'supported_features': <ClimateEntityFeature: 400>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.my_home',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[sys_004][climate.living_room-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.5,
-      'friendly_name': 'Living room',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'icon': 'mdi:thermostat',
-      'max_temp': 35,
-      'min_temp': 7,
-      'preset_mode': None,
-      'preset_modes': list([
-        'eco',
-        'away',
-      ]),
-      'status': dict({
-        'active_system_faults': list([
-        ]),
-        'system_id': '4187769',
-        'system_mode_status': dict({
-          'is_permanent': True,
-          'mode': 'Auto',
-        }),
-      }),
-      'supported_features': <ClimateEntityFeature: 400>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.living_room',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
-# name: test_setup_platform[sys_004][climate.thermostat-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 19.5,
-      'friendly_name': 'Thermostat',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.HEAT: 'heat'>,
-      ]),
-      'max_temp': 35.0,
-      'min_temp': 5.0,
-      'preset_mode': 'permanent',
-      'preset_modes': list([
-        'none',
-        'temporary',
-        'permanent',
-      ]),
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'setpoint_status': dict({
-          'setpoint_mode': 'PermanentOverride',
-          'target_heat_temperature': 15.0,
-        }),
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T22:10:00+02:00',
-          'next_sp_temp': 18.6,
-          'this_sp_from': '2024-07-10T08:00:00+02:00',
-          'this_sp_temp': 16.0,
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 19.5,
-        }),
-        'zone_id': '4187768',
-      }),
-      'supported_features': <ClimateEntityFeature: 401>,
-      'temperature': 15.0,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.thermostat',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
 # name: test_zone_set_hvac_mode[default]
   list([
     tuple(
-      5.0,
+      dict({
+        'HeatSetpointValue': 5.0,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
   ])
 # ---
 # name: test_zone_set_hvac_mode[h032585]
   list([
     tuple(
-      4.5,
+      dict({
+        'HeatSetpointValue': 4.5,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
   ])
 # ---
 # name: test_zone_set_hvac_mode[h099625]
   list([
     tuple(
-      5.0,
+      dict({
+        'HeatSetpointValue': 5.0,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
   ])
 # ---
 # name: test_zone_set_hvac_mode[minimal]
   list([
     tuple(
-      5.0,
+      dict({
+        'HeatSetpointValue': 5.0,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
   ])
 # ---
 # name: test_zone_set_hvac_mode[sys_004]
   list([
     tuple(
-      5.0,
+      dict({
+        'HeatSetpointValue': 5.0,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
   ])
 # ---
 # name: test_zone_set_preset_mode[default]
   list([
     tuple(
-      17.0,
+      dict({
+        'HeatSetpointValue': 17.0,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
     tuple(
-      17.0,
+      dict({
+        'HeatSetpointValue': 17.0,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T21:10:00Z',
+      }),
     ),
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
-    }),
   ])
 # ---
 # name: test_zone_set_preset_mode[h032585]
   list([
     tuple(
-      21.5,
+      dict({
+        'HeatSetpointValue': 21.5,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
     tuple(
-      21.5,
+      dict({
+        'HeatSetpointValue': 21.5,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T21:10:00Z',
+      }),
     ),
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
-    }),
   ])
 # ---
 # name: test_zone_set_preset_mode[h099625]
   list([
     tuple(
-      21.5,
+      dict({
+        'HeatSetpointValue': 21.5,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
     tuple(
-      21.5,
+      dict({
+        'HeatSetpointValue': 21.5,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T19:10:00Z',
+      }),
     ),
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 19, 10, tzinfo=datetime.timezone.utc),
-    }),
   ])
 # ---
 # name: test_zone_set_preset_mode[minimal]
   list([
     tuple(
-      17.0,
+      dict({
+        'HeatSetpointValue': 17.0,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
     tuple(
-      17.0,
+      dict({
+        'HeatSetpointValue': 17.0,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T21:10:00Z',
+      }),
     ),
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
-    }),
   ])
 # ---
 # name: test_zone_set_preset_mode[sys_004]
   list([
     tuple(
-      15.0,
+      dict({
+        'HeatSetpointValue': 15.0,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
     tuple(
-      15.0,
+      dict({
+        'HeatSetpointValue': 15.0,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T20:10:00Z',
+      }),
     ),
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 20, 10, tzinfo=datetime.timezone.utc),
-    }),
   ])
 # ---
 # name: test_zone_set_temperature[default]
   list([
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
-    }),
+    tuple(
+      dict({
+        'HeatSetpointValue': 19.1,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T21:10:00Z',
+      }),
+    ),
   ])
 # ---
 # name: test_zone_set_temperature[h032585]
   list([
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
-    }),
+    tuple(
+      dict({
+        'HeatSetpointValue': 19.1,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T21:10:00Z',
+      }),
+    ),
   ])
 # ---
 # name: test_zone_set_temperature[h099625]
   list([
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 19, 10, tzinfo=datetime.timezone.utc),
-    }),
+    tuple(
+      dict({
+        'HeatSetpointValue': 19.1,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T19:10:00Z',
+      }),
+    ),
   ])
 # ---
 # name: test_zone_set_temperature[minimal]
   list([
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 21, 10, tzinfo=datetime.timezone.utc),
-    }),
+    tuple(
+      dict({
+        'HeatSetpointValue': 19.1,
+        'setpointMode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'timeUntil': '2024-07-10T21:10:00Z',
+      }),
+    ),
   ])
 # ---
 # name: test_zone_set_temperature[sys_004]
-  list([
-    dict({
-      'until': None,
-    }),
-  ])
-# ---
-# name: test_zone_turn_off[default]
   list([
     tuple(
-      5.0,
-    ),
-  ])
-# ---
-# name: test_zone_turn_off[h032585]
-  list([
-    tuple(
-      4.5,
-    ),
-  ])
-# ---
-# name: test_zone_turn_off[h099625]
-  list([
-    tuple(
-      5.0,
-    ),
-  ])
-# ---
-# name: test_zone_turn_off[minimal]
-  list([
-    tuple(
-      5.0,
-    ),
-  ])
-# ---
-# name: test_zone_turn_off[sys_004]
-  list([
-    tuple(
-      5.0,
+      dict({
+        'HeatSetpointValue': 19.1,
+        'setpointMode': <ZoneMode.PERMANENT_OVERRIDE: 'PermanentOverride'>,
+      }),
     ),
   ])
 # ---
diff --git a/tests/components/evohome/snapshots/test_init.ambr b/tests/components/evohome/snapshots/test_init.ambr
index d2e91e3c43d..11237e6b35a 100644
--- a/tests/components/evohome/snapshots/test_init.ambr
+++ b/tests/components/evohome/snapshots/test_init.ambr
@@ -1,19 +1,1231 @@
 # serializer version: 1
-# name: test_setup[botched]
-  dict_keys(['refresh_system', 'reset_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
+# name: test_entities[botched]
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.7,
+        'friendly_name': 'My Home',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'icon': 'mdi:thermostat',
+        'max_temp': 35,
+        'min_temp': 7,
+        'preset_mode': 'eco',
+        'preset_modes': list([
+          'Reset',
+          'eco',
+          'away',
+          'home',
+          'Custom',
+        ]),
+        'status': dict({
+          'active_system_faults': list([
+          ]),
+          'system_id': '3432522',
+          'system_mode_status': dict({
+            'is_permanent': True,
+            'mode': 'AutoWithEco',
+          }),
+        }),
+        'supported_features': <ClimateEntityFeature: 400>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.my_home',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': None,
+        'friendly_name': 'Dead Zone',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': False,
+          }),
+          'zone_id': '3432521',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.dead_zone',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.0,
+        'friendly_name': 'Main Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'permanent',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+            dict({
+              'faultType': 'TempZoneActuatorCommunicationLost',
+              'since': '2022-03-02T15:56:01',
+            }),
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'PermanentOverride',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.0,
+          }),
+          'zone_id': '3432576',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.main_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.0,
+        'friendly_name': 'Front Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'temporary',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+            dict({
+              'faultType': 'TempZoneActuatorLowBattery',
+              'since': '2022-03-02T04:50:20',
+            }),
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'TemporaryOverride',
+            'target_heat_temperature': 21.0,
+            'until': '2022-03-07T20:00:00+01:00',
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.0,
+          }),
+          'zone_id': '3432577',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 21.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.front_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 20.0,
+        'friendly_name': 'Kitchen',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 20.0,
+          }),
+          'zone_id': '3432578',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.kitchen',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 20.0,
+        'friendly_name': 'Bathroom Dn',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 16.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 20.0,
+          }),
+          'zone_id': '3432579',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 16.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.bathroom_dn',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 21.0,
+        'friendly_name': 'Main Bedroom',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 16.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 21.0,
+          }),
+          'zone_id': '3432580',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 16.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.main_bedroom',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.5,
+        'friendly_name': 'Kids Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.5,
+          }),
+          'zone_id': '3449703',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.kids_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'away_mode': 'on',
+        'current_temperature': 23,
+        'friendly_name': 'Domestic Hot Water',
+        'icon': 'mdi:thermometer-lines',
+        'max_temp': 60,
+        'min_temp': 43,
+        'operation_list': list([
+          'auto',
+          'on',
+          'off',
+        ]),
+        'operation_mode': 'off',
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'dhw_id': '3933910',
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T13:00:00+01:00',
+            'next_sp_state': 'Off',
+            'this_sp_from': '2024-07-10T12:00:00+01:00',
+            'this_sp_state': 'On',
+          }),
+          'state_status': dict({
+            'mode': 'PermanentOverride',
+            'state': 'Off',
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 23.0,
+          }),
+        }),
+        'supported_features': <WaterHeaterEntityFeature: 6>,
+        'target_temp_high': None,
+        'target_temp_low': None,
+        'temperature': None,
+      }),
+      'context': <ANY>,
+      'entity_id': 'water_heater.domestic_hot_water',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'off',
+    }),
+  ])
 # ---
-# name: test_setup[default]
-  dict_keys(['refresh_system', 'reset_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
+# name: test_entities[default]
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.7,
+        'friendly_name': 'My Home',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'icon': 'mdi:thermostat',
+        'max_temp': 35,
+        'min_temp': 7,
+        'preset_mode': 'eco',
+        'preset_modes': list([
+          'Reset',
+          'eco',
+          'away',
+          'home',
+          'Custom',
+        ]),
+        'status': dict({
+          'active_system_faults': list([
+          ]),
+          'system_id': '3432522',
+          'system_mode_status': dict({
+            'is_permanent': True,
+            'mode': 'AutoWithEco',
+          }),
+        }),
+        'supported_features': <ClimateEntityFeature: 400>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.my_home',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': None,
+        'friendly_name': 'Dead Zone',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': False,
+          }),
+          'zone_id': '3432521',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.dead_zone',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.0,
+        'friendly_name': 'Main Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'permanent',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'PermanentOverride',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.0,
+          }),
+          'zone_id': '3432576',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.main_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.0,
+        'friendly_name': 'Front Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'temporary',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'TemporaryOverride',
+            'target_heat_temperature': 21.0,
+            'until': '2022-03-07T20:00:00+01:00',
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.0,
+          }),
+          'zone_id': '3432577',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 21.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.front_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 20.0,
+        'friendly_name': 'Kitchen',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 20.0,
+          }),
+          'zone_id': '3432578',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.kitchen',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 20.0,
+        'friendly_name': 'Bathroom Dn',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 16.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 20.0,
+          }),
+          'zone_id': '3432579',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 16.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.bathroom_dn',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 21.0,
+        'friendly_name': 'Main Bedroom',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 16.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 21.0,
+          }),
+          'zone_id': '3432580',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 16.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.main_bedroom',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.5,
+        'friendly_name': 'Kids Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.5,
+          }),
+          'zone_id': '3449703',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.kids_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.5,
+        'friendly_name': 'Spare Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'permanent',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'PermanentOverride',
+            'target_heat_temperature': 14.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.5,
+          }),
+          'zone_id': '3450733',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 14.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.spare_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'away_mode': 'on',
+        'current_temperature': 23,
+        'friendly_name': 'Domestic Hot Water',
+        'icon': 'mdi:thermometer-lines',
+        'max_temp': 60,
+        'min_temp': 43,
+        'operation_list': list([
+          'auto',
+          'on',
+          'off',
+        ]),
+        'operation_mode': 'off',
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'dhw_id': '3933910',
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T13:00:00+01:00',
+            'next_sp_state': 'Off',
+            'this_sp_from': '2024-07-10T12:00:00+01:00',
+            'this_sp_state': 'On',
+          }),
+          'state_status': dict({
+            'mode': 'PermanentOverride',
+            'state': 'Off',
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 23.0,
+          }),
+        }),
+        'supported_features': <WaterHeaterEntityFeature: 6>,
+        'target_temp_high': None,
+        'target_temp_low': None,
+        'temperature': None,
+      }),
+      'context': <ANY>,
+      'entity_id': 'water_heater.domestic_hot_water',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'off',
+    }),
+  ])
 # ---
-# name: test_setup[h032585]
-  dict_keys(['refresh_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
+# name: test_entities[h032585]
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 21.5,
+        'friendly_name': 'My Home',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'icon': 'mdi:thermostat',
+        'max_temp': 35,
+        'min_temp': 7,
+        'status': dict({
+          'active_system_faults': list([
+          ]),
+          'system_id': '416856',
+          'system_mode_status': dict({
+            'is_permanent': True,
+            'mode': 'Heat',
+          }),
+        }),
+        'supported_features': <ClimateEntityFeature: 384>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.my_home',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 21.5,
+        'friendly_name': 'THERMOSTAT',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 32.0,
+        'min_temp': 4.5,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 21.5,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 21.5,
+          }),
+          'zone_id': '416856',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 21.5,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.thermostat',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+  ])
 # ---
-# name: test_setup[h099625]
-  dict_keys(['refresh_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
+# name: test_entities[h099625]
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 21.5,
+        'friendly_name': 'My Home',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'icon': 'mdi:thermostat',
+        'max_temp': 35,
+        'min_temp': 7,
+        'preset_mode': None,
+        'preset_modes': list([
+          'eco',
+          'away',
+        ]),
+        'status': dict({
+          'active_system_faults': list([
+          ]),
+          'system_id': '8557535',
+          'system_mode_status': dict({
+            'is_permanent': True,
+            'mode': 'Auto',
+          }),
+        }),
+        'supported_features': <ClimateEntityFeature: 400>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.my_home',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 21.5,
+        'friendly_name': 'THERMOSTAT',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 21.5,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+03:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+03:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 21.5,
+          }),
+          'zone_id': '8557539',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 21.5,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.thermostat',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 21.5,
+        'friendly_name': 'THERMOSTAT',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 21.5,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+03:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+03:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 21.5,
+          }),
+          'zone_id': '8557541',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 21.5,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.thermostat_2',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+  ])
 # ---
-# name: test_setup[minimal]
-  dict_keys(['refresh_system', 'reset_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
+# name: test_entities[minimal]
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.0,
+        'friendly_name': 'My Home',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'icon': 'mdi:thermostat',
+        'max_temp': 35,
+        'min_temp': 7,
+        'preset_mode': 'eco',
+        'preset_modes': list([
+          'Reset',
+          'eco',
+          'away',
+          'home',
+          'Custom',
+        ]),
+        'status': dict({
+          'active_system_faults': list([
+          ]),
+          'system_id': '3432522',
+          'system_mode_status': dict({
+            'is_permanent': True,
+            'mode': 'AutoWithEco',
+          }),
+        }),
+        'supported_features': <ClimateEntityFeature: 400>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.my_home',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.0,
+        'friendly_name': 'Main Room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'none',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'FollowSchedule',
+            'target_heat_temperature': 17.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+01:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+01:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.0,
+          }),
+          'zone_id': '3432576',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 17.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.main_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+  ])
 # ---
-# name: test_setup[sys_004]
-  dict_keys(['refresh_system', 'set_system_mode', 'clear_zone_override', 'set_zone_override'])
+# name: test_entities[sys_004]
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.5,
+        'friendly_name': 'Living room',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'icon': 'mdi:thermostat',
+        'max_temp': 35,
+        'min_temp': 7,
+        'preset_mode': None,
+        'preset_modes': list([
+          'eco',
+          'away',
+        ]),
+        'status': dict({
+          'active_system_faults': list([
+          ]),
+          'system_id': '4187769',
+          'system_mode_status': dict({
+            'is_permanent': True,
+            'mode': 'Auto',
+          }),
+        }),
+        'supported_features': <ClimateEntityFeature: 400>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.living_room',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'current_temperature': 19.5,
+        'friendly_name': 'Thermostat',
+        'hvac_modes': list([
+          <HVACMode.OFF: 'off'>,
+          <HVACMode.HEAT: 'heat'>,
+        ]),
+        'max_temp': 35.0,
+        'min_temp': 5.0,
+        'preset_mode': 'permanent',
+        'preset_modes': list([
+          'none',
+          'temporary',
+          'permanent',
+        ]),
+        'status': dict({
+          'active_faults': list([
+          ]),
+          'setpoint_status': dict({
+            'setpoint_mode': 'PermanentOverride',
+            'target_heat_temperature': 15.0,
+          }),
+          'setpoints': dict({
+            'next_sp_from': '2024-07-10T22:10:00+02:00',
+            'next_sp_temp': 18.6,
+            'this_sp_from': '2024-07-10T08:00:00+02:00',
+            'this_sp_temp': 16.0,
+          }),
+          'temperature_status': dict({
+            'is_available': True,
+            'temperature': 19.5,
+          }),
+          'zone_id': '4187768',
+        }),
+        'supported_features': <ClimateEntityFeature: 401>,
+        'temperature': 15.0,
+      }),
+      'context': <ANY>,
+      'entity_id': 'climate.thermostat',
+      'last_changed': <ANY>,
+      'last_reported': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'heat',
+    }),
+  ])
 # ---
diff --git a/tests/components/evohome/snapshots/test_water_heater.ambr b/tests/components/evohome/snapshots/test_water_heater.ambr
index 4cdeb28f445..b521772e6c7 100644
--- a/tests/components/evohome/snapshots/test_water_heater.ambr
+++ b/tests/components/evohome/snapshots/test_water_heater.ambr
@@ -1,105 +1,19 @@
 # serializer version: 1
 # name: test_set_operation_mode[default]
   list([
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 12, 0, tzinfo=datetime.timezone.utc),
-    }),
-    dict({
-      'until': datetime.datetime(2024, 7, 10, 12, 0, tzinfo=datetime.timezone.utc),
-    }),
+    tuple(
+      dict({
+        'mode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'state': <DhwState.OFF: 'Off'>,
+        'untilTime': '2024-07-10T12:00:00Z',
+      }),
+    ),
+    tuple(
+      dict({
+        'mode': <ZoneMode.TEMPORARY_OVERRIDE: 'TemporaryOverride'>,
+        'state': <DhwState.ON: 'On'>,
+        'untilTime': '2024-07-10T12:00:00Z',
+      }),
+    ),
   ])
 # ---
-# name: test_setup_platform[botched][water_heater.domestic_hot_water-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'away_mode': 'on',
-      'current_temperature': 23,
-      'friendly_name': 'Domestic Hot Water',
-      'icon': 'mdi:thermometer-lines',
-      'max_temp': 60,
-      'min_temp': 43,
-      'operation_list': list([
-        'auto',
-        'on',
-        'off',
-      ]),
-      'operation_mode': 'off',
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'dhw_id': '3933910',
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T13:00:00+01:00',
-          'next_sp_state': 'Off',
-          'this_sp_from': '2024-07-10T12:00:00+01:00',
-          'this_sp_state': 'On',
-        }),
-        'state_status': dict({
-          'mode': 'PermanentOverride',
-          'state': 'Off',
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 23.0,
-        }),
-      }),
-      'supported_features': <WaterHeaterEntityFeature: 6>,
-      'target_temp_high': None,
-      'target_temp_low': None,
-      'temperature': None,
-    }),
-    'context': <ANY>,
-    'entity_id': 'water_heater.domestic_hot_water',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_setup_platform[default][water_heater.domestic_hot_water-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'away_mode': 'on',
-      'current_temperature': 23,
-      'friendly_name': 'Domestic Hot Water',
-      'icon': 'mdi:thermometer-lines',
-      'max_temp': 60,
-      'min_temp': 43,
-      'operation_list': list([
-        'auto',
-        'on',
-        'off',
-      ]),
-      'operation_mode': 'off',
-      'status': dict({
-        'active_faults': list([
-        ]),
-        'dhw_id': '3933910',
-        'setpoints': dict({
-          'next_sp_from': '2024-07-10T13:00:00+01:00',
-          'next_sp_state': 'Off',
-          'this_sp_from': '2024-07-10T12:00:00+01:00',
-          'this_sp_state': 'On',
-        }),
-        'state_status': dict({
-          'mode': 'PermanentOverride',
-          'state': 'Off',
-        }),
-        'temperature_status': dict({
-          'is_available': True,
-          'temperature': 23.0,
-        }),
-      }),
-      'supported_features': <WaterHeaterEntityFeature: 6>,
-      'target_temp_high': None,
-      'target_temp_low': None,
-      'temperature': None,
-    }),
-    'context': <ANY>,
-    'entity_id': 'water_heater.domestic_hot_water',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/evohome/test_climate.py b/tests/components/evohome/test_climate.py
index 325dd914bc0..602a2ac561a 100644
--- a/tests/components/evohome/test_climate.py
+++ b/tests/components/evohome/test_climate.py
@@ -1,4 +1,4 @@
-"""The tests for the climate platform of evohome.
+"""The tests for climate entities of evohome.
 
 All evohome systems have controllers and at least one zone.
 """
@@ -11,221 +11,78 @@ from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.climate import (
-    ATTR_HVAC_MODE,
-    ATTR_PRESET_MODE,
-    SERVICE_SET_HVAC_MODE,
-    SERVICE_SET_PRESET_MODE,
-    SERVICE_SET_TEMPERATURE,
-    HVACMode,
-)
-from homeassistant.const import (
-    ATTR_ENTITY_ID,
-    ATTR_TEMPERATURE,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-    Platform,
-)
+from homeassistant.components.climate import HVACMode
+from homeassistant.components.evohome import DOMAIN
+from homeassistant.components.evohome.climate import EvoZone
+from homeassistant.components.evohome.coordinator import EvoBroker
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.util import dt as dt_util
 
 from .conftest import setup_evohome
 from .const import TEST_INSTALLS
 
 
-@pytest.mark.parametrize("install", [*TEST_INSTALLS, "botched"])
-async def test_setup_platform(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    install: str,
-    snapshot: SnapshotAssertion,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test entities and their states after setup of evohome."""
+def get_zone_entity(hass: HomeAssistant) -> EvoZone:
+    """Return the entity of the first zone of the evohome system."""
 
-    # Cannot use the evohome fixture, as need to set dtm first
-    #  - some extended state attrs are relative the current time
-    freezer.move_to("2024-07-10T12:00:00Z")
+    broker: EvoBroker = hass.data[DOMAIN]["broker"]
 
-    async for _ in setup_evohome(hass, config, install=install):
-        pass
+    unique_id = broker.tcs._zones[0]._id
+    if unique_id == broker.tcs._id:
+        unique_id += "z"  # special case of merged controller/zone
 
-    for x in hass.states.async_all(Platform.CLIMATE):
-        assert x == snapshot(name=f"{x.entity_id}-state")
+    entity_registry = er.async_get(hass)
+    entity_id = entity_registry.async_get_entity_id(Platform.CLIMATE, DOMAIN, unique_id)
 
-
-@pytest.mark.parametrize("install", TEST_INSTALLS)
-async def test_ctl_set_hvac_mode(
-    hass: HomeAssistant,
-    ctl_id: str,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test SERVICE_SET_HVAC_MODE of an evohome controller."""
-
-    results = []
-
-    # SERVICE_SET_HVAC_MODE: HVACMode.OFF
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_HVAC_MODE,
-            {
-                ATTR_ENTITY_ID: ctl_id,
-                ATTR_HVAC_MODE: HVACMode.OFF,
-            },
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'HeatingOff' or 'Off'
-        assert mock_fcn.await_args.kwargs == {"until": None}
-
-        results.append(mock_fcn.await_args.args)
-
-    # SERVICE_SET_HVAC_MODE: HVACMode.HEAT
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_HVAC_MODE,
-            {
-                ATTR_ENTITY_ID: ctl_id,
-                ATTR_HVAC_MODE: HVACMode.HEAT,
-            },
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'Auto' or 'Heat'
-        assert mock_fcn.await_args.kwargs == {"until": None}
-
-        results.append(mock_fcn.await_args.args)
-
-    assert results == snapshot
-
-
-@pytest.mark.parametrize("install", TEST_INSTALLS)
-async def test_ctl_set_temperature(
-    hass: HomeAssistant,
-    ctl_id: str,
-) -> None:
-    """Test SERVICE_SET_TEMPERATURE of an evohome controller."""
-
-    # Entity climate.xxx does not support this service
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_TEMPERATURE,
-            {
-                ATTR_ENTITY_ID: ctl_id,
-                ATTR_TEMPERATURE: 19.1,
-            },
-            blocking=True,
-        )
-
-
-@pytest.mark.parametrize("install", TEST_INSTALLS)
-async def test_ctl_turn_off(
-    hass: HomeAssistant,
-    ctl_id: str,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test SERVICE_TURN_OFF of an evohome controller."""
-
-    results = []
-
-    # SERVICE_TURN_OFF
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_TURN_OFF,
-            {
-                ATTR_ENTITY_ID: ctl_id,
-            },
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'HeatingOff' or 'Off'
-        assert mock_fcn.await_args.kwargs == {"until": None}
-
-        results.append(mock_fcn.await_args.args)
-
-    assert results == snapshot
-
-
-@pytest.mark.parametrize("install", TEST_INSTALLS)
-async def test_ctl_turn_on(
-    hass: HomeAssistant,
-    ctl_id: str,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test SERVICE_TURN_ON of an evohome controller."""
-
-    results = []
-
-    # SERVICE_TURN_ON
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_TURN_ON,
-            {
-                ATTR_ENTITY_ID: ctl_id,
-            },
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # 'Auto' or 'Heat'
-        assert mock_fcn.await_args.kwargs == {"until": None}
-
-        results.append(mock_fcn.await_args.args)
-
-    assert results == snapshot
+    component: EntityComponent = hass.data.get(Platform.CLIMATE)  # type: ignore[assignment]
+    return next(e for e in component.entities if e.entity_id == entity_id)  # type: ignore[return-value]
 
 
 @pytest.mark.parametrize("install", TEST_INSTALLS)
 async def test_zone_set_hvac_mode(
     hass: HomeAssistant,
-    zone_id: str,
+    config: dict[str, str],
+    install: str,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test SERVICE_SET_HVAC_MODE of an evohome heating zone."""
+    """Test climate methods of a evohome-compatible zone."""
 
     results = []
 
-    # SERVICE_SET_HVAC_MODE: HVACMode.HEAT
-    with patch("evohomeasync2.zone.Zone.reset_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_HVAC_MODE,
-            {
-                ATTR_ENTITY_ID: zone_id,
-                ATTR_HVAC_MODE: HVACMode.HEAT,
-            },
-            blocking=True,
-        )
+    async for _ in setup_evohome(hass, config, install=install):
+        zone = get_zone_entity(hass)
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        assert zone.hvac_modes == [HVACMode.OFF, HVACMode.HEAT]
 
-    # SERVICE_SET_HVAC_MODE: HVACMode.OFF
-    with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_HVAC_MODE,
-            {
-                ATTR_ENTITY_ID: zone_id,
-                ATTR_HVAC_MODE: HVACMode.OFF,
-            },
-            blocking=True,
-        )
+        # set_hvac_mode(HVACMode.HEAT): FollowSchedule
+        with patch("evohomeasync2.zone.Zone._set_mode") as mock_fcn:
+            await zone.async_set_hvac_mode(HVACMode.HEAT)
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # minimum target temp
-        assert mock_fcn.await_args.kwargs == {"until": None}
+            assert mock_fcn.await_count == 1
+            assert install != "default" or mock_fcn.await_args.args == (
+                {
+                    "setpointMode": "FollowSchedule",
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
-        results.append(mock_fcn.await_args.args)
+        # set_hvac_mode(HVACMode.OFF): PermanentOverride, minHeatSetpoint
+        with patch("evohomeasync2.zone.Zone._set_mode") as mock_fcn:
+            await zone.async_set_hvac_mode(HVACMode.OFF)
+
+            assert mock_fcn.await_count == 1
+            assert install != "default" or mock_fcn.await_args.args == (
+                {
+                    "setpointMode": "PermanentOverride",
+                    "HeatSetpointValue": 5.0,  # varies by install
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
+
+            results.append(mock_fcn.await_args.args)
 
     assert results == snapshot
 
@@ -233,67 +90,63 @@ async def test_zone_set_hvac_mode(
 @pytest.mark.parametrize("install", TEST_INSTALLS)
 async def test_zone_set_preset_mode(
     hass: HomeAssistant,
-    zone_id: str,
+    config: dict[str, str],
+    install: str,
     freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test SERVICE_SET_PRESET_MODE of an evohome heating zone."""
+    """Test climate methods of a evohome-compatible zone."""
 
     freezer.move_to("2024-07-10T12:00:00Z")
     results = []
 
-    # SERVICE_SET_PRESET_MODE: none
-    with patch("evohomeasync2.zone.Zone.reset_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_PRESET_MODE,
-            {
-                ATTR_ENTITY_ID: zone_id,
-                ATTR_PRESET_MODE: "none",
-            },
-            blocking=True,
-        )
+    async for _ in setup_evohome(hass, config, install=install):
+        zone = get_zone_entity(hass)
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        assert zone.preset_modes == ["none", "temporary", "permanent"]
 
-    # SERVICE_SET_PRESET_MODE: permanent
-    with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_PRESET_MODE,
-            {
-                ATTR_ENTITY_ID: zone_id,
-                ATTR_PRESET_MODE: "permanent",
-            },
-            blocking=True,
-        )
+        # set_preset_mode(none): FollowSchedule
+        with patch("evohomeasync2.zone.Zone._set_mode") as mock_fcn:
+            await zone.async_set_preset_mode("none")
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # current target temp
-        assert mock_fcn.await_args.kwargs == {"until": None}
+            assert mock_fcn.await_count == 1
+            assert mock_fcn.await_args.args == (
+                {
+                    "setpointMode": "FollowSchedule",
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
-        results.append(mock_fcn.await_args.args)
+        # set_preset_mode(permanent): PermanentOverride
+        with patch("evohomeasync2.zone.Zone._set_mode") as mock_fcn:
+            await zone.async_set_preset_mode("permanent")
 
-    # SERVICE_SET_PRESET_MODE: temporary
-    with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_PRESET_MODE,
-            {
-                ATTR_ENTITY_ID: zone_id,
-                ATTR_PRESET_MODE: "temporary",
-            },
-            blocking=True,
-        )
+            assert mock_fcn.await_count == 1
+            assert install != "default" or mock_fcn.await_args.args == (
+                {
+                    "setpointMode": "PermanentOverride",
+                    "HeatSetpointValue": 17.0,  # varies by install
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # current target temp
-        assert mock_fcn.await_args.kwargs != {}  # next setpoint dtm
+            results.append(mock_fcn.await_args.args)
 
-        results.append(mock_fcn.await_args.args)
-        results.append(mock_fcn.await_args.kwargs)
+        # set_preset_mode(permanent): TemporaryOverride
+        with patch("evohomeasync2.zone.Zone._set_mode") as mock_fcn:
+            await zone.async_set_preset_mode("temporary")
+
+            assert mock_fcn.await_count == 1
+            assert install != "default" or mock_fcn.await_args.args == (
+                {
+                    "setpointMode": "TemporaryOverride",
+                    "HeatSetpointValue": 17.0,  # varies by install
+                    "timeUntil": "2024-07-10T21:10:00Z",  # varies by install
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
+
+            results.append(mock_fcn.await_args.args)
 
     assert results == snapshot
 
@@ -301,84 +154,50 @@ async def test_zone_set_preset_mode(
 @pytest.mark.parametrize("install", TEST_INSTALLS)
 async def test_zone_set_temperature(
     hass: HomeAssistant,
-    zone_id: str,
+    config: dict[str, str],
+    install: str,
     freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test SERVICE_SET_TEMPERATURE of an evohome heating zone."""
+    """Test climate methods of a evohome-compatible zone."""
 
     freezer.move_to("2024-07-10T12:00:00Z")
     results = []
 
-    # SERVICE_SET_TEMPERATURE: temperature
-    with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_SET_TEMPERATURE,
-            {
-                ATTR_ENTITY_ID: zone_id,
-                ATTR_TEMPERATURE: 19.1,
-            },
-            blocking=True,
-        )
+    async for _ in setup_evohome(hass, config, install=install):
+        zone = get_zone_entity(hass)
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == (19.1,)
-        assert mock_fcn.await_args.kwargs != {}  # next setpoint dtm
+        # set_temperature(temp): TemporaryOverride, advanced
+        with patch("evohomeasync2.zone.Zone._set_mode") as mock_fcn:
+            await zone.async_set_temperature(temperature=19.1)
 
-        results.append(mock_fcn.await_args.kwargs)
+            assert mock_fcn.await_count == 1
+            assert install != "default" or mock_fcn.await_args.args == (
+                {
+                    "setpointMode": "TemporaryOverride",
+                    "HeatSetpointValue": 19.1,
+                    "timeUntil": "2024-07-10T21:10:00Z",  # varies by install
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
+
+            results.append(mock_fcn.await_args.args)
+
+        # set_temperature(temp, until): TemporaryOverride, until
+        with patch("evohomeasync2.zone.Zone._set_mode") as mock_fcn:
+            await zone.async_set_temperature(
+                temperature=19.2,
+                until=dt_util.parse_datetime("2024-07-10T13:30:00Z"),
+            )
+
+            assert mock_fcn.await_count == 1
+            assert mock_fcn.await_args.args == (
+                {
+                    "setpointMode": "TemporaryOverride",
+                    "HeatSetpointValue": 19.2,
+                    "timeUntil": "2024-07-10T13:30:00Z",
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
     assert results == snapshot
-
-
-@pytest.mark.parametrize("install", TEST_INSTALLS)
-async def test_zone_turn_off(
-    hass: HomeAssistant,
-    zone_id: str,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test SERVICE_TURN_OFF of an evohome heating zone."""
-
-    results = []
-
-    # SERVICE_TURN_OFF
-    with patch("evohomeasync2.zone.Zone.set_temperature") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_TURN_OFF,
-            {
-                ATTR_ENTITY_ID: zone_id,
-            },
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args != ()  # minimum target temp
-        assert mock_fcn.await_args.kwargs == {"until": None}
-
-        results.append(mock_fcn.await_args.args)
-
-    assert results == snapshot
-
-
-@pytest.mark.parametrize("install", TEST_INSTALLS)
-async def test_zone_turn_on(
-    hass: HomeAssistant,
-    zone_id: str,
-) -> None:
-    """Test SERVICE_TURN_ON of an evohome heating zone."""
-
-    # SERVICE_TURN_ON
-    with patch("evohomeasync2.zone.Zone.reset_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.CLIMATE,
-            SERVICE_TURN_ON,
-            {
-                ATTR_ENTITY_ID: zone_id,
-            },
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
diff --git a/tests/components/evohome/test_init.py b/tests/components/evohome/test_init.py
index 49a854016ea..b61efe9b066 100644
--- a/tests/components/evohome/test_init.py
+++ b/tests/components/evohome/test_init.py
@@ -2,181 +2,30 @@
 
 from __future__ import annotations
 
-from http import HTTPStatus
-import logging
-from unittest.mock import patch
-
-from evohomeasync2 import EvohomeClient, exceptions as exc
-from evohomeasync2.broker import _ERR_MSG_LOOKUP_AUTH, _ERR_MSG_LOOKUP_BASE
+from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.evohome import DOMAIN, EvoService
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
 
+from .conftest import setup_evohome
 from .const import TEST_INSTALLS
 
-SETUP_FAILED_ANTICIPATED = (
-    "homeassistant.setup",
-    logging.ERROR,
-    "Setup failed for 'evohome': Integration failed to initialize.",
-)
-SETUP_FAILED_UNEXPECTED = (
-    "homeassistant.setup",
-    logging.ERROR,
-    "Error during setup of component evohome",
-)
-AUTHENTICATION_FAILED = (
-    "homeassistant.components.evohome.helpers",
-    logging.ERROR,
-    "Failed to authenticate with the vendor's server. Check your username"
-    " and password. NB: Some special password characters that work"
-    " correctly via the website will not work via the web API. Message"
-    " is: ",
-)
-REQUEST_FAILED_NONE = (
-    "homeassistant.components.evohome.helpers",
-    logging.WARNING,
-    "Unable to connect with the vendor's server. "
-    "Check your network and the vendor's service status page. "
-    "Message is: ",
-)
-REQUEST_FAILED_503 = (
-    "homeassistant.components.evohome.helpers",
-    logging.WARNING,
-    "The vendor says their server is currently unavailable. "
-    "Check the vendor's service status page",
-)
-REQUEST_FAILED_429 = (
-    "homeassistant.components.evohome.helpers",
-    logging.WARNING,
-    "The vendor's API rate limit has been exceeded. "
-    "If this message persists, consider increasing the scan_interval",
-)
-
-REQUEST_FAILED_LOOKUP = {
-    None: [
-        REQUEST_FAILED_NONE,
-        SETUP_FAILED_ANTICIPATED,
-    ],
-    HTTPStatus.SERVICE_UNAVAILABLE: [
-        REQUEST_FAILED_503,
-        SETUP_FAILED_ANTICIPATED,
-    ],
-    HTTPStatus.TOO_MANY_REQUESTS: [
-        REQUEST_FAILED_429,
-        SETUP_FAILED_ANTICIPATED,
-    ],
-}
-
-
-@pytest.mark.parametrize(
-    "status", [*sorted([*_ERR_MSG_LOOKUP_AUTH, HTTPStatus.BAD_GATEWAY]), None]
-)
-async def test_authentication_failure_v2(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    status: HTTPStatus,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test failure to setup an evohome-compatible system.
-
-    In this instance, the failure occurs in the v2 API.
-    """
-
-    with patch("evohomeasync2.broker.Broker.get") as mock_fcn:
-        mock_fcn.side_effect = exc.AuthenticationFailed("", status=status)
-
-        with caplog.at_level(logging.WARNING):
-            result = await async_setup_component(hass, DOMAIN, {DOMAIN: config})
-
-    assert result is False
-
-    assert caplog.record_tuples == [
-        AUTHENTICATION_FAILED,
-        SETUP_FAILED_ANTICIPATED,
-    ]
-
-
-@pytest.mark.parametrize(
-    "status", [*sorted([*_ERR_MSG_LOOKUP_BASE, HTTPStatus.BAD_GATEWAY]), None]
-)
-async def test_client_request_failure_v2(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    status: HTTPStatus,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test failure to setup an evohome-compatible system.
-
-    In this instance, the failure occurs in the v2 API.
-    """
-
-    with patch("evohomeasync2.broker.Broker.get") as mock_fcn:
-        mock_fcn.side_effect = exc.RequestFailed("", status=status)
-
-        with caplog.at_level(logging.WARNING):
-            result = await async_setup_component(hass, DOMAIN, {DOMAIN: config})
-
-    assert result is False
-
-    assert caplog.record_tuples == REQUEST_FAILED_LOOKUP.get(
-        status, [SETUP_FAILED_UNEXPECTED]
-    )
-
 
 @pytest.mark.parametrize("install", [*TEST_INSTALLS, "botched"])
-async def test_setup(
+async def test_entities(
     hass: HomeAssistant,
-    evohome: EvohomeClient,
+    config: dict[str, str],
+    install: str,
     snapshot: SnapshotAssertion,
+    freezer: FrozenDateTimeFactory,
 ) -> None:
-    """Test services after setup of evohome.
+    """Test entities and state after setup of a Honeywell TCC-compatible system."""
 
-    Registered services vary by the type of system.
-    """
+    # some extended state attrs are relative the current time
+    freezer.move_to("2024-07-10T12:00:00Z")
 
-    assert hass.services.async_services_for_domain(DOMAIN).keys() == snapshot
+    async for _ in setup_evohome(hass, config, install=install):
+        pass
 
-
-@pytest.mark.parametrize("install", ["default"])
-async def test_service_refresh_system(
-    hass: HomeAssistant,
-    evohome: EvohomeClient,
-) -> None:
-    """Test EvoService.REFRESH_SYSTEM of an evohome system."""
-
-    # EvoService.REFRESH_SYSTEM
-    with patch("evohomeasync2.location.Location.refresh_status") as mock_fcn:
-        await hass.services.async_call(
-            DOMAIN,
-            EvoService.REFRESH_SYSTEM,
-            {},
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
-
-
-@pytest.mark.parametrize("install", ["default"])
-async def test_service_reset_system(
-    hass: HomeAssistant,
-    evohome: EvohomeClient,
-) -> None:
-    """Test EvoService.RESET_SYSTEM of an evohome system."""
-
-    # EvoService.RESET_SYSTEM (if SZ_AUTO_WITH_RESET in modes)
-    with patch("evohomeasync2.controlsystem.ControlSystem.set_mode") as mock_fcn:
-        await hass.services.async_call(
-            DOMAIN,
-            EvoService.RESET_SYSTEM,
-            {},
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ("AutoWithReset",)
-        assert mock_fcn.await_args.kwargs == {"until": None}
+    assert hass.states.async_all() == snapshot
diff --git a/tests/components/evohome/test_storage.py b/tests/components/evohome/test_storage.py
index 4cc21078333..33f6c6b3e6c 100644
--- a/tests/components/evohome/test_storage.py
+++ b/tests/components/evohome/test_storage.py
@@ -55,17 +55,20 @@ ACCESS_TOKEN_EXP_DTM, ACCESS_TOKEN_EXP_STR = dt_pair(dt_util.now() + timedelta(h
 USERNAME_DIFF: Final = f"not_{USERNAME}"
 USERNAME_SAME: Final = USERNAME
 
-_TEST_STORAGE_BASE: Final[_TokenStoreT] = {
-    SZ_USERNAME: USERNAME_SAME,
-    SZ_REFRESH_TOKEN: REFRESH_TOKEN,
-    SZ_ACCESS_TOKEN: ACCESS_TOKEN,
-    SZ_ACCESS_TOKEN_EXPIRES: ACCESS_TOKEN_EXP_STR,
-}
-
 TEST_STORAGE_DATA: Final[dict[str, _TokenStoreT]] = {
-    "sans_session_id": _TEST_STORAGE_BASE,
-    "null_session_id": _TEST_STORAGE_BASE | {SZ_USER_DATA: None},  # type: ignore[dict-item]
-    "with_session_id": _TEST_STORAGE_BASE | {SZ_USER_DATA: {"sessionId": SESSION_ID}},
+    "sans_session_id": {
+        SZ_USERNAME: USERNAME_SAME,
+        SZ_REFRESH_TOKEN: REFRESH_TOKEN,
+        SZ_ACCESS_TOKEN: ACCESS_TOKEN,
+        SZ_ACCESS_TOKEN_EXPIRES: ACCESS_TOKEN_EXP_STR,
+    },
+    "with_session_id": {
+        SZ_USERNAME: USERNAME_SAME,
+        SZ_REFRESH_TOKEN: REFRESH_TOKEN,
+        SZ_ACCESS_TOKEN: ACCESS_TOKEN,
+        SZ_ACCESS_TOKEN_EXPIRES: ACCESS_TOKEN_EXP_STR,
+        SZ_USER_DATA: {"sessionId": SESSION_ID},
+    },
 }
 
 TEST_STORAGE_NULL: Final[dict[str, _EmptyStoreT | None]] = {
diff --git a/tests/components/evohome/test_water_heater.py b/tests/components/evohome/test_water_heater.py
index 8acfd469b59..3dc1d961d29 100644
--- a/tests/components/evohome/test_water_heater.py
+++ b/tests/components/evohome/test_water_heater.py
@@ -1,4 +1,4 @@
-"""The tests for the water_heater platform of evohome.
+"""The tests for water_heater entities of evohome.
 
 Not all evohome systems will have a DHW zone.
 """
@@ -7,184 +7,203 @@ from __future__ import annotations
 
 from unittest.mock import patch
 
-from evohomeasync2 import EvohomeClient
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.water_heater import (
-    ATTR_AWAY_MODE,
-    ATTR_OPERATION_MODE,
-    SERVICE_SET_AWAY_MODE,
-    SERVICE_SET_OPERATION_MODE,
-)
-from homeassistant.const import (
-    ATTR_ENTITY_ID,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-    Platform,
-)
+from homeassistant.components.evohome import DOMAIN
+from homeassistant.components.evohome.coordinator import EvoBroker
+from homeassistant.components.evohome.water_heater import EvoDHW
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_component import EntityComponent
 
 from .conftest import setup_evohome
 from .const import TEST_INSTALLS_WITH_DHW
 
-DHW_ENTITY_ID = "water_heater.domestic_hot_water"
 
+def get_dhw_entity(hass: HomeAssistant) -> EvoDHW | None:
+    """Return the DHW entity of the evohome system."""
 
-@pytest.mark.parametrize("install", [*TEST_INSTALLS_WITH_DHW, "botched"])
-async def test_setup_platform(
-    hass: HomeAssistant,
-    config: dict[str, str],
-    install: str,
-    snapshot: SnapshotAssertion,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test entities and their states after setup of evohome."""
+    broker: EvoBroker = hass.data[DOMAIN]["broker"]
 
-    # Cannot use the evohome fixture, as need to set dtm first
-    #  - some extended state attrs are relative the current time
-    freezer.move_to("2024-07-10T12:00:00Z")
+    if (dhw := broker.tcs.hotwater) is None:
+        return None
 
-    async for _ in setup_evohome(hass, config, install=install):
-        pass
+    entity_registry = er.async_get(hass)
+    entity_id = entity_registry.async_get_entity_id(
+        Platform.WATER_HEATER, DOMAIN, dhw._id
+    )
 
-    for x in hass.states.async_all(Platform.WATER_HEATER):
-        assert x == snapshot(name=f"{x.entity_id}-state")
+    component: EntityComponent = hass.data.get(Platform.WATER_HEATER)  # type: ignore[assignment]
+    return next(e for e in component.entities if e.entity_id == entity_id)  # type: ignore[return-value]
 
 
 @pytest.mark.parametrize("install", TEST_INSTALLS_WITH_DHW)
 async def test_set_operation_mode(
     hass: HomeAssistant,
-    evohome: EvohomeClient,
+    config: dict[str, str],
+    install: str,
     freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test SERVICE_SET_OPERATION_MODE of an evohome DHW zone."""
+    """Test water_heater services of a evohome-compatible DHW zone."""
 
     freezer.move_to("2024-07-10T11:55:00Z")
     results = []
 
-    # SERVICE_SET_OPERATION_MODE: auto
-    with patch("evohomeasync2.hotwater.HotWater.reset_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.WATER_HEATER,
-            SERVICE_SET_OPERATION_MODE,
-            {
-                ATTR_ENTITY_ID: DHW_ENTITY_ID,
-                ATTR_OPERATION_MODE: "auto",
-            },
-            blocking=True,
-        )
+    async for _ in setup_evohome(hass, config, install=install):
+        dhw = get_dhw_entity(hass)
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        # set_operation_mode(auto): FollowSchedule
+        with patch("evohomeasync2.hotwater.HotWater._set_mode") as mock_fcn:
+            await dhw.async_set_operation_mode("auto")
 
-    # SERVICE_SET_OPERATION_MODE: off (until next scheduled setpoint)
-    with patch("evohomeasync2.hotwater.HotWater.set_off") as mock_fcn:
-        await hass.services.async_call(
-            Platform.WATER_HEATER,
-            SERVICE_SET_OPERATION_MODE,
-            {
-                ATTR_ENTITY_ID: DHW_ENTITY_ID,
-                ATTR_OPERATION_MODE: "off",
-            },
-            blocking=True,
-        )
+            assert mock_fcn.await_count == 1
+            assert mock_fcn.await_args.args == (
+                {
+                    "mode": "FollowSchedule",
+                    "state": None,
+                    "untilTime": None,
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs != {}
+        # set_operation_mode(off): TemporaryOverride, advanced
+        with patch("evohomeasync2.hotwater.HotWater._set_mode") as mock_fcn:
+            await dhw.async_set_operation_mode("off")
 
-        results.append(mock_fcn.await_args.kwargs)
+            assert mock_fcn.await_count == 1
+            assert install != "default" or mock_fcn.await_args.args == (
+                {
+                    "mode": "TemporaryOverride",
+                    "state": "Off",
+                    "untilTime": "2024-07-10T12:00:00Z",  # varies by install
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
-    # SERVICE_SET_OPERATION_MODE: on (until next scheduled setpoint)
-    with patch("evohomeasync2.hotwater.HotWater.set_on") as mock_fcn:
-        await hass.services.async_call(
-            Platform.WATER_HEATER,
-            SERVICE_SET_OPERATION_MODE,
-            {
-                ATTR_ENTITY_ID: DHW_ENTITY_ID,
-                ATTR_OPERATION_MODE: "on",
-            },
-            blocking=True,
-        )
+            results.append(mock_fcn.await_args.args)
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs != {}
+        # set_operation_mode(on): TemporaryOverride, advanced
+        with patch("evohomeasync2.hotwater.HotWater._set_mode") as mock_fcn:
+            await dhw.async_set_operation_mode("on")
 
-        results.append(mock_fcn.await_args.kwargs)
+            assert mock_fcn.await_count == 1
+            assert install != "default" or mock_fcn.await_args.args == (
+                {
+                    "mode": "TemporaryOverride",
+                    "state": "On",
+                    "untilTime": "2024-07-10T12:00:00Z",  # varies by install
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
+
+            results.append(mock_fcn.await_args.args)
 
     assert results == snapshot
 
 
 @pytest.mark.parametrize("install", TEST_INSTALLS_WITH_DHW)
-async def test_set_away_mode(hass: HomeAssistant, evohome: EvohomeClient) -> None:
-    """Test SERVICE_SET_AWAY_MODE of an evohome DHW zone."""
+async def test_turn_away_mode_off(
+    hass: HomeAssistant,
+    config: dict[str, str],
+    install: str,
+) -> None:
+    """Test water_heater services of a evohome-compatible DHW zone."""
 
-    # set_away_mode: off
-    with patch("evohomeasync2.hotwater.HotWater.reset_mode") as mock_fcn:
-        await hass.services.async_call(
-            Platform.WATER_HEATER,
-            SERVICE_SET_AWAY_MODE,
-            {
-                ATTR_ENTITY_ID: DHW_ENTITY_ID,
-                ATTR_AWAY_MODE: "off",
-            },
-            blocking=True,
-        )
+    async for _ in setup_evohome(hass, config, install=install):
+        dhw = get_dhw_entity(hass)
 
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+        # turn_away_mode_off(): FollowSchedule
+        with patch("evohomeasync2.hotwater.HotWater._set_mode") as mock_fcn:
+            await dhw.async_turn_away_mode_off()
 
-    # set_away_mode: on
-    with patch("evohomeasync2.hotwater.HotWater.set_off") as mock_fcn:
-        await hass.services.async_call(
-            Platform.WATER_HEATER,
-            SERVICE_SET_AWAY_MODE,
-            {
-                ATTR_ENTITY_ID: DHW_ENTITY_ID,
-                ATTR_AWAY_MODE: "on",
-            },
-            blocking=True,
-        )
-
-        assert mock_fcn.await_count == 1
-        assert mock_fcn.await_args.args == ()
-        assert mock_fcn.await_args.kwargs == {}
+            assert mock_fcn.await_count == 1
+            assert mock_fcn.await_args.args == (
+                {
+                    "mode": "FollowSchedule",
+                    "state": None,
+                    "untilTime": None,
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
 
 @pytest.mark.parametrize("install", TEST_INSTALLS_WITH_DHW)
-async def test_turn_off(hass: HomeAssistant, evohome: EvohomeClient) -> None:
-    """Test SERVICE_TURN_OFF of an evohome DHW zone."""
+async def test_turn_away_mode_on(
+    hass: HomeAssistant,
+    config: dict[str, str],
+    install: str,
+) -> None:
+    """Test water_heater services of a evohome-compatible DHW zone."""
 
-    # Entity water_heater.xxx does not support this service
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            Platform.WATER_HEATER,
-            SERVICE_TURN_OFF,
-            {
-                ATTR_ENTITY_ID: DHW_ENTITY_ID,
-            },
-            blocking=True,
-        )
+    async for _ in setup_evohome(hass, config, install=install):
+        dhw = get_dhw_entity(hass)
+
+        # turn_away_mode_on(): PermanentOverride, Off
+        with patch("evohomeasync2.hotwater.HotWater._set_mode") as mock_fcn:
+            await dhw.async_turn_away_mode_on()
+
+            assert mock_fcn.await_count == 1
+            assert mock_fcn.await_args.args == (
+                {
+                    "mode": "PermanentOverride",
+                    "state": "Off",
+                    "untilTime": None,
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
 
 
 @pytest.mark.parametrize("install", TEST_INSTALLS_WITH_DHW)
-async def test_turn_on(hass: HomeAssistant, evohome: EvohomeClient) -> None:
-    """Test SERVICE_TURN_ON of an evohome DHW zone."""
+async def test_turn_off(
+    hass: HomeAssistant,
+    config: dict[str, str],
+    install: str,
+) -> None:
+    """Test water_heater services of a evohome-compatible DHW zone."""
 
-    # Entity water_heater.xxx does not support this service
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            Platform.WATER_HEATER,
-            SERVICE_TURN_ON,
-            {
-                ATTR_ENTITY_ID: DHW_ENTITY_ID,
-            },
-            blocking=True,
-        )
+    async for _ in setup_evohome(hass, config, install=install):
+        dhw = get_dhw_entity(hass)
+
+        # turn_off(): PermanentOverride, Off
+        with patch("evohomeasync2.hotwater.HotWater._set_mode") as mock_fcn:
+            await dhw.async_turn_off()
+
+            assert mock_fcn.await_count == 1
+            assert mock_fcn.await_args.args == (
+                {
+                    "mode": "PermanentOverride",
+                    "state": "Off",
+                    "untilTime": None,
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
+
+
+@pytest.mark.parametrize("install", TEST_INSTALLS_WITH_DHW)
+async def test_turn_on(
+    hass: HomeAssistant,
+    config: dict[str, str],
+    install: str,
+) -> None:
+    """Test water_heater services of a evohome-compatible DHW zone."""
+
+    async for _ in setup_evohome(hass, config, install=install):
+        dhw = get_dhw_entity(hass)
+
+        # turn_on(): PermanentOverride, On
+        with patch("evohomeasync2.hotwater.HotWater._set_mode") as mock_fcn:
+            await dhw.async_turn_on()
+
+            assert mock_fcn.await_count == 1
+            assert mock_fcn.await_args.args == (
+                {
+                    "mode": "PermanentOverride",
+                    "state": "On",
+                    "untilTime": None,
+                },
+            )
+            assert mock_fcn.await_args.kwargs == {}
diff --git a/tests/components/fibaro/conftest.py b/tests/components/fibaro/conftest.py
index ac10d4fc79d..df8b12e2167 100644
--- a/tests/components/fibaro/conftest.py
+++ b/tests/components/fibaro/conftest.py
@@ -76,36 +76,6 @@ def mock_power_sensor() -> Mock:
     return sensor
 
 
-@pytest.fixture
-def mock_cover() -> Mock:
-    """Fixture for a cover."""
-    cover = Mock()
-    cover.fibaro_id = 3
-    cover.parent_fibaro_id = 0
-    cover.name = "Test cover"
-    cover.room_id = 1
-    cover.dead = False
-    cover.visible = True
-    cover.enabled = True
-    cover.type = "com.fibaro.FGR"
-    cover.base_type = "com.fibaro.device"
-    cover.properties = {"manufacturer": ""}
-    cover.actions = {"open": 0, "close": 0}
-    cover.supported_features = {}
-    value_mock = Mock()
-    value_mock.has_value = True
-    value_mock.int_value.return_value = 20
-    cover.value = value_mock
-    value2_mock = Mock()
-    value2_mock.has_value = False
-    cover.value_2 = value2_mock
-    state_mock = Mock()
-    state_mock.has_value = True
-    state_mock.str_value.return_value = "opening"
-    cover.state = state_mock
-    return cover
-
-
 @pytest.fixture
 def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
     """Return the default mocked config entry."""
diff --git a/tests/components/fibaro/test_cover.py b/tests/components/fibaro/test_cover.py
deleted file mode 100644
index d5b08f7d1f8..00000000000
--- a/tests/components/fibaro/test_cover.py
+++ /dev/null
@@ -1,98 +0,0 @@
-"""Test the Fibaro cover platform."""
-
-from unittest.mock import Mock, patch
-
-from homeassistant.components.cover import CoverState
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from .conftest import init_integration
-
-from tests.common import MockConfigEntry
-
-
-async def test_cover_setup(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_fibaro_client: Mock,
-    mock_config_entry: MockConfigEntry,
-    mock_cover: Mock,
-    mock_room: Mock,
-) -> None:
-    """Test that the cover creates an entity."""
-
-    # Arrange
-    mock_fibaro_client.read_rooms.return_value = [mock_room]
-    mock_fibaro_client.read_devices.return_value = [mock_cover]
-
-    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.COVER]):
-        # Act
-        await init_integration(hass, mock_config_entry)
-        # Assert
-        entry = entity_registry.async_get("cover.room_1_test_cover_3")
-        assert entry
-        assert entry.unique_id == "hc2_111111.3"
-        assert entry.original_name == "Room 1 Test cover"
-
-
-async def test_cover_opening(
-    hass: HomeAssistant,
-    mock_fibaro_client: Mock,
-    mock_config_entry: MockConfigEntry,
-    mock_cover: Mock,
-    mock_room: Mock,
-) -> None:
-    """Test that the cover opening state is reported."""
-
-    # Arrange
-    mock_fibaro_client.read_rooms.return_value = [mock_room]
-    mock_fibaro_client.read_devices.return_value = [mock_cover]
-
-    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.COVER]):
-        # Act
-        await init_integration(hass, mock_config_entry)
-        # Assert
-        assert hass.states.get("cover.room_1_test_cover_3").state == CoverState.OPENING
-
-
-async def test_cover_opening_closing_none(
-    hass: HomeAssistant,
-    mock_fibaro_client: Mock,
-    mock_config_entry: MockConfigEntry,
-    mock_cover: Mock,
-    mock_room: Mock,
-) -> None:
-    """Test that the cover opening closing states return None if not available."""
-
-    # Arrange
-    mock_fibaro_client.read_rooms.return_value = [mock_room]
-    mock_cover.state.has_value = False
-    mock_fibaro_client.read_devices.return_value = [mock_cover]
-
-    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.COVER]):
-        # Act
-        await init_integration(hass, mock_config_entry)
-        # Assert
-        assert hass.states.get("cover.room_1_test_cover_3").state == CoverState.OPEN
-
-
-async def test_cover_closing(
-    hass: HomeAssistant,
-    mock_fibaro_client: Mock,
-    mock_config_entry: MockConfigEntry,
-    mock_cover: Mock,
-    mock_room: Mock,
-) -> None:
-    """Test that the cover closing state is reported."""
-
-    # Arrange
-    mock_fibaro_client.read_rooms.return_value = [mock_room]
-    mock_cover.state.str_value.return_value = "closing"
-    mock_fibaro_client.read_devices.return_value = [mock_cover]
-
-    with patch("homeassistant.components.fibaro.PLATFORMS", [Platform.COVER]):
-        # Act
-        await init_integration(hass, mock_config_entry)
-        # Assert
-        assert hass.states.get("cover.room_1_test_cover_3").state == CoverState.CLOSING
diff --git a/tests/components/file/test_notify.py b/tests/components/file/test_notify.py
index e7cb85a9cfc..33e4739a488 100644
--- a/tests/components/file/test_notify.py
+++ b/tests/components/file/test_notify.py
@@ -12,46 +12,222 @@ from homeassistant.components.file import DOMAIN
 from homeassistant.components.notify import ATTR_TITLE_DEFAULT
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers.typing import ConfigType
+from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, assert_setup_component
+
+
+async def test_bad_config(hass: HomeAssistant) -> None:
+    """Test set up the platform with bad/missing config."""
+    config = {notify.DOMAIN: {"name": "test", "platform": "file"}}
+    with assert_setup_component(0, domain="notify") as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert not handle_config[notify.DOMAIN]
 
 
 @pytest.mark.parametrize(
     ("domain", "service", "params"),
     [
+        (notify.DOMAIN, "test", {"message": "one, two, testing, testing"}),
         (
             notify.DOMAIN,
             "send_message",
             {"entity_id": "notify.test", "message": "one, two, testing, testing"},
         ),
     ],
+    ids=["legacy", "entity"],
+)
+@pytest.mark.parametrize(
+    ("timestamp", "config"),
+    [
+        (
+            False,
+            {
+                "notify": [
+                    {
+                        "name": "test",
+                        "platform": "file",
+                        "filename": "mock_file",
+                        "timestamp": False,
+                    }
+                ]
+            },
+        ),
+        (
+            True,
+            {
+                "notify": [
+                    {
+                        "name": "test",
+                        "platform": "file",
+                        "filename": "mock_file",
+                        "timestamp": True,
+                    }
+                ]
+            },
+        ),
+    ],
+    ids=["no_timestamp", "timestamp"],
 )
-@pytest.mark.parametrize("timestamp", [False, True], ids=["no_timestamp", "timestamp"])
 async def test_notify_file(
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
-    mock_is_allowed_path: MagicMock,
     timestamp: bool,
+    mock_is_allowed_path: MagicMock,
+    config: ConfigType,
     domain: str,
     service: str,
     params: dict[str, str],
 ) -> None:
     """Test the notify file output."""
     filename = "mock_file"
-    full_filename = os.path.join(hass.config.path(), filename)
+    message = params["message"]
+    assert await async_setup_component(hass, notify.DOMAIN, config)
+    await hass.async_block_till_done()
+    assert await async_setup_component(hass, DOMAIN, config)
+    await hass.async_block_till_done(wait_background_tasks=True)
 
+    freezer.move_to(dt_util.utcnow())
+
+    m_open = mock_open()
+    with (
+        patch("homeassistant.components.file.notify.open", m_open, create=True),
+        patch("homeassistant.components.file.notify.os.stat") as mock_st,
+    ):
+        mock_st.return_value.st_size = 0
+        title = (
+            f"{ATTR_TITLE_DEFAULT} notifications "
+            f"(Log started: {dt_util.utcnow().isoformat()})\n{'-' * 80}\n"
+        )
+
+        await hass.services.async_call(domain, service, params, blocking=True)
+
+        full_filename = os.path.join(hass.config.path(), filename)
+        assert m_open.call_count == 1
+        assert m_open.call_args == call(full_filename, "a", encoding="utf8")
+
+        assert m_open.return_value.write.call_count == 2
+        if not timestamp:
+            assert m_open.return_value.write.call_args_list == [
+                call(title),
+                call(f"{message}\n"),
+            ]
+        else:
+            assert m_open.return_value.write.call_args_list == [
+                call(title),
+                call(f"{dt_util.utcnow().isoformat()} {message}\n"),
+            ]
+
+
+@pytest.mark.parametrize(
+    ("domain", "service", "params"),
+    [(notify.DOMAIN, "test", {"message": "one, two, testing, testing"})],
+    ids=["legacy"],
+)
+@pytest.mark.parametrize(
+    ("is_allowed", "config"),
+    [
+        (
+            True,
+            {
+                "notify": [
+                    {
+                        "name": "test",
+                        "platform": "file",
+                        "filename": "mock_file",
+                    }
+                ]
+            },
+        ),
+    ],
+    ids=["allowed_but_access_failed"],
+)
+async def test_legacy_notify_file_exception(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_is_allowed_path: MagicMock,
+    config: ConfigType,
+    domain: str,
+    service: str,
+    params: dict[str, str],
+) -> None:
+    """Test legacy notify file output has exception."""
+    assert await async_setup_component(hass, notify.DOMAIN, config)
+    await hass.async_block_till_done()
+    assert await async_setup_component(hass, DOMAIN, config)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    freezer.move_to(dt_util.utcnow())
+
+    m_open = mock_open()
+    with (
+        patch("homeassistant.components.file.notify.open", m_open, create=True),
+        patch("homeassistant.components.file.notify.os.stat") as mock_st,
+    ):
+        mock_st.side_effect = OSError("Access Failed")
+        with pytest.raises(ServiceValidationError) as exc:
+            await hass.services.async_call(domain, service, params, blocking=True)
+        assert f"{exc.value!r}" == "ServiceValidationError('write_access_failed')"
+
+
+@pytest.mark.parametrize(
+    ("timestamp", "data", "options"),
+    [
+        (
+            False,
+            {
+                "name": "test",
+                "platform": "notify",
+                "file_path": "mock_file",
+            },
+            {
+                "timestamp": False,
+            },
+        ),
+        (
+            True,
+            {
+                "name": "test",
+                "platform": "notify",
+                "file_path": "mock_file",
+            },
+            {
+                "timestamp": True,
+            },
+        ),
+    ],
+    ids=["no_timestamp", "timestamp"],
+)
+async def test_legacy_notify_file_entry_only_setup(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    timestamp: bool,
+    mock_is_allowed_path: MagicMock,
+    data: dict[str, Any],
+    options: dict[str, Any],
+) -> None:
+    """Test the legacy notify file output in entry only setup."""
+    filename = "mock_file"
+
+    domain = notify.DOMAIN
+    service = "test"
+    params = {"message": "one, two, testing, testing"}
     message = params["message"]
 
     entry = MockConfigEntry(
         domain=DOMAIN,
-        data={"name": "test", "platform": "notify", "file_path": full_filename},
-        options={"timestamp": timestamp},
+        data=data,
         version=2,
-        title=f"test [{filename}]",
+        options=options,
+        title=f"test [{data['file_path']}]",
     )
     entry.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done(wait_background_tasks=True)
 
     freezer.move_to(dt_util.utcnow())
 
@@ -69,7 +245,7 @@ async def test_notify_file(
         await hass.services.async_call(domain, service, params, blocking=True)
 
         assert m_open.call_count == 1
-        assert m_open.call_args == call(full_filename, "a", encoding="utf8")
+        assert m_open.call_args == call(filename, "a", encoding="utf8")
 
         assert m_open.return_value.write.call_count == 2
         if not timestamp:
@@ -101,14 +277,14 @@ async def test_notify_file(
     ],
     ids=["not_allowed"],
 )
-async def test_notify_file_not_allowed(
+async def test_legacy_notify_file_not_allowed(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     mock_is_allowed_path: MagicMock,
     config: dict[str, Any],
     options: dict[str, Any],
 ) -> None:
-    """Test notify file output not allowed."""
+    """Test legacy notify file output not allowed."""
     entry = MockConfigEntry(
         domain=DOMAIN,
         data=config,
@@ -125,10 +301,11 @@ async def test_notify_file_not_allowed(
 @pytest.mark.parametrize(
     ("service", "params"),
     [
+        ("test", {"message": "one, two, testing, testing"}),
         (
             "send_message",
             {"entity_id": "notify.test", "message": "one, two, testing, testing"},
-        )
+        ),
     ],
 )
 @pytest.mark.parametrize(
diff --git a/tests/components/file/test_sensor.py b/tests/components/file/test_sensor.py
index 9e6a16e3e27..634ae9d626c 100644
--- a/tests/components/file/test_sensor.py
+++ b/tests/components/file/test_sensor.py
@@ -7,10 +7,33 @@ import pytest
 from homeassistant.components.file import DOMAIN
 from homeassistant.const import STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry, get_fixture_path
 
 
+@patch("os.path.isfile", Mock(return_value=True))
+@patch("os.access", Mock(return_value=True))
+async def test_file_value_yaml_setup(
+    hass: HomeAssistant, mock_is_allowed_path: MagicMock
+) -> None:
+    """Test the File sensor from YAML setup."""
+    config = {
+        "sensor": {
+            "platform": "file",
+            "scan_interval": 30,
+            "name": "file1",
+            "file_path": get_fixture_path("file_value.txt", "file"),
+        }
+    }
+
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.file1")
+    assert state.state == "21"
+
+
 @patch("os.path.isfile", Mock(return_value=True))
 @patch("os.access", Mock(return_value=True))
 async def test_file_value_entry_setup(
diff --git a/tests/components/freebox/test_alarm_control_panel.py b/tests/components/freebox/test_alarm_control_panel.py
index b02e4c974ff..e4ee8f63b2c 100644
--- a/tests/components/freebox/test_alarm_control_panel.py
+++ b/tests/components/freebox/test_alarm_control_panel.py
@@ -8,7 +8,6 @@ from freezegun.api import FrozenDateTimeFactory
 from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.components.freebox import SCAN_INTERVAL
 from homeassistant.const import (
@@ -17,6 +16,11 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_DISARM,
     SERVICE_ALARM_TRIGGER,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
@@ -55,7 +59,7 @@ async def test_alarm_changed_from_external(
     # Initial state
     assert (
         hass.states.get("alarm_control_panel.systeme_d_alarme").state
-        == AlarmControlPanelState.ARMING
+        == STATE_ALARM_ARMING
     )
 
     # Now simulate a changed status
@@ -69,7 +73,7 @@ async def test_alarm_changed_from_external(
 
     assert (
         hass.states.get("alarm_control_panel.systeme_d_alarme").state
-        == AlarmControlPanelState.ARMED_AWAY
+        == STATE_ALARM_ARMED_AWAY
     )
 
 
@@ -94,7 +98,7 @@ async def test_alarm_changed_from_hass(hass: HomeAssistant, router: Mock) -> Non
     # Initial state: arm_away
     assert (
         hass.states.get("alarm_control_panel.systeme_d_alarme").state
-        == AlarmControlPanelState.ARMED_AWAY
+        == STATE_ALARM_ARMED_AWAY
     )
 
     # Now call for a change -> disarmed
@@ -109,7 +113,7 @@ async def test_alarm_changed_from_hass(hass: HomeAssistant, router: Mock) -> Non
 
     assert (
         hass.states.get("alarm_control_panel.systeme_d_alarme").state
-        == AlarmControlPanelState.DISARMED
+        == STATE_ALARM_DISARMED
     )
 
     # Now call for a change -> arm_away
@@ -124,7 +128,7 @@ async def test_alarm_changed_from_hass(hass: HomeAssistant, router: Mock) -> Non
 
     assert (
         hass.states.get("alarm_control_panel.systeme_d_alarme").state
-        == AlarmControlPanelState.ARMING
+        == STATE_ALARM_ARMING
     )
 
     # Now call for a change -> arm_home
@@ -140,7 +144,7 @@ async def test_alarm_changed_from_hass(hass: HomeAssistant, router: Mock) -> Non
 
     assert (
         hass.states.get("alarm_control_panel.systeme_d_alarme").state
-        == AlarmControlPanelState.ARMED_HOME
+        == STATE_ALARM_ARMED_HOME
     )
 
     # Now call for a change -> trigger
@@ -155,7 +159,7 @@ async def test_alarm_changed_from_hass(hass: HomeAssistant, router: Mock) -> Non
 
     assert (
         hass.states.get("alarm_control_panel.systeme_d_alarme").state
-        == AlarmControlPanelState.TRIGGERED
+        == STATE_ALARM_TRIGGERED
     )
 
 
diff --git a/tests/components/fritz/const.py b/tests/components/fritz/const.py
index acd96879b1e..0817cc5d804 100644
--- a/tests/components/fritz/const.py
+++ b/tests/components/fritz/const.py
@@ -655,23 +655,7 @@ MOCK_MESH_DATA = {
                             "cur_data_rate_tx": 0,
                             "cur_availability_rx": 99,
                             "cur_availability_tx": 99,
-                        },
-                        {
-                            "uid": "nl-79",
-                            "type": "LAN",
-                            "state": "DISCONNECTED",
-                            "last_connected": 1642872667,
-                            "node_1_uid": "n-167",
-                            "node_2_uid": "n-76",
-                            "node_interface_1_uid": "ni-140",
-                            "node_interface_2_uid": "ni-77",
-                            "max_data_rate_rx": 1000000,
-                            "max_data_rate_tx": 1000000,
-                            "cur_data_rate_rx": 0,
-                            "cur_data_rate_tx": 0,
-                            "cur_availability_rx": 99,
-                            "cur_availability_tx": 99,
-                        },
+                        }
                     ],
                 }
             ],
diff --git a/tests/components/fritz/snapshots/test_update.ambr b/tests/components/fritz/snapshots/test_update.ambr
index 3c7880d01e7..4914ba85269 100644
--- a/tests/components/fritz/snapshots/test_update.ambr
+++ b/tests/components/fritz/snapshots/test_update.ambr
@@ -36,7 +36,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'auto_update': False,
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/fritz/icon.png',
       'friendly_name': 'Mock Title FRITZ!OS',
       'in_progress': False,
@@ -94,7 +93,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'auto_update': False,
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/fritz/icon.png',
       'friendly_name': 'Mock Title FRITZ!OS',
       'in_progress': False,
@@ -152,7 +150,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'auto_update': False,
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/fritz/icon.png',
       'friendly_name': 'Mock Title FRITZ!OS',
       'in_progress': False,
diff --git a/tests/components/fritz/test_config_flow.py b/tests/components/fritz/test_config_flow.py
index 84f1b240b88..e3fae8c083e 100644
--- a/tests/components/fritz/test_config_flow.py
+++ b/tests/components/fritz/test_config_flow.py
@@ -10,7 +10,6 @@ from fritzconnection.core.exceptions import (
 )
 import pytest
 
-from homeassistant.components import ssdp
 from homeassistant.components.device_tracker import (
     CONF_CONSIDER_HOME,
     DEFAULT_CONSIDER_HOME,
@@ -23,6 +22,7 @@ from homeassistant.components.fritz.const import (
     ERROR_UNKNOWN,
     FRITZ_AUTH_EXCEPTIONS,
 )
+from homeassistant.components.ssdp import ATTR_UPNP_UDN
 from homeassistant.config_entries import SOURCE_SSDP, SOURCE_USER
 from homeassistant.const import (
     CONF_HOST,
@@ -644,7 +644,7 @@ async def test_ssdp_already_in_progress_host(
 
         MOCK_NO_UNIQUE_ID = dataclasses.replace(MOCK_SSDP_DATA)
         MOCK_NO_UNIQUE_ID.upnp = MOCK_NO_UNIQUE_ID.upnp.copy()
-        del MOCK_NO_UNIQUE_ID.upnp[ssdp.ATTR_UPNP_UDN]
+        del MOCK_NO_UNIQUE_ID.upnp[ATTR_UPNP_UDN]
         result = await hass.config_entries.flow.async_init(
             DOMAIN, context={"source": SOURCE_SSDP}, data=MOCK_NO_UNIQUE_ID
         )
@@ -737,23 +737,3 @@ async def test_options_flow(hass: HomeAssistant) -> None:
         CONF_OLD_DISCOVERY: False,
         CONF_CONSIDER_HOME: 37,
     }
-
-
-async def test_ssdp_ipv6_link_local(hass: HomeAssistant) -> None:
-    """Test ignoring ipv6-link-local while ssdp discovery."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_SSDP},
-        data=ssdp.SsdpServiceInfo(
-            ssdp_usn="mock_usn",
-            ssdp_st="mock_st",
-            ssdp_location="https://[fe80::1ff:fe23:4567:890a]:12345/test",
-            upnp={
-                ssdp.ATTR_UPNP_FRIENDLY_NAME: "fake_name",
-                ssdp.ATTR_UPNP_UDN: "uuid:only-a-test",
-            },
-        ),
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "ignore_ip6_link_local"
diff --git a/tests/components/fyta/conftest.py b/tests/components/fyta/conftest.py
index 299b96be959..2bcad9b3c80 100644
--- a/tests/components/fyta/conftest.py
+++ b/tests/components/fyta/conftest.py
@@ -2,7 +2,7 @@
 
 from collections.abc import Generator
 from datetime import UTC, datetime
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, patch
 
 from fyta_cli.fyta_models import Credentials, Plant
 import pytest
@@ -46,7 +46,6 @@ def mock_fyta_connector():
         tzinfo=UTC
     )
     mock_fyta_connector.client = AsyncMock(autospec=True)
-    mock_fyta_connector.data = MagicMock()
     mock_fyta_connector.update_all_plants.return_value = plants
     mock_fyta_connector.plant_list = {
         0: "Gummibaum",
diff --git a/tests/components/fyta/fixtures/plant_status1.json b/tests/components/fyta/fixtures/plant_status1.json
index 72d129492bb..f2e8dc9c970 100644
--- a/tests/components/fyta/fixtures/plant_status1.json
+++ b/tests/components/fyta/fixtures/plant_status1.json
@@ -9,7 +9,7 @@
   "moisture_status": 3,
   "sensor_available": true,
   "sw_version": "1.0",
-  "status": 1,
+  "status": 3,
   "online": true,
   "ph": null,
   "plant_id": 0,
diff --git a/tests/components/fyta/fixtures/plant_status2.json b/tests/components/fyta/fixtures/plant_status2.json
index 8ed09532567..a5c2735ca7c 100644
--- a/tests/components/fyta/fixtures/plant_status2.json
+++ b/tests/components/fyta/fixtures/plant_status2.json
@@ -9,7 +9,7 @@
   "moisture_status": 3,
   "sensor_available": true,
   "sw_version": "1.0",
-  "status": 1,
+  "status": 3,
   "online": true,
   "ph": 7,
   "plant_id": 0,
diff --git a/tests/components/fyta/fixtures/plant_status3.json b/tests/components/fyta/fixtures/plant_status3.json
deleted file mode 100644
index 6e32ba601ed..00000000000
--- a/tests/components/fyta/fixtures/plant_status3.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "battery_level": 80,
-  "battery_status": true,
-  "last_updated": "2023-01-02 10:10:00",
-  "light": 2,
-  "light_status": 3,
-  "nickname": "Tomatenpflanze",
-  "moisture": 61,
-  "moisture_status": 3,
-  "sensor_available": true,
-  "sw_version": "1.0",
-  "status": 1,
-  "online": true,
-  "ph": 7,
-  "plant_id": 0,
-  "plant_origin_path": "",
-  "plant_thumb_path": "",
-  "salinity": 1,
-  "salinity_status": 4,
-  "scientific_name": "Solanum lycopersicum",
-  "temperature": 25.2,
-  "temperature_status": 3
-}
diff --git a/tests/components/fyta/snapshots/test_diagnostics.ambr b/tests/components/fyta/snapshots/test_diagnostics.ambr
index 2af616c6412..5c68040f541 100644
--- a/tests/components/fyta/snapshots/test_diagnostics.ambr
+++ b/tests/components/fyta/snapshots/test_diagnostics.ambr
@@ -42,7 +42,7 @@
         'salinity_status': 4,
         'scientific_name': 'Ficus elastica',
         'sensor_available': True,
-        'status': 1,
+        'status': 3,
         'sw_version': '1.0',
         'temperature': 25.2,
         'temperature_status': 3,
@@ -65,7 +65,7 @@
         'salinity_status': 4,
         'scientific_name': 'Theobroma cacao',
         'sensor_available': True,
-        'status': 1,
+        'status': 3,
         'sw_version': '1.0',
         'temperature': 25.2,
         'temperature_status': 3,
diff --git a/tests/components/fyta/snapshots/test_sensor.ambr b/tests/components/fyta/snapshots/test_sensor.ambr
index ef583dd28a6..7156163ab31 100644
--- a/tests/components/fyta/snapshots/test_sensor.ambr
+++ b/tests/components/fyta/snapshots/test_sensor.ambr
@@ -386,7 +386,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'doing_great',
+    'state': 'no_sensor',
   })
 # ---
 # name: test_all_entities[sensor.gummibaum_salinity-entry]
@@ -1052,7 +1052,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'doing_great',
+    'state': 'no_sensor',
   })
 # ---
 # name: test_all_entities[sensor.kakaobaum_salinity-entry]
diff --git a/tests/components/fyta/test_sensor.py b/tests/components/fyta/test_sensor.py
index 07e3965e66f..e33c54695e5 100644
--- a/tests/components/fyta/test_sensor.py
+++ b/tests/components/fyta/test_sensor.py
@@ -5,23 +5,16 @@ from unittest.mock import AsyncMock
 
 from freezegun.api import FrozenDateTimeFactory
 from fyta_cli.fyta_exceptions import FytaConnectionError, FytaPlantError
-from fyta_cli.fyta_models import Plant
 import pytest
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.fyta.const import DOMAIN as FYTA_DOMAIN
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
 from . import setup_platform
 
-from tests.common import (
-    MockConfigEntry,
-    async_fire_time_changed,
-    load_json_object_fixture,
-    snapshot_platform,
-)
+from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
 
 
 async def test_all_entities(
@@ -61,32 +54,3 @@ async def test_connection_error(
     await hass.async_block_till_done()
 
     assert hass.states.get("sensor.gummibaum_plant_state").state == STATE_UNAVAILABLE
-
-
-async def test_add_remove_entities(
-    hass: HomeAssistant,
-    mock_fyta_connector: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test if entities are added and old are removed."""
-    await setup_platform(hass, mock_config_entry, [Platform.SENSOR])
-
-    assert hass.states.get("sensor.gummibaum_plant_state").state == "doing_great"
-
-    plants: dict[int, Plant] = {
-        0: Plant.from_dict(load_json_object_fixture("plant_status1.json", FYTA_DOMAIN)),
-        2: Plant.from_dict(load_json_object_fixture("plant_status3.json", FYTA_DOMAIN)),
-    }
-    mock_fyta_connector.update_all_plants.return_value = plants
-    mock_fyta_connector.plant_list = {
-        0: "Kautschukbaum",
-        2: "Tomatenpflanze",
-    }
-
-    freezer.tick(delta=timedelta(minutes=10))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("sensor.kakaobaum_plant_state") is None
-    assert hass.states.get("sensor.tomatenpflanze_plant_state").state == "doing_great"
diff --git a/tests/components/gardena_bluetooth/test_config_flow.py b/tests/components/gardena_bluetooth/test_config_flow.py
index b20395ec40f..3b4e9c242b3 100644
--- a/tests/components/gardena_bluetooth/test_config_flow.py
+++ b/tests/components/gardena_bluetooth/test_config_flow.py
@@ -31,7 +31,6 @@ async def test_user_selection(
 
     inject_bluetooth_service_info(hass, WATER_TIMER_SERVICE_INFO)
     inject_bluetooth_service_info(hass, WATER_TIMER_UNNAMED_SERVICE_INFO)
-    await hass.async_block_till_done(wait_background_tasks=True)
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
diff --git a/tests/components/generic/test_camera.py b/tests/components/generic/test_camera.py
index d3ef0a39241..59ff513ccc9 100644
--- a/tests/components/generic/test_camera.py
+++ b/tests/components/generic/test_camera.py
@@ -275,9 +275,7 @@ async def test_limit_refetch(
 
     with (
         pytest.raises(aiohttp.ServerTimeoutError),
-        patch.object(
-            client.session._connector, "connect", side_effect=asyncio.TimeoutError
-        ),
+        patch("asyncio.timeout", side_effect=TimeoutError()),
     ):
         resp = await client.get("/api/camera_proxy/camera.config_test")
 
diff --git a/tests/components/generic_thermostat/snapshots/test_config_flow.ambr b/tests/components/generic_thermostat/snapshots/test_config_flow.ambr
index ed757d1c2ae..d515d52a81b 100644
--- a/tests/components/generic_thermostat/snapshots/test_config_flow.ambr
+++ b/tests/components/generic_thermostat/snapshots/test_config_flow.ambr
@@ -18,25 +18,6 @@
     'type': <FlowResultType.FORM: 'form'>,
   })
 # ---
-# name: test_config_flow_preset_accepts_float[create_entry]
-  FlowResultSnapshot({
-    'result': ConfigEntrySnapshot({
-      'title': 'My thermostat',
-    }),
-    'title': 'My thermostat',
-    'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
-  })
-# ---
-# name: test_config_flow_preset_accepts_float[init]
-  FlowResultSnapshot({
-    'type': <FlowResultType.FORM: 'form'>,
-  })
-# ---
-# name: test_config_flow_preset_accepts_float[presets]
-  FlowResultSnapshot({
-    'type': <FlowResultType.FORM: 'form'>,
-  })
-# ---
 # name: test_options[create_entry]
   FlowResultSnapshot({
     'result': True,
diff --git a/tests/components/generic_thermostat/test_config_flow.py b/tests/components/generic_thermostat/test_config_flow.py
index 561870ad3d4..7a7fdabc6e6 100644
--- a/tests/components/generic_thermostat/test_config_flow.py
+++ b/tests/components/generic_thermostat/test_config_flow.py
@@ -132,51 +132,3 @@ async def test_options(hass: HomeAssistant, snapshot: SnapshotAssertion) -> None
     # Check config entry is reloaded with new options
     await hass.async_block_till_done()
     assert hass.states.get("climate.my_thermostat") == snapshot(name="without_away")
-
-
-async def test_config_flow_preset_accepts_float(
-    hass: HomeAssistant, snapshot: SnapshotAssertion
-) -> None:
-    """Test the config flow with preset is a float."""
-    with patch(
-        "homeassistant.components.generic_thermostat.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}
-        )
-        assert result == snapshot(name="init", include=SNAPSHOT_FLOW_PROPS)
-
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_NAME: "My thermostat",
-                CONF_HEATER: "switch.run",
-                CONF_SENSOR: "sensor.temperature",
-                CONF_AC_MODE: False,
-                CONF_COLD_TOLERANCE: 0.3,
-                CONF_HOT_TOLERANCE: 0.3,
-            },
-        )
-        assert result == snapshot(name="presets", include=SNAPSHOT_FLOW_PROPS)
-
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_PRESETS[PRESET_AWAY]: 10.4,
-            },
-        )
-        assert result == snapshot(name="create_entry", include=SNAPSHOT_FLOW_PROPS)
-
-        await hass.async_block_till_done()
-
-    assert len(mock_setup_entry.mock_calls) == 1
-    assert result["options"] == {
-        "ac_mode": False,
-        "away_temp": 10.4,
-        "cold_tolerance": 0.3,
-        "heater": "switch.run",
-        "hot_tolerance": 0.3,
-        "name": "My thermostat",
-        "target_sensor": "sensor.temperature",
-    }
diff --git a/tests/components/geniushub/conftest.py b/tests/components/geniushub/conftest.py
index 304d7555a8c..1d2e706a6a6 100644
--- a/tests/components/geniushub/conftest.py
+++ b/tests/components/geniushub/conftest.py
@@ -2,7 +2,7 @@
 
 from collections.abc import Generator
 from typing import Any
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from geniushubclient import GeniusDevice, GeniusZone
 import pytest
@@ -11,6 +11,7 @@ from homeassistant.components.geniushub.const import DOMAIN
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
 
 from tests.common import MockConfigEntry, load_json_array_fixture
+from tests.components.smhi.common import AsyncMock
 
 
 @pytest.fixture
diff --git a/tests/components/geniushub/test_config_flow.py b/tests/components/geniushub/test_config_flow.py
index 7d1d33a2245..9234e03e35a 100644
--- a/tests/components/geniushub/test_config_flow.py
+++ b/tests/components/geniushub/test_config_flow.py
@@ -2,14 +2,21 @@
 
 from http import HTTPStatus
 import socket
+from typing import Any
 from unittest.mock import AsyncMock
 
 from aiohttp import ClientConnectionError, ClientResponseError
 import pytest
 
 from homeassistant.components.geniushub import DOMAIN
-from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
+from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MAC,
+    CONF_PASSWORD,
+    CONF_TOKEN,
+    CONF_USERNAME,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -302,3 +309,174 @@ async def test_cloud_duplicate(
     )
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
+
+
+@pytest.mark.parametrize(
+    ("data"),
+    [
+        {
+            CONF_HOST: "10.0.0.130",
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+        },
+        {
+            CONF_HOST: "10.0.0.130",
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+            CONF_MAC: "aa:bb:cc:dd:ee:ff",
+        },
+    ],
+)
+async def test_import_local_flow(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_geniushub_client: AsyncMock,
+    data: dict[str, Any],
+) -> None:
+    """Test full local import flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data=data,
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "10.0.0.130"
+    assert result["data"] == data
+    assert result["result"].unique_id == "aa:bb:cc:dd:ee:ff"
+
+
+@pytest.mark.parametrize(
+    ("data"),
+    [
+        {
+            CONF_TOKEN: "abcdef",
+        },
+        {
+            CONF_TOKEN: "abcdef",
+            CONF_MAC: "aa:bb:cc:dd:ee:ff",
+        },
+    ],
+)
+async def test_import_cloud_flow(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_geniushub_client: AsyncMock,
+    data: dict[str, Any],
+) -> None:
+    """Test full cloud import flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data=data,
+    )
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Genius hub"
+    assert result["data"] == data
+
+
+@pytest.mark.parametrize(
+    ("data"),
+    [
+        {
+            CONF_HOST: "10.0.0.130",
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+        },
+        {
+            CONF_HOST: "10.0.0.130",
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+            CONF_MAC: "aa:bb:cc:dd:ee:ff",
+        },
+        {
+            CONF_TOKEN: "abcdef",
+        },
+        {
+            CONF_TOKEN: "abcdef",
+            CONF_MAC: "aa:bb:cc:dd:ee:ff",
+        },
+    ],
+)
+@pytest.mark.parametrize(
+    ("exception", "reason"),
+    [
+        (socket.gaierror, "invalid_host"),
+        (
+            ClientResponseError(AsyncMock(), (), status=HTTPStatus.UNAUTHORIZED),
+            "invalid_auth",
+        ),
+        (
+            ClientResponseError(AsyncMock(), (), status=HTTPStatus.NOT_FOUND),
+            "invalid_host",
+        ),
+        (TimeoutError, "cannot_connect"),
+        (ClientConnectionError, "cannot_connect"),
+        (Exception, "unknown"),
+    ],
+)
+async def test_import_flow_exceptions(
+    hass: HomeAssistant,
+    mock_geniushub_client: AsyncMock,
+    data: dict[str, Any],
+    exception: Exception,
+    reason: str,
+) -> None:
+    """Test import flow exceptions."""
+    mock_geniushub_client.request.side_effect = exception
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data=data,
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == reason
+
+
+@pytest.mark.parametrize(
+    ("data"),
+    [
+        {
+            CONF_HOST: "10.0.0.130",
+            CONF_USERNAME: "test-username",
+            CONF_PASSWORD: "test-password",
+        },
+        {
+            CONF_HOST: "10.0.0.131",
+            CONF_USERNAME: "test-username1",
+            CONF_PASSWORD: "test-password",
+        },
+    ],
+)
+async def test_import_flow_local_duplicate(
+    hass: HomeAssistant,
+    mock_geniushub_client: AsyncMock,
+    mock_local_config_entry: MockConfigEntry,
+    data: dict[str, Any],
+) -> None:
+    """Test import flow aborts on local duplicate data."""
+    mock_local_config_entry.add_to_hass(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data=data,
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_import_flow_cloud_duplicate(
+    hass: HomeAssistant,
+    mock_geniushub_client: AsyncMock,
+    mock_cloud_config_entry: MockConfigEntry,
+) -> None:
+    """Test import flow aborts on cloud duplicate data."""
+    mock_cloud_config_entry.add_to_hass(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data={
+            CONF_TOKEN: "abcdef",
+        },
+    )
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
diff --git a/tests/components/geofency/test_init.py b/tests/components/geofency/test_init.py
index 33740397868..3a98c6480bd 100644
--- a/tests/components/geofency/test_init.py
+++ b/tests/components/geofency/test_init.py
@@ -10,6 +10,7 @@ from homeassistant import config_entries
 from homeassistant.components import zone
 from homeassistant.components.device_tracker.legacy import Device
 from homeassistant.components.geofency import CONF_MOBILE_BEACONS, DOMAIN
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     ATTR_LATITUDE,
     ATTR_LONGITUDE,
@@ -17,7 +18,6 @@ from homeassistant.const import (
     STATE_NOT_HOME,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/glances/test_config_flow.py b/tests/components/glances/test_config_flow.py
index ae8c2e1d51e..0fabc387a4f 100644
--- a/tests/components/glances/test_config_flow.py
+++ b/tests/components/glances/test_config_flow.py
@@ -11,7 +11,6 @@ import pytest
 
 from homeassistant import config_entries
 from homeassistant.components import glances
-from homeassistant.const import CONF_NAME, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -93,10 +92,7 @@ async def test_reauth_success(hass: HomeAssistant) -> None:
     result = await entry.start_reauth_flow(hass)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
-    assert result["description_placeholders"] == {
-        CONF_NAME: "Mock Title",
-        CONF_USERNAME: "username",
-    }
+    assert result["description_placeholders"] == {"username": "username"}
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
@@ -127,10 +123,7 @@ async def test_reauth_fails(
     result = await entry.start_reauth_flow(hass)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
-    assert result["description_placeholders"] == {
-        CONF_NAME: "Mock Title",
-        CONF_USERNAME: "username",
-    }
+    assert result["description_placeholders"] == {"username": "username"}
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
diff --git a/tests/components/go2rtc/__init__.py b/tests/components/go2rtc/__init__.py
index 0971541efa5..20cbd67d571 100644
--- a/tests/components/go2rtc/__init__.py
+++ b/tests/components/go2rtc/__init__.py
@@ -1 +1,13 @@
 """Go2rtc tests."""
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/go2rtc/conftest.py b/tests/components/go2rtc/conftest.py
index abb139b89bf..b1c0f64121d 100644
--- a/tests/components/go2rtc/conftest.py
+++ b/tests/components/go2rtc/conftest.py
@@ -3,94 +3,58 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, Mock, patch
 
-from awesomeversion import AwesomeVersion
-from go2rtc_client.rest import _StreamClient, _WebRTCClient
+from go2rtc_client.client import _StreamClient, _WebRTCClient
 import pytest
 
-from homeassistant.components.go2rtc.const import RECOMMENDED_VERSION
+from homeassistant.components.go2rtc.const import CONF_BINARY, DOMAIN
 from homeassistant.components.go2rtc.server import Server
+from homeassistant.const import CONF_URL
 
-GO2RTC_PATH = "homeassistant.components.go2rtc"
+from tests.common import MockConfigEntry
 
 
 @pytest.fixture
-def rest_client() -> Generator[AsyncMock]:
-    """Mock a go2rtc rest client."""
+def mock_setup_entry() -> Generator[AsyncMock]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.go2rtc.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_client() -> Generator[AsyncMock]:
+    """Mock a go2rtc client."""
     with (
         patch(
-            "homeassistant.components.go2rtc.Go2RtcRestClient",
+            "homeassistant.components.go2rtc.Go2RtcClient",
         ) as mock_client,
-        patch("homeassistant.components.go2rtc.server.Go2RtcRestClient", mock_client),
+        patch(
+            "homeassistant.components.go2rtc.config_flow.Go2RtcClient",
+            new=mock_client,
+        ),
     ):
         client = mock_client.return_value
-        client.streams = streams = Mock(spec_set=_StreamClient)
-        streams.list.return_value = {}
-        client.validate_server_version = AsyncMock(
-            return_value=AwesomeVersion(RECOMMENDED_VERSION)
-        )
+        client.streams = Mock(spec_set=_StreamClient)
         client.webrtc = Mock(spec_set=_WebRTCClient)
         yield client
 
 
 @pytest.fixture
-def ws_client() -> Generator[Mock]:
-    """Mock a go2rtc websocket client."""
-    with patch(
-        "homeassistant.components.go2rtc.Go2RtcWsClient", autospec=True
-    ) as ws_client_mock:
-        yield ws_client_mock.return_value
-
-
-@pytest.fixture
-def server_stdout() -> list[str]:
-    """Server stdout lines."""
-    return [
-        "09:00:03.466 INF go2rtc platform=linux/amd64 revision=780f378 version=1.9.5",
-        "09:00:03.466 INF config path=/tmp/go2rtc.yaml",
-        "09:00:03.467 INF [rtsp] listen addr=:8554",
-        "09:00:03.467 INF [api] listen addr=127.0.0.1:1984",
-        "09:00:03.467 INF [webrtc] listen addr=:8555/tcp",
-    ]
-
-
-@pytest.fixture
-def mock_create_subprocess(server_stdout: list[str]) -> Generator[AsyncMock]:
-    """Mock create_subprocess_exec."""
-    with patch(f"{GO2RTC_PATH}.server.asyncio.create_subprocess_exec") as mock_subproc:
-        subproc = AsyncMock()
-        subproc.terminate = Mock()
-        subproc.kill = Mock()
-        subproc.returncode = None
-        # Simulate process output
-        subproc.stdout.__aiter__.return_value = iter(
-            [f"{entry}\n".encode() for entry in server_stdout]
-        )
-        mock_subproc.return_value = subproc
-        yield mock_subproc
-
-
-@pytest.fixture
-def server_start(mock_create_subprocess: AsyncMock) -> Generator[AsyncMock]:
-    """Mock start of a go2rtc server."""
-    with patch(
-        f"{GO2RTC_PATH}.server.Server.start", wraps=Server.start, autospec=True
-    ) as mock_server_start:
-        yield mock_server_start
-
-
-@pytest.fixture
-def server_stop() -> Generator[AsyncMock]:
-    """Mock stop of a go2rtc server."""
-    with (
-        patch(
-            f"{GO2RTC_PATH}.server.Server.stop", wraps=Server.stop, autospec=True
-        ) as mock_server_stop,
-    ):
-        yield mock_server_stop
-
-
-@pytest.fixture
-def server(server_start: AsyncMock, server_stop: AsyncMock) -> Generator[AsyncMock]:
+def mock_server() -> Generator[AsyncMock]:
     """Mock a go2rtc server."""
-    with patch(f"{GO2RTC_PATH}.Server", wraps=Server) as mock_server:
+    with patch(
+        "homeassistant.components.go2rtc.Server", spec_set=Server
+    ) as mock_server:
         yield mock_server
+
+
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Mock a config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title=DOMAIN,
+        data={CONF_URL: "http://localhost:1984/", CONF_BINARY: "/usr/bin/go2rtc"},
+    )
diff --git a/tests/components/go2rtc/test_config_flow.py b/tests/components/go2rtc/test_config_flow.py
index c414af35b38..4af599810d7 100644
--- a/tests/components/go2rtc/test_config_flow.py
+++ b/tests/components/go2rtc/test_config_flow.py
@@ -1,45 +1,156 @@
-"""Test the Home Assistant Cloud config flow."""
+"""Tests for the Go2rtc config flow."""
 
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
-from homeassistant.components.go2rtc.const import DOMAIN
+import pytest
+
+from homeassistant.components.go2rtc.const import CONF_BINARY, DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
 from tests.common import MockConfigEntry
 
 
-async def test_config_flow(hass: HomeAssistant) -> None:
-    """Test create cloud entry."""
-
-    with (
-        patch(
-            "homeassistant.components.go2rtc.async_setup", return_value=True
-        ) as mock_setup,
-        patch(
-            "homeassistant.components.go2rtc.async_setup_entry",
-            return_value=True,
-        ) as mock_setup_entry,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": "system"}
-        )
-        assert result["type"] is FlowResultType.CREATE_ENTRY
-        assert result["title"] == "go2rtc"
-        assert result["data"] == {}
-        await hass.async_block_till_done()
-
-    assert len(mock_setup.mock_calls) == 1
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_multiple_entries(hass: HomeAssistant) -> None:
-    """Test creating multiple cloud entries."""
-    config_entry = MockConfigEntry(domain=DOMAIN)
-    config_entry.add_to_hass(hass)
+@pytest.mark.usefixtures("mock_client", "mock_setup_entry")
+async def test_single_instance_allowed(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that flow will abort if already configured."""
+    mock_config_entry.add_to_hass(hass)
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "system"}
+        DOMAIN,
+        context={"source": SOURCE_USER},
     )
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "single_instance_allowed"
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_docker_with_binary(
+    hass: HomeAssistant,
+) -> None:
+    """Test config flow, where HA is running in docker with a go2rtc binary available."""
+    binary = "/usr/bin/go2rtc"
+    with (
+        patch(
+            "homeassistant.components.go2rtc.config_flow.is_docker_env",
+            return_value=True,
+        ),
+        patch(
+            "homeassistant.components.go2rtc.config_flow.shutil.which",
+            return_value=binary,
+        ),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
+        assert result["title"] == "go2rtc"
+        assert result["data"] == {
+            CONF_BINARY: binary,
+            CONF_URL: "http://localhost:1984/",
+        }
+
+
+@pytest.mark.usefixtures("mock_setup_entry", "mock_client")
+@pytest.mark.parametrize(
+    ("is_docker_env", "shutil_which"),
+    [
+        (True, None),
+        (False, None),
+        (False, "/usr/bin/go2rtc"),
+    ],
+)
+async def test_config_flow_url(
+    hass: HomeAssistant,
+    is_docker_env: bool,
+    shutil_which: str | None,
+) -> None:
+    """Test config flow with url input."""
+    with (
+        patch(
+            "homeassistant.components.go2rtc.config_flow.is_docker_env",
+            return_value=is_docker_env,
+        ),
+        patch(
+            "homeassistant.components.go2rtc.config_flow.shutil.which",
+            return_value=shutil_which,
+        ),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "url"
+        url = "http://go2rtc.local:1984/"
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_URL: url},
+        )
+
+        assert result["type"] is FlowResultType.CREATE_ENTRY
+        assert result["title"] == "go2rtc"
+        assert result["data"] == {
+            CONF_URL: url,
+        }
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+async def test_flow_errors(
+    hass: HomeAssistant,
+    mock_client: Mock,
+) -> None:
+    """Test flow errors."""
+    with (
+        patch(
+            "homeassistant.components.go2rtc.config_flow.is_docker_env",
+            return_value=False,
+        ),
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "url"
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_URL: "go2rtc.local:1984/"},
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["errors"] == {"url": "invalid_url_schema"}
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_URL: "http://"},
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["errors"] == {"url": "invalid_url"}
+
+        url = "http://go2rtc.local:1984/"
+        mock_client.streams.list.side_effect = Exception
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_URL: url},
+        )
+        assert result["type"] is FlowResultType.FORM
+        assert result["errors"] == {"url": "cannot_connect"}
+
+        mock_client.streams.list.side_effect = None
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_URL: url},
+        )
+        assert result["type"] is FlowResultType.CREATE_ENTRY
+        assert result["title"] == "go2rtc"
+        assert result["data"] == {
+            CONF_URL: url,
+        }
diff --git a/tests/components/go2rtc/test_init.py b/tests/components/go2rtc/test_init.py
index 0f1cac6942d..f95e98825ae 100644
--- a/tests/components/go2rtc/test_init.py
+++ b/tests/components/go2rtc/test_init.py
@@ -1,50 +1,27 @@
 """The tests for the go2rtc component."""
 
-from collections.abc import Callable, Generator
-import logging
-from typing import NamedTuple
-from unittest.mock import AsyncMock, Mock, patch
+from collections.abc import Callable
+from unittest.mock import AsyncMock, Mock
 
-from aiohttp.client_exceptions import ClientConnectionError, ServerConnectionError
-from awesomeversion import AwesomeVersion
-from go2rtc_client import Stream
-from go2rtc_client.exceptions import Go2RtcClientError, Go2RtcVersionError
+from go2rtc_client import Stream, WebRTCSdpAnswer, WebRTCSdpOffer
 from go2rtc_client.models import Producer
-from go2rtc_client.ws import (
-    ReceiveMessages,
-    WebRTCAnswer,
-    WebRTCCandidate,
-    WebRTCOffer,
-    WsError,
-)
 import pytest
-from webrtc_models import RTCIceCandidate
 
 from homeassistant.components.camera import (
     DOMAIN as CAMERA_DOMAIN,
     Camera,
     CameraEntityFeature,
-    StreamType,
-    WebRTCAnswer as HAWebRTCAnswer,
-    WebRTCCandidate as HAWebRTCCandidate,
-    WebRTCError,
-    WebRTCMessage,
-    WebRTCSendMessage,
 )
-from homeassistant.components.default_config import DOMAIN as DEFAULT_CONFIG_DOMAIN
+from homeassistant.components.camera.const import StreamType
+from homeassistant.components.camera.helper import get_camera_from_entity_id
 from homeassistant.components.go2rtc import WebRTCProvider
-from homeassistant.components.go2rtc.const import (
-    CONF_DEBUG_UI,
-    DEBUG_UI_URL_MESSAGE,
-    DOMAIN,
-    RECOMMENDED_VERSION,
-)
+from homeassistant.components.go2rtc.const import DOMAIN
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState, ConfigFlow
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import issue_registry as ir
-from homeassistant.helpers.typing import ConfigType
-from homeassistant.setup import async_setup_component
+from homeassistant.exceptions import HomeAssistantError
+
+from . import setup_integration
 
 from tests.common import (
     MockConfigEntry,
@@ -87,6 +64,12 @@ class MockCamera(Camera):
         return self._stream_source
 
 
+@pytest.fixture
+def integration_entity() -> MockCamera:
+    """Mock Camera Entity."""
+    return MockCamera()
+
+
 @pytest.fixture
 def integration_config_entry(hass: HomeAssistant) -> ConfigEntry:
     """Test mock config entry."""
@@ -95,70 +78,12 @@ def integration_config_entry(hass: HomeAssistant) -> ConfigEntry:
     return entry
 
 
-@pytest.fixture(name="go2rtc_binary")
-def go2rtc_binary_fixture() -> str:
-    """Fixture to provide go2rtc binary name."""
-    return "/usr/bin/go2rtc"
-
-
-@pytest.fixture
-def mock_get_binary(go2rtc_binary) -> Generator[Mock]:
-    """Mock _get_binary."""
-    with patch(
-        "homeassistant.components.go2rtc.shutil.which",
-        return_value=go2rtc_binary,
-    ) as mock_which:
-        yield mock_which
-
-
-@pytest.fixture(name="has_go2rtc_entry")
-def has_go2rtc_entry_fixture() -> bool:
-    """Fixture to control if a go2rtc config entry should be created."""
-    return True
-
-
-@pytest.fixture
-def mock_go2rtc_entry(hass: HomeAssistant, has_go2rtc_entry: bool) -> None:
-    """Mock a go2rtc onfig entry."""
-    if not has_go2rtc_entry:
-        return
-    config_entry = MockConfigEntry(domain=DOMAIN)
-    config_entry.add_to_hass(hass)
-
-
-@pytest.fixture(name="is_docker_env")
-def is_docker_env_fixture() -> bool:
-    """Fixture to provide is_docker_env return value."""
-    return True
-
-
-@pytest.fixture
-def mock_is_docker_env(is_docker_env) -> Generator[Mock]:
-    """Mock is_docker_env."""
-    with patch(
-        "homeassistant.components.go2rtc.is_docker_env",
-        return_value=is_docker_env,
-    ) as mock_is_docker_env:
-        yield mock_is_docker_env
-
-
-@pytest.fixture
-async def init_integration(
-    hass: HomeAssistant,
-    rest_client: AsyncMock,
-    mock_is_docker_env,
-    mock_get_binary,
-    server: Mock,
-) -> None:
-    """Initialize the go2rtc integration."""
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
-
-
 @pytest.fixture
 async def init_test_integration(
     hass: HomeAssistant,
     integration_config_entry: ConfigEntry,
-) -> MockCamera:
+    integration_entity: MockCamera,
+) -> None:
     """Initialize components."""
 
     async def async_setup_entry_init(
@@ -187,9 +112,8 @@ async def init_test_integration(
             async_unload_entry=async_unload_entry_init,
         ),
     )
-    test_camera = MockCamera()
     setup_test_component_platform(
-        hass, CAMERA_DOMAIN, [test_camera], from_config_entry=True
+        hass, CAMERA_DOMAIN, [integration_entity], from_config_entry=True
     )
     mock_platform(hass, f"{TEST_DOMAIN}.config_flow", Mock())
 
@@ -197,563 +121,99 @@ async def init_test_integration(
         assert await hass.config_entries.async_setup(integration_config_entry.entry_id)
         await hass.async_block_till_done()
 
-    return test_camera
+    return integration_config_entry
 
 
-async def _test_setup_and_signaling(
+@pytest.mark.usefixtures("init_test_integration")
+async def _test_setup(
     hass: HomeAssistant,
-    issue_registry: ir.IssueRegistry,
-    rest_client: AsyncMock,
-    ws_client: Mock,
-    config: ConfigType,
+    mock_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
     after_setup_fn: Callable[[], None],
-    camera: MockCamera,
 ) -> None:
     """Test the go2rtc config entry."""
-    entity_id = camera.entity_id
+    entity_id = "camera.test"
+    camera = get_camera_from_entity_id(hass, entity_id)
     assert camera.frontend_stream_type == StreamType.HLS
 
-    assert await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert issue_registry.async_get_issue(DOMAIN, "recommended_version") is None
-    config_entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(config_entries) == 1
-    assert config_entries[0].state == ConfigEntryState.LOADED
+    await setup_integration(hass, mock_config_entry)
     after_setup_fn()
 
-    receive_message_callback = Mock(spec_set=WebRTCSendMessage)
+    mock_client.webrtc.forward_whep_sdp_offer.return_value = WebRTCSdpAnswer(ANSWER_SDP)
 
-    async def test() -> None:
-        await camera.async_handle_async_webrtc_offer(
-            OFFER_SDP, "session_id", receive_message_callback
-        )
-        ws_client.send.assert_called_once_with(
-            WebRTCOffer(
-                OFFER_SDP,
-                camera.async_get_webrtc_client_configuration().configuration.ice_servers,
-            )
-        )
-        ws_client.subscribe.assert_called_once()
+    answer = await camera.async_handle_web_rtc_offer(OFFER_SDP)
+    assert answer == ANSWER_SDP
 
-        # Simulate the answer from the go2rtc server
-        callback = ws_client.subscribe.call_args[0][0]
-        callback(WebRTCAnswer(ANSWER_SDP))
-        receive_message_callback.assert_called_once_with(HAWebRTCAnswer(ANSWER_SDP))
-
-    await test()
-
-    rest_client.streams.add.assert_called_once_with(
-        entity_id,
-        [
-            "rtsp://stream",
-            f"ffmpeg:{camera.entity_id}#audio=opus#query=log_level=debug",
-        ],
-    )
-
-    # Stream exists but the source is different
-    rest_client.streams.add.reset_mock()
-    rest_client.streams.list.return_value = {
-        entity_id: Stream([Producer("rtsp://different")])
-    }
-
-    receive_message_callback.reset_mock()
-    ws_client.reset_mock()
-    await test()
-
-    rest_client.streams.add.assert_called_once_with(
-        entity_id,
-        [
-            "rtsp://stream",
-            f"ffmpeg:{camera.entity_id}#audio=opus#query=log_level=debug",
-        ],
+    mock_client.webrtc.forward_whep_sdp_offer.assert_called_once_with(
+        entity_id, WebRTCSdpOffer(OFFER_SDP)
     )
+    mock_client.streams.add.assert_called_once_with(entity_id, "rtsp://stream")
 
     # If the stream is already added, the stream should not be added again.
-    rest_client.streams.add.reset_mock()
-    rest_client.streams.list.return_value = {
+    mock_client.streams.add.reset_mock()
+    mock_client.streams.list.return_value = {
         entity_id: Stream([Producer("rtsp://stream")])
     }
 
-    receive_message_callback.reset_mock()
-    ws_client.reset_mock()
-    await test()
-
-    rest_client.streams.add.assert_not_called()
-    assert isinstance(camera._webrtc_provider, WebRTCProvider)
+    answer = await camera.async_handle_web_rtc_offer(OFFER_SDP)
+    assert answer == ANSWER_SDP
+    mock_client.streams.add.assert_not_called()
+    assert mock_client.webrtc.forward_whep_sdp_offer.call_count == 2
+    assert isinstance(camera._webrtc_providers[0], WebRTCProvider)
 
     # Set stream source to None and provider should be skipped
-    rest_client.streams.list.return_value = {}
-    receive_message_callback.reset_mock()
+    mock_client.streams.list.return_value = {}
     camera.set_stream_source(None)
-    await camera.async_handle_async_webrtc_offer(
-        OFFER_SDP, "session_id", receive_message_callback
-    )
-    receive_message_callback.assert_called_once_with(
-        WebRTCError("go2rtc_webrtc_offer_failed", "Camera has no stream source")
-    )
+    with pytest.raises(
+        HomeAssistantError,
+        match="WebRTC offer was not accepted by the supported providers",
+    ):
+        await camera.async_handle_web_rtc_offer(OFFER_SDP)
+
+    # Remove go2rtc config entry
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    await hass.config_entries.async_remove(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+
+    assert camera._webrtc_providers == []
+    assert camera.frontend_stream_type == StreamType.HLS
 
 
-@pytest.mark.usefixtures(
-    "init_test_integration",
-    "mock_get_binary",
-    "mock_is_docker_env",
-    "mock_go2rtc_entry",
-)
-@pytest.mark.parametrize(
-    ("config", "ui_enabled"),
-    [
-        ({DOMAIN: {}}, False),
-        ({DOMAIN: {CONF_DEBUG_UI: True}}, True),
-        ({DEFAULT_CONFIG_DOMAIN: {}}, False),
-        ({DEFAULT_CONFIG_DOMAIN: {}, DOMAIN: {CONF_DEBUG_UI: True}}, True),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
+@pytest.mark.usefixtures("init_test_integration")
 async def test_setup_go_binary(
     hass: HomeAssistant,
-    issue_registry: ir.IssueRegistry,
-    rest_client: AsyncMock,
-    ws_client: Mock,
-    server: AsyncMock,
-    server_start: Mock,
-    server_stop: Mock,
-    init_test_integration: MockCamera,
-    has_go2rtc_entry: bool,
-    config: ConfigType,
-    ui_enabled: bool,
+    mock_client: AsyncMock,
+    mock_server: AsyncMock,
+    mock_config_entry: MockConfigEntry,
 ) -> None:
     """Test the go2rtc config entry with binary."""
-    assert (len(hass.config_entries.async_entries(DOMAIN)) == 1) == has_go2rtc_entry
 
     def after_setup() -> None:
-        server.assert_called_once_with(hass, "/usr/bin/go2rtc", enable_ui=ui_enabled)
-        server_start.assert_called_once()
+        mock_server.assert_called_once_with(hass, "/usr/bin/go2rtc")
+        mock_server.return_value.start.assert_called_once()
 
-    await _test_setup_and_signaling(
-        hass,
-        issue_registry,
-        rest_client,
-        ws_client,
-        config,
-        after_setup,
-        init_test_integration,
-    )
+    await _test_setup(hass, mock_client, mock_config_entry, after_setup)
 
-    await hass.async_stop()
-    server_stop.assert_called_once()
+    mock_server.return_value.stop.assert_called_once()
 
 
-@pytest.mark.usefixtures("mock_go2rtc_entry")
-@pytest.mark.parametrize(
-    ("go2rtc_binary", "is_docker_env"),
-    [
-        ("/usr/bin/go2rtc", True),
-        (None, False),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-async def test_setup(
+@pytest.mark.usefixtures("init_test_integration")
+async def test_setup_go(
     hass: HomeAssistant,
-    issue_registry: ir.IssueRegistry,
-    rest_client: AsyncMock,
-    ws_client: Mock,
-    server: Mock,
-    init_test_integration: MockCamera,
-    mock_get_binary: Mock,
-    mock_is_docker_env: Mock,
-    has_go2rtc_entry: bool,
+    mock_client: AsyncMock,
+    mock_server: Mock,
 ) -> None:
     """Test the go2rtc config entry without binary."""
-    assert (len(hass.config_entries.async_entries(DOMAIN)) == 1) == has_go2rtc_entry
-
-    config = {DOMAIN: {CONF_URL: "http://localhost:1984/"}}
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        title=DOMAIN,
+        data={CONF_URL: "http://localhost:1984/"},
+    )
 
     def after_setup() -> None:
-        server.assert_not_called()
+        mock_server.assert_not_called()
 
-    await _test_setup_and_signaling(
-        hass,
-        issue_registry,
-        rest_client,
-        ws_client,
-        config,
-        after_setup,
-        init_test_integration,
-    )
+    await _test_setup(hass, mock_client, config_entry, after_setup)
 
-    mock_get_binary.assert_not_called()
-    server.assert_not_called()
-
-
-class Callbacks(NamedTuple):
-    """Callbacks for the test."""
-
-    on_message: Mock
-    send_message: Mock
-
-
-@pytest.fixture
-async def message_callbacks(
-    ws_client: Mock,
-    init_test_integration: MockCamera,
-) -> Callbacks:
-    """Prepare and return receive message callback."""
-    receive_callback = Mock(spec_set=WebRTCSendMessage)
-    camera = init_test_integration
-
-    await camera.async_handle_async_webrtc_offer(
-        OFFER_SDP, "session_id", receive_callback
-    )
-    ws_client.send.assert_called_once_with(
-        WebRTCOffer(
-            OFFER_SDP,
-            camera.async_get_webrtc_client_configuration().configuration.ice_servers,
-        )
-    )
-    ws_client.subscribe.assert_called_once()
-
-    # Simulate messages from the go2rtc server
-    send_callback = ws_client.subscribe.call_args[0][0]
-
-    return Callbacks(receive_callback, send_callback)
-
-
-@pytest.mark.parametrize(
-    ("message", "expected_message"),
-    [
-        (
-            WebRTCCandidate("candidate"),
-            HAWebRTCCandidate(RTCIceCandidate("candidate")),
-        ),
-        (
-            WebRTCAnswer(ANSWER_SDP),
-            HAWebRTCAnswer(ANSWER_SDP),
-        ),
-        (
-            WsError("error"),
-            WebRTCError("go2rtc_webrtc_offer_failed", "error"),
-        ),
-    ],
-)
-@pytest.mark.usefixtures("init_integration")
-async def test_receiving_messages_from_go2rtc_server(
-    message_callbacks: Callbacks,
-    message: ReceiveMessages,
-    expected_message: WebRTCMessage,
-) -> None:
-    """Test receiving message from go2rtc server."""
-    on_message, send_message = message_callbacks
-
-    send_message(message)
-    on_message.assert_called_once_with(expected_message)
-
-
-@pytest.mark.usefixtures("init_integration")
-async def test_on_candidate(
-    ws_client: Mock,
-    init_test_integration: MockCamera,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test frontend sending candidate to go2rtc server."""
-    camera = init_test_integration
-    session_id = "session_id"
-
-    # Session doesn't exist
-    await camera.async_on_webrtc_candidate(session_id, RTCIceCandidate("candidate"))
-    assert (
-        "homeassistant.components.go2rtc",
-        logging.DEBUG,
-        f"Unknown session {session_id}. Ignoring candidate",
-    ) in caplog.record_tuples
-    caplog.clear()
-
-    # Store session
-    await init_test_integration.async_handle_async_webrtc_offer(
-        OFFER_SDP, session_id, Mock()
-    )
-    ws_client.send.assert_called_once_with(
-        WebRTCOffer(
-            OFFER_SDP,
-            camera.async_get_webrtc_client_configuration().configuration.ice_servers,
-        )
-    )
-    ws_client.reset_mock()
-
-    await camera.async_on_webrtc_candidate(session_id, RTCIceCandidate("candidate"))
-    ws_client.send.assert_called_once_with(WebRTCCandidate("candidate"))
-    assert caplog.record_tuples == []
-
-
-@pytest.mark.usefixtures("init_integration")
-async def test_close_session(
-    ws_client: Mock,
-    init_test_integration: MockCamera,
-) -> None:
-    """Test closing session."""
-    camera = init_test_integration
-    session_id = "session_id"
-
-    # Session doesn't exist
-    with pytest.raises(KeyError):
-        camera.close_webrtc_session(session_id)
-    ws_client.close.assert_not_called()
-
-    # Store session
-    await init_test_integration.async_handle_async_webrtc_offer(
-        OFFER_SDP, session_id, Mock()
-    )
-    ws_client.send.assert_called_once_with(
-        WebRTCOffer(
-            OFFER_SDP,
-            camera.async_get_webrtc_client_configuration().configuration.ice_servers,
-        )
-    )
-
-    # Close session
-    camera.close_webrtc_session(session_id)
-    ws_client.close.assert_called_once()
-
-    # Close again should raise an error
-    ws_client.reset_mock()
-    with pytest.raises(KeyError):
-        camera.close_webrtc_session(session_id)
-    ws_client.close.assert_not_called()
-
-
-ERR_BINARY_NOT_FOUND = "Could not find go2rtc docker binary"
-ERR_CONNECT = "Could not connect to go2rtc instance"
-ERR_CONNECT_RETRY = (
-    "Could not connect to go2rtc instance on http://localhost:1984/; Retrying"
-)
-ERR_START_SERVER = "Could not start go2rtc server"
-ERR_UNSUPPORTED_VERSION = "The go2rtc server version is not supported"
-_INVALID_CONFIG = "Invalid config for 'go2rtc': "
-ERR_INVALID_URL = _INVALID_CONFIG + "invalid url"
-ERR_EXCLUSIVE = _INVALID_CONFIG + DEBUG_UI_URL_MESSAGE
-ERR_URL_REQUIRED = "Go2rtc URL required in non-docker installs"
-
-
-@pytest.mark.parametrize(
-    ("config", "go2rtc_binary", "is_docker_env"),
-    [
-        ({}, None, False),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-@pytest.mark.usefixtures(
-    "mock_get_binary", "mock_go2rtc_entry", "mock_is_docker_env", "server"
-)
-async def test_non_user_setup_with_error(
-    hass: HomeAssistant,
-    config: ConfigType,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test setup integration does not fail if not setup by user."""
-
-    assert await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert not hass.config_entries.async_entries(DOMAIN)
-
-
-@pytest.mark.parametrize(
-    ("config", "go2rtc_binary", "is_docker_env", "expected_log_message"),
-    [
-        ({DEFAULT_CONFIG_DOMAIN: {}}, None, True, ERR_BINARY_NOT_FOUND),
-        ({DEFAULT_CONFIG_DOMAIN: {}}, "/usr/bin/go2rtc", True, ERR_START_SERVER),
-        ({DOMAIN: {}}, None, False, ERR_URL_REQUIRED),
-        ({DOMAIN: {}}, None, True, ERR_BINARY_NOT_FOUND),
-        ({DOMAIN: {}}, "/usr/bin/go2rtc", True, ERR_START_SERVER),
-        ({DOMAIN: {CONF_URL: "invalid"}}, None, True, ERR_INVALID_URL),
-        (
-            {DOMAIN: {CONF_URL: "http://localhost:1984", CONF_DEBUG_UI: True}},
-            None,
-            True,
-            ERR_EXCLUSIVE,
-        ),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-@pytest.mark.usefixtures(
-    "mock_get_binary", "mock_go2rtc_entry", "mock_is_docker_env", "server"
-)
-async def test_setup_with_setup_error(
-    hass: HomeAssistant,
-    config: ConfigType,
-    caplog: pytest.LogCaptureFixture,
-    has_go2rtc_entry: bool,
-    expected_log_message: str,
-) -> None:
-    """Test setup integration fails."""
-
-    assert not await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    assert bool(hass.config_entries.async_entries(DOMAIN)) == has_go2rtc_entry
-    assert expected_log_message in caplog.text
-
-
-@pytest.mark.parametrize(
-    ("config", "go2rtc_binary", "is_docker_env", "expected_log_message"),
-    [
-        ({DOMAIN: {CONF_URL: "http://localhost:1984/"}}, None, True, ERR_CONNECT),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-@pytest.mark.usefixtures(
-    "mock_get_binary", "mock_go2rtc_entry", "mock_is_docker_env", "server"
-)
-async def test_setup_with_setup_entry_error(
-    hass: HomeAssistant,
-    config: ConfigType,
-    caplog: pytest.LogCaptureFixture,
-    expected_log_message: str,
-) -> None:
-    """Test setup integration entry fails."""
-
-    assert await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    config_entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(config_entries) == 1
-    assert config_entries[0].state == ConfigEntryState.SETUP_ERROR
-    assert expected_log_message in caplog.text
-
-
-@pytest.mark.parametrize("config", [{DOMAIN: {CONF_URL: "http://localhost:1984/"}}])
-@pytest.mark.parametrize(
-    ("cause", "expected_config_entry_state", "expected_log_message"),
-    [
-        (ClientConnectionError(), ConfigEntryState.SETUP_RETRY, ERR_CONNECT_RETRY),
-        (ServerConnectionError(), ConfigEntryState.SETUP_RETRY, ERR_CONNECT_RETRY),
-        (None, ConfigEntryState.SETUP_ERROR, ERR_CONNECT),
-        (Exception(), ConfigEntryState.SETUP_ERROR, ERR_CONNECT),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-@pytest.mark.usefixtures(
-    "mock_get_binary", "mock_go2rtc_entry", "mock_is_docker_env", "server"
-)
-async def test_setup_with_retryable_setup_entry_error_custom_server(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    rest_client: AsyncMock,
-    config: ConfigType,
-    cause: Exception,
-    expected_config_entry_state: ConfigEntryState,
-    expected_log_message: str,
-) -> None:
-    """Test setup integration entry fails."""
-    go2rtc_error = Go2RtcClientError()
-    go2rtc_error.__cause__ = cause
-    rest_client.validate_server_version.side_effect = go2rtc_error
-    assert await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    config_entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(config_entries) == 1
-    assert config_entries[0].state == expected_config_entry_state
-    assert expected_log_message in caplog.text
-
-
-@pytest.mark.parametrize("config", [{DOMAIN: {}}, {DEFAULT_CONFIG_DOMAIN: {}}])
-@pytest.mark.parametrize(
-    ("cause", "expected_config_entry_state", "expected_log_message"),
-    [
-        (ClientConnectionError(), ConfigEntryState.NOT_LOADED, ERR_START_SERVER),
-        (ServerConnectionError(), ConfigEntryState.NOT_LOADED, ERR_START_SERVER),
-        (None, ConfigEntryState.NOT_LOADED, ERR_START_SERVER),
-        (Exception(), ConfigEntryState.NOT_LOADED, ERR_START_SERVER),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-@pytest.mark.usefixtures(
-    "mock_get_binary", "mock_go2rtc_entry", "mock_is_docker_env", "server"
-)
-async def test_setup_with_retryable_setup_entry_error_default_server(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    rest_client: AsyncMock,
-    has_go2rtc_entry: bool,
-    config: ConfigType,
-    cause: Exception,
-    expected_config_entry_state: ConfigEntryState,
-    expected_log_message: str,
-) -> None:
-    """Test setup integration entry fails."""
-    go2rtc_error = Go2RtcClientError()
-    go2rtc_error.__cause__ = cause
-    rest_client.validate_server_version.side_effect = go2rtc_error
-    assert not await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    config_entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(config_entries) == has_go2rtc_entry
-    for config_entry in config_entries:
-        assert config_entry.state == expected_config_entry_state
-    assert expected_log_message in caplog.text
-
-
-@pytest.mark.parametrize("config", [{DOMAIN: {}}, {DEFAULT_CONFIG_DOMAIN: {}}])
-@pytest.mark.parametrize(
-    ("go2rtc_error", "expected_config_entry_state", "expected_log_message"),
-    [
-        (
-            Go2RtcVersionError("1.9.4", "1.9.5", "2.0.0"),
-            ConfigEntryState.SETUP_RETRY,
-            ERR_UNSUPPORTED_VERSION,
-        ),
-    ],
-)
-@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-@pytest.mark.usefixtures(
-    "mock_get_binary", "mock_go2rtc_entry", "mock_is_docker_env", "server"
-)
-async def test_setup_with_version_error(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    rest_client: AsyncMock,
-    config: ConfigType,
-    go2rtc_error: Exception,
-    expected_config_entry_state: ConfigEntryState,
-    expected_log_message: str,
-) -> None:
-    """Test setup integration entry fails."""
-    rest_client.validate_server_version.side_effect = [None, go2rtc_error]
-    assert await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-    config_entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(config_entries) == 1
-    assert config_entries[0].state == expected_config_entry_state
-    assert expected_log_message in caplog.text
-
-
-async def test_config_entry_remove(hass: HomeAssistant) -> None:
-    """Test config entry removed when neither default_config nor go2rtc is in config."""
-    config_entry = MockConfigEntry(domain=DOMAIN)
-    config_entry.add_to_hass(hass)
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
-    assert not await hass.config_entries.async_setup(config_entry.entry_id)
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 0
-
-
-@pytest.mark.parametrize("config", [{DOMAIN: {CONF_URL: "http://localhost:1984"}}])
-@pytest.mark.usefixtures("server")
-async def test_setup_with_recommended_version_repair(
-    hass: HomeAssistant,
-    issue_registry: ir.IssueRegistry,
-    rest_client: AsyncMock,
-    config: ConfigType,
-) -> None:
-    """Test setup integration entry fails."""
-    rest_client.validate_server_version.return_value = AwesomeVersion("1.9.5")
-    assert await async_setup_component(hass, DOMAIN, config)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    # Verify the issue is created
-    issue = issue_registry.async_get_issue(DOMAIN, "recommended_version")
-    assert issue
-    assert issue.is_fixable is False
-    assert issue.is_persistent is False
-    assert issue.severity == ir.IssueSeverity.WARNING
-    assert issue.issue_id == "recommended_version"
-    assert issue.translation_key == "recommended_version"
-    assert issue.translation_placeholders == {
-        "recommended_version": RECOMMENDED_VERSION,
-        "current_version": "1.9.5",
-    }
+    mock_server.assert_not_called()
diff --git a/tests/components/go2rtc/test_server.py b/tests/components/go2rtc/test_server.py
index e4fe3993f3c..b81c623722c 100644
--- a/tests/components/go2rtc/test_server.py
+++ b/tests/components/go2rtc/test_server.py
@@ -4,390 +4,106 @@ import asyncio
 from collections.abc import Generator
 import logging
 import subprocess
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import MagicMock, patch
 
 import pytest
 
 from homeassistant.components.go2rtc.server import Server
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 
 TEST_BINARY = "/bin/go2rtc"
 
 
 @pytest.fixture
-def enable_ui() -> bool:
-    """Fixture to enable the UI."""
-    return False
-
-
-@pytest.fixture
-def server(hass: HomeAssistant, enable_ui: bool) -> Server:
+def server(hass: HomeAssistant) -> Server:
     """Fixture to initialize the Server."""
-    return Server(hass, binary=TEST_BINARY, enable_ui=enable_ui)
+    return Server(hass, binary=TEST_BINARY)
 
 
 @pytest.fixture
-def mock_tempfile() -> Generator[Mock]:
+def mock_tempfile() -> Generator[MagicMock]:
     """Fixture to mock NamedTemporaryFile."""
     with patch(
-        "homeassistant.components.go2rtc.server.NamedTemporaryFile", autospec=True
+        "homeassistant.components.go2rtc.server.NamedTemporaryFile"
     ) as mock_tempfile:
-        file = mock_tempfile.return_value.__enter__.return_value
-        file.name = "test.yaml"
-        yield file
+        mock_tempfile.return_value.__enter__.return_value.name = "test.yaml"
+        yield mock_tempfile
 
 
-def _assert_server_output_logged(
-    server_stdout: list[str],
-    caplog: pytest.LogCaptureFixture,
-    loglevel: int,
-    expect_logged: bool,
-) -> None:
-    """Check server stdout was logged."""
-    for entry in server_stdout:
-        assert (
-            (
-                "homeassistant.components.go2rtc.server",
-                loglevel,
-                entry,
-            )
-            in caplog.record_tuples
-        ) is expect_logged
+@pytest.fixture
+def mock_process() -> Generator[MagicMock]:
+    """Fixture to mock subprocess.Popen."""
+    with patch(
+        "homeassistant.components.go2rtc.server.asyncio.create_subprocess_exec"
+    ) as mock_popen:
+        mock_popen.return_value.terminate = MagicMock()
+        mock_popen.return_value.kill = MagicMock()
+        mock_popen.return_value.returncode = None
+        yield mock_popen
 
 
-def assert_server_output_logged(
-    server_stdout: list[str],
-    caplog: pytest.LogCaptureFixture,
-    loglevel: int,
-) -> None:
-    """Check server stdout was logged."""
-    _assert_server_output_logged(server_stdout, caplog, loglevel, True)
-
-
-def assert_server_output_not_logged(
-    server_stdout: list[str],
-    caplog: pytest.LogCaptureFixture,
-    loglevel: int,
-) -> None:
-    """Check server stdout was logged."""
-    _assert_server_output_logged(server_stdout, caplog, loglevel, False)
-
-
-@pytest.mark.parametrize(
-    ("enable_ui", "api_ip"),
-    [
-        (True, ""),
-        (False, "127.0.0.1"),
-    ],
-)
+@pytest.mark.usefixtures("mock_tempfile")
 async def test_server_run_success(
-    mock_create_subprocess: AsyncMock,
-    rest_client: AsyncMock,
-    server_stdout: list[str],
+    mock_process: MagicMock,
     server: Server,
     caplog: pytest.LogCaptureFixture,
-    mock_tempfile: Mock,
-    api_ip: str,
 ) -> None:
     """Test that the server runs successfully."""
+    # Simulate process output
+    mock_process.return_value.stdout.__aiter__.return_value = iter(
+        [
+            b"log line 1\n",
+            b"log line 2\n",
+        ]
+    )
+
     await server.start()
 
     # Check that Popen was called with the right arguments
-    mock_create_subprocess.assert_called_once_with(
+    mock_process.assert_called_once_with(
         TEST_BINARY,
         "-c",
+        "webrtc.ice_servers=[]",
+        "-c",
         "test.yaml",
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
-        close_fds=False,
     )
 
-    # Verify that the config file was written
-    mock_tempfile.write.assert_called_once_with(
-        f"""# This file is managed by Home Assistant
-# Do not edit it manually
-
-api:
-  listen: "{api_ip}:11984"
-
-rtsp:
-  listen: "127.0.0.1:18554"
-
-webrtc:
-  listen: ":18555/tcp"
-  ice_servers: []
-""".encode()
-    )
-
-    # Verify go2rtc binary stdout was logged with debug level
-    assert_server_output_logged(server_stdout, caplog, logging.DEBUG)
+    # Check that server read the log lines
+    for entry in ("log line 1", "log line 2"):
+        assert (
+            "homeassistant.components.go2rtc.server",
+            logging.DEBUG,
+            entry,
+        ) in caplog.record_tuples
 
     await server.stop()
-    mock_create_subprocess.return_value.terminate.assert_called_once()
-
-    # Verify go2rtc binary stdout was not logged with warning level
-    assert_server_output_not_logged(server_stdout, caplog, logging.WARNING)
+    mock_process.return_value.terminate.assert_called_once()
 
 
 @pytest.mark.usefixtures("mock_tempfile")
-async def test_server_timeout_on_stop(
-    mock_create_subprocess: MagicMock, rest_client: AsyncMock, server: Server
+async def test_server_run_process_timeout(
+    mock_process: MagicMock, server: Server
 ) -> None:
     """Test server run where the process takes too long to terminate."""
-    # Start server thread
-    await server.start()
+    mock_process.return_value.stdout.__aiter__.return_value = iter(
+        [
+            b"log line 1\n",
+        ]
+    )
 
     async def sleep() -> None:
         await asyncio.sleep(1)
 
     # Simulate timeout
-    mock_create_subprocess.return_value.wait.side_effect = sleep
+    mock_process.return_value.wait.side_effect = sleep
 
     with patch("homeassistant.components.go2rtc.server._TERMINATE_TIMEOUT", new=0.1):
+        # Start server thread
+        await server.start()
         await server.stop()
 
     # Ensure terminate and kill were called due to timeout
-    mock_create_subprocess.return_value.terminate.assert_called_once()
-    mock_create_subprocess.return_value.kill.assert_called_once()
-
-
-@pytest.mark.parametrize(
-    "server_stdout",
-    [
-        [
-            "09:00:03.466 INF go2rtc platform=linux/amd64 revision=780f378 version=1.9.5",
-            "09:00:03.466 INF config path=/tmp/go2rtc.yaml",
-        ]
-    ],
-)
-@pytest.mark.usefixtures("mock_tempfile")
-async def test_server_failed_to_start(
-    mock_create_subprocess: MagicMock,
-    server_stdout: list[str],
-    server: Server,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test server, where an exception is raised if the expected log entry was not received until the timeout."""
-    with (
-        patch("homeassistant.components.go2rtc.server._SETUP_TIMEOUT", new=0.1),
-        pytest.raises(HomeAssistantError, match="Go2rtc server didn't start correctly"),
-    ):
-        await server.start()
-
-    # Verify go2rtc binary stdout was logged with debug and warning level
-    assert_server_output_logged(server_stdout, caplog, logging.DEBUG)
-    assert_server_output_logged(server_stdout, caplog, logging.WARNING)
-
-    assert (
-        "homeassistant.components.go2rtc.server",
-        logging.ERROR,
-        "Go2rtc server didn't start correctly",
-    ) in caplog.record_tuples
-
-    # Check that Popen was called with the right arguments
-    mock_create_subprocess.assert_called_once_with(
-        TEST_BINARY,
-        "-c",
-        "test.yaml",
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        close_fds=False,
-    )
-
-
-@pytest.mark.parametrize(
-    ("server_stdout", "expected_loglevel"),
-    [
-        (
-            [
-                "09:00:03.466 TRC [api] register path path=/",
-                "09:00:03.466 DBG build vcs.time=2024-10-28T19:47:55Z version=go1.23.2",
-                "09:00:03.466 INF go2rtc platform=linux/amd64 revision=780f378 version=1.9.5",
-                "09:00:03.467 INF [api] listen addr=127.0.0.1:1984",
-                "09:00:03.466 WRN warning message",
-                '09:00:03.466 ERR [api] listen error="listen tcp 127.0.0.1:11984: bind: address already in use"',
-                "09:00:03.466 FTL fatal message",
-                "09:00:03.466 PNC panic message",
-                "exit with signal: interrupt",  # Example of stderr write
-            ],
-            [
-                logging.DEBUG,
-                logging.DEBUG,
-                logging.DEBUG,
-                logging.DEBUG,
-                logging.WARNING,
-                logging.WARNING,
-                logging.ERROR,
-                logging.ERROR,
-                logging.WARNING,
-            ],
-        )
-    ],
-)
-@patch("homeassistant.components.go2rtc.server._RESPAWN_COOLDOWN", 0)
-async def test_log_level_mapping(
-    hass: HomeAssistant,
-    mock_create_subprocess: MagicMock,
-    server_stdout: list[str],
-    rest_client: AsyncMock,
-    server: Server,
-    caplog: pytest.LogCaptureFixture,
-    expected_loglevel: list[int],
-) -> None:
-    """Log level mapping."""
-    evt = asyncio.Event()
-
-    async def wait_event() -> None:
-        await evt.wait()
-
-    mock_create_subprocess.return_value.wait.side_effect = wait_event
-
-    await server.start()
-
-    await asyncio.sleep(0.1)
-    await hass.async_block_till_done()
-
-    # Verify go2rtc binary stdout was logged with default level
-    for i, entry in enumerate(server_stdout):
-        assert (
-            "homeassistant.components.go2rtc.server",
-            expected_loglevel[i],
-            entry,
-        ) in caplog.record_tuples
-
-    evt.set()
-    await asyncio.sleep(0.1)
-    await hass.async_block_till_done()
-
-    assert_server_output_logged(server_stdout, caplog, logging.WARNING)
-
-    await server.stop()
-
-
-@patch("homeassistant.components.go2rtc.server._RESPAWN_COOLDOWN", 0)
-async def test_server_restart_process_exit(
-    hass: HomeAssistant,
-    mock_create_subprocess: AsyncMock,
-    server_stdout: list[str],
-    rest_client: AsyncMock,
-    server: Server,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test that the server is restarted when it exits."""
-    evt = asyncio.Event()
-
-    async def wait_event() -> None:
-        await evt.wait()
-
-    mock_create_subprocess.return_value.wait.side_effect = wait_event
-
-    await server.start()
-    mock_create_subprocess.assert_awaited_once()
-    mock_create_subprocess.reset_mock()
-
-    await asyncio.sleep(0.1)
-    await hass.async_block_till_done()
-    mock_create_subprocess.assert_not_awaited()
-
-    # Verify go2rtc binary stdout was not yet logged with warning level
-    assert_server_output_not_logged(server_stdout, caplog, logging.WARNING)
-
-    evt.set()
-    await asyncio.sleep(0.1)
-    mock_create_subprocess.assert_awaited_once()
-
-    # Verify go2rtc binary stdout was logged with warning level
-    assert_server_output_logged(server_stdout, caplog, logging.WARNING)
-
-    await server.stop()
-
-
-@patch("homeassistant.components.go2rtc.server._RESPAWN_COOLDOWN", 0)
-async def test_server_restart_process_error(
-    hass: HomeAssistant,
-    mock_create_subprocess: AsyncMock,
-    server_stdout: list[str],
-    rest_client: AsyncMock,
-    server: Server,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test that the server is restarted on error."""
-    mock_create_subprocess.return_value.wait.side_effect = [Exception, None, None, None]
-
-    await server.start()
-    mock_create_subprocess.assert_awaited_once()
-    mock_create_subprocess.reset_mock()
-
-    # Verify go2rtc binary stdout was not yet logged with warning level
-    assert_server_output_not_logged(server_stdout, caplog, logging.WARNING)
-
-    await asyncio.sleep(0.1)
-    await hass.async_block_till_done()
-    mock_create_subprocess.assert_awaited_once()
-
-    # Verify go2rtc binary stdout was logged with warning level
-    assert_server_output_logged(server_stdout, caplog, logging.WARNING)
-
-    await server.stop()
-
-
-@patch("homeassistant.components.go2rtc.server._RESPAWN_COOLDOWN", 0)
-async def test_server_restart_api_error(
-    hass: HomeAssistant,
-    mock_create_subprocess: AsyncMock,
-    server_stdout: list[str],
-    rest_client: AsyncMock,
-    server: Server,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test that the server is restarted on error."""
-    rest_client.streams.list.side_effect = Exception
-
-    await server.start()
-    mock_create_subprocess.assert_awaited_once()
-    mock_create_subprocess.reset_mock()
-
-    # Verify go2rtc binary stdout was not yet logged with warning level
-    assert_server_output_not_logged(server_stdout, caplog, logging.WARNING)
-
-    await asyncio.sleep(0.1)
-    await hass.async_block_till_done()
-    mock_create_subprocess.assert_awaited_once()
-
-    # Verify go2rtc binary stdout was logged with warning level
-    assert_server_output_logged(server_stdout, caplog, logging.WARNING)
-
-    await server.stop()
-
-
-@patch("homeassistant.components.go2rtc.server._RESPAWN_COOLDOWN", 0)
-async def test_server_restart_error(
-    hass: HomeAssistant,
-    mock_create_subprocess: AsyncMock,
-    server_stdout: list[str],
-    rest_client: AsyncMock,
-    server: Server,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test error handling when exception is raised during restart."""
-    rest_client.streams.list.side_effect = Exception
-    mock_create_subprocess.return_value.terminate.side_effect = [Exception, None]
-
-    await server.start()
-    mock_create_subprocess.assert_awaited_once()
-    mock_create_subprocess.reset_mock()
-
-    # Verify go2rtc binary stdout was not yet logged with warning level
-    assert_server_output_not_logged(server_stdout, caplog, logging.WARNING)
-
-    await asyncio.sleep(0.1)
-    await hass.async_block_till_done()
-    mock_create_subprocess.assert_awaited_once()
-
-    # Verify go2rtc binary stdout was logged with warning level
-    assert_server_output_logged(server_stdout, caplog, logging.WARNING)
-
-    assert "Unexpected error when restarting go2rtc server" in caplog.text
-
-    await server.stop()
+    mock_process.return_value.terminate.assert_called_once()
+    mock_process.return_value.kill.assert_called_once()
diff --git a/tests/components/google/test_calendar.py b/tests/components/google/test_calendar.py
index 6ce95a2bc17..03b171c5e19 100644
--- a/tests/components/google/test_calendar.py
+++ b/tests/components/google/test_calendar.py
@@ -572,62 +572,6 @@ async def test_opaque_event(
     assert state.state == (STATE_ON if expect_visible_event else STATE_OFF)
 
 
-async def test_declined_event(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    mock_calendars_yaml,
-    mock_events_list_items,
-    component_setup,
-) -> None:
-    """Test querying the API and fetching events from the server."""
-    event = {
-        **TEST_EVENT,
-        **upcoming(),
-        "attendees": [
-            {
-                "self": "True",
-                "responseStatus": "declined",
-            }
-        ],
-    }
-    mock_events_list_items([event])
-    assert await component_setup()
-
-    client = await hass_client()
-    response = await client.get(upcoming_event_url(TEST_YAML_ENTITY))
-    assert response.status == HTTPStatus.OK
-    events = await response.json()
-    assert len(events) == 0
-
-
-async def test_attending_event(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    mock_calendars_yaml,
-    mock_events_list_items,
-    component_setup,
-) -> None:
-    """Test querying the API and fetching events from the server."""
-    event = {
-        **TEST_EVENT,
-        **upcoming(),
-        "attendees": [
-            {
-                "self": "True",
-                "responseStatus": "accepted",
-            }
-        ],
-    }
-    mock_events_list_items([event])
-    assert await component_setup()
-
-    client = await hass_client()
-    response = await client.get(upcoming_event_url(TEST_YAML_ENTITY))
-    assert response.status == HTTPStatus.OK
-    events = await response.json()
-    assert len(events) == 1
-
-
 @pytest.mark.parametrize("mock_test_setup", [None])
 async def test_scan_calendar_error(
     hass: HomeAssistant,
diff --git a/tests/components/google_assistant/test_helpers.py b/tests/components/google_assistant/test_helpers.py
index 0e6876cc901..8b46545d9c5 100644
--- a/tests/components/google_assistant/test_helpers.py
+++ b/tests/components/google_assistant/test_helpers.py
@@ -15,8 +15,8 @@ from homeassistant.components.google_assistant.const import (
     STORE_GOOGLE_LOCAL_WEBHOOK_ID,
 )
 from homeassistant.components.matter import MatterDeviceInfo
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant, State
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
diff --git a/tests/components/google_assistant/test_smart_home.py b/tests/components/google_assistant/test_smart_home.py
index f1b7108c348..cb1169c888c 100644
--- a/tests/components/google_assistant/test_smart_home.py
+++ b/tests/components/google_assistant/test_smart_home.py
@@ -32,6 +32,7 @@ from homeassistant.components.google_assistant import (
     smart_home as sh,
     trait,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     EVENT_CALL_SERVICE,
@@ -40,7 +41,6 @@ from homeassistant.const import (
     __version__,
 )
 from homeassistant.core import HomeAssistant, State
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import (
     area_registry as ar,
     device_registry as dr,
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index 1e42edf8e7b..d9378892fb2 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -33,10 +33,7 @@ from homeassistant.components import (
     valve,
     water_heater,
 )
-from homeassistant.components.alarm_control_panel import (
-    AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import AlarmControlPanelEntityFeature
 from homeassistant.components.camera import CameraEntityFeature
 from homeassistant.components.climate import ClimateEntityFeature
 from homeassistant.components.cover import CoverEntityFeature
@@ -54,6 +51,7 @@ from homeassistant.components.media_player import (
 from homeassistant.components.vacuum import VacuumEntityFeature
 from homeassistant.components.valve import ValveEntityFeature
 from homeassistant.components.water_heater import WaterHeaterEntityFeature
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
     ATTR_BATTERY_LEVEL,
@@ -65,6 +63,9 @@ from homeassistant.const import (
     EVENT_CALL_SERVICE,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
     STATE_IDLE,
     STATE_OFF,
     STATE_ON,
@@ -76,7 +77,6 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.util import color, dt as dt_util
 from homeassistant.util.unit_conversion import TemperatureConverter
 
@@ -1734,7 +1734,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.ARMED_AWAY,
+            STATE_ALARM_ARMED_AWAY,
             {
                 alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True,
                 ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_HOME
@@ -1765,12 +1765,11 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
 
     assert trt.query_attributes() == {
         "isArmed": True,
-        "currentArmLevel": AlarmControlPanelState.ARMED_AWAY,
+        "currentArmLevel": STATE_ALARM_ARMED_AWAY,
     }
 
     assert trt.can_execute(
-        trait.COMMAND_ARM_DISARM,
-        {"arm": True, "armLevel": AlarmControlPanelState.ARMED_AWAY},
+        trait.COMMAND_ARM_DISARM, {"arm": True, "armLevel": STATE_ALARM_ARMED_AWAY}
     )
 
     calls = async_mock_service(
@@ -1783,7 +1782,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.DISARMED,
+            STATE_ALARM_DISARMED,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True},
         ),
         BASIC_CONFIG,
@@ -1792,7 +1791,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         await trt.execute(
             trait.COMMAND_ARM_DISARM,
             BASIC_DATA,
-            {"arm": True, "armLevel": AlarmControlPanelState.ARMED_AWAY},
+            {"arm": True, "armLevel": STATE_ALARM_ARMED_AWAY},
             {},
         )
     assert len(calls) == 0
@@ -1802,7 +1801,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.DISARMED,
+            STATE_ALARM_DISARMED,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True},
         ),
         PIN_CONFIG,
@@ -1812,7 +1811,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         await trt.execute(
             trait.COMMAND_ARM_DISARM,
             PIN_DATA,
-            {"arm": True, "armLevel": AlarmControlPanelState.ARMED_AWAY},
+            {"arm": True, "armLevel": STATE_ALARM_ARMED_AWAY},
             {},
         )
     assert len(calls) == 0
@@ -1824,7 +1823,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         await trt.execute(
             trait.COMMAND_ARM_DISARM,
             PIN_DATA,
-            {"arm": True, "armLevel": AlarmControlPanelState.ARMED_AWAY},
+            {"arm": True, "armLevel": STATE_ALARM_ARMED_AWAY},
             {"pin": 9999},
         )
     assert len(calls) == 0
@@ -1835,7 +1834,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
     await trt.execute(
         trait.COMMAND_ARM_DISARM,
         PIN_DATA,
-        {"arm": True, "armLevel": AlarmControlPanelState.ARMED_AWAY},
+        {"arm": True, "armLevel": STATE_ALARM_ARMED_AWAY},
         {"pin": "1234"},
     )
 
@@ -1846,7 +1845,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.ARMED_AWAY,
+            STATE_ALARM_ARMED_AWAY,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True},
         ),
         PIN_CONFIG,
@@ -1855,7 +1854,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         await trt.execute(
             trait.COMMAND_ARM_DISARM,
             PIN_DATA,
-            {"arm": True, "armLevel": AlarmControlPanelState.ARMED_AWAY},
+            {"arm": True, "armLevel": STATE_ALARM_ARMED_AWAY},
             {},
         )
     assert len(calls) == 1
@@ -1866,7 +1865,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.DISARMED,
+            STATE_ALARM_DISARMED,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: False},
         ),
         PIN_CONFIG,
@@ -1874,7 +1873,7 @@ async def test_arm_disarm_arm_away(hass: HomeAssistant) -> None:
     await trt.execute(
         trait.COMMAND_ARM_DISARM,
         PIN_DATA,
-        {"arm": True, "armLevel": AlarmControlPanelState.ARMED_AWAY},
+        {"arm": True, "armLevel": STATE_ALARM_ARMED_AWAY},
         {},
     )
     assert len(calls) == 2
@@ -1898,7 +1897,7 @@ async def test_arm_disarm_disarm(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.DISARMED,
+            STATE_ALARM_DISARMED,
             {
                 alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True,
                 ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.TRIGGER
@@ -1954,7 +1953,7 @@ async def test_arm_disarm_disarm(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.ARMED_AWAY,
+            STATE_ALARM_ARMED_AWAY,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True},
         ),
         BASIC_CONFIG,
@@ -1969,7 +1968,7 @@ async def test_arm_disarm_disarm(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.ARMED_AWAY,
+            STATE_ALARM_ARMED_AWAY,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True},
         ),
         PIN_CONFIG,
@@ -2003,7 +2002,7 @@ async def test_arm_disarm_disarm(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.DISARMED,
+            STATE_ALARM_DISARMED,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: True},
         ),
         PIN_CONFIG,
@@ -2017,7 +2016,7 @@ async def test_arm_disarm_disarm(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.ARMED_AWAY,
+            STATE_ALARM_ARMED_AWAY,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: False},
         ),
         PIN_CONFIG,
@@ -2037,7 +2036,7 @@ async def test_arm_disarm_disarm(hass: HomeAssistant) -> None:
         hass,
         State(
             "alarm_control_panel.alarm",
-            AlarmControlPanelState.PENDING,
+            STATE_ALARM_PENDING,
             {alarm_control_panel.ATTR_CODE_ARM_REQUIRED: False},
         ),
         PIN_CONFIG,
@@ -4069,90 +4068,3 @@ async def test_sensorstate(
         )
         is False
     )
-
-
-@pytest.mark.parametrize(
-    ("state", "identifier"),
-    [
-        (STATE_ON, 0),
-        (STATE_OFF, 1),
-        (STATE_UNKNOWN, 2),
-    ],
-)
-@pytest.mark.parametrize(
-    ("device_class", "name", "states"),
-    [
-        (
-            binary_sensor.BinarySensorDeviceClass.CO,
-            "CarbonMonoxideLevel",
-            ["carbon monoxide detected", "no carbon monoxide detected", "unknown"],
-        ),
-        (
-            binary_sensor.BinarySensorDeviceClass.SMOKE,
-            "SmokeLevel",
-            ["smoke detected", "no smoke detected", "unknown"],
-        ),
-        (
-            binary_sensor.BinarySensorDeviceClass.MOISTURE,
-            "WaterLeak",
-            ["leak", "no leak", "unknown"],
-        ),
-    ],
-)
-async def test_binary_sensorstate(
-    hass: HomeAssistant,
-    state: str,
-    identifier: int,
-    device_class: binary_sensor.BinarySensorDeviceClass,
-    name: str,
-    states: list[str],
-) -> None:
-    """Test SensorState trait support for binary sensor domain."""
-
-    assert helpers.get_google_type(binary_sensor.DOMAIN, None) is not None
-    assert trait.SensorStateTrait.supported(
-        binary_sensor.DOMAIN, None, device_class, None
-    )
-
-    trt = trait.SensorStateTrait(
-        hass,
-        State(
-            "binary_sensor.test",
-            state,
-            {
-                "device_class": device_class,
-            },
-        ),
-        BASIC_CONFIG,
-    )
-
-    assert trt.sync_attributes() == {
-        "sensorStatesSupported": [
-            {
-                "name": name,
-                "descriptiveCapabilities": {
-                    "availableStates": states,
-                },
-            }
-        ]
-    }
-    assert trt.query_attributes() == {
-        "currentSensorStateData": [
-            {
-                "name": name,
-                "currentSensorState": states[identifier],
-                "rawValue": None,
-            },
-        ]
-    }
-
-    assert helpers.get_google_type(binary_sensor.DOMAIN, None) is not None
-    assert (
-        trait.SensorStateTrait.supported(
-            binary_sensor.DOMAIN,
-            None,
-            binary_sensor.BinarySensorDeviceClass.TAMPER,
-            None,
-        )
-        is False
-    )
diff --git a/tests/components/google_translate/test_tts.py b/tests/components/google_translate/test_tts.py
index 5b691da4bdc..1f199a5db97 100644
--- a/tests/components/google_translate/test_tts.py
+++ b/tests/components/google_translate/test_tts.py
@@ -14,9 +14,9 @@ import pytest
 from homeassistant.components import tts
 from homeassistant.components.google_translate.const import CONF_TLD, DOMAIN
 from homeassistant.components.media_player import ATTR_MEDIA_CONTENT_ID
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/gpslogger/test_init.py b/tests/components/gpslogger/test_init.py
index aff8b20dc52..fab6aaa4e84 100644
--- a/tests/components/gpslogger/test_init.py
+++ b/tests/components/gpslogger/test_init.py
@@ -11,9 +11,9 @@ from homeassistant.components import gpslogger, zone
 from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
 from homeassistant.components.device_tracker.legacy import Device
 from homeassistant.components.gpslogger import DOMAIN, TRACKER_UPDATE
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import DATA_DISPATCHER
diff --git a/tests/components/group/test_sensor.py b/tests/components/group/test_sensor.py
index de406cb251c..db642506361 100644
--- a/tests/components/group/test_sensor.py
+++ b/tests/components/group/test_sensor.py
@@ -32,7 +32,6 @@ from homeassistant.const import (
     SERVICE_RELOAD,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
-    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
@@ -497,7 +496,7 @@ async def test_sensor_with_uoms_but_no_device_class(
     state = hass.states.get("sensor.test_sum")
     assert state.attributes.get("device_class") is None
     assert state.attributes.get("state_class") is None
-    assert state.attributes.get("unit_of_measurement") is None
+    assert state.attributes.get("unit_of_measurement") == "W"
     assert state.state == STATE_UNKNOWN
 
     assert (
@@ -651,10 +650,10 @@ async def test_sensor_calculated_result_fails_on_uom(hass: HomeAssistant) -> Non
     await hass.async_block_till_done()
 
     state = hass.states.get("sensor.test_sum")
-    assert state.state == STATE_UNAVAILABLE
+    assert state.state == STATE_UNKNOWN
     assert state.attributes.get("device_class") == "energy"
     assert state.attributes.get("state_class") == "total"
-    assert state.attributes.get("unit_of_measurement") is None
+    assert state.attributes.get("unit_of_measurement") == "kWh"
 
 
 async def test_sensor_calculated_properties_not_convertible_device_class(
@@ -731,7 +730,7 @@ async def test_sensor_calculated_properties_not_convertible_device_class(
     assert state.state == STATE_UNKNOWN
     assert state.attributes.get("device_class") == "humidity"
     assert state.attributes.get("state_class") == "measurement"
-    assert state.attributes.get("unit_of_measurement") is None
+    assert state.attributes.get("unit_of_measurement") == "%"
 
     assert (
         "Unable to use state. Only entities with correct unit of measurement is"
@@ -813,197 +812,3 @@ async def test_sensors_attributes_added_when_entity_info_available(
     assert state.attributes.get(ATTR_ICON) is None
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "L"
-
-
-async def test_sensor_state_class_no_uom_not_available(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test when input sensors drops unit of measurement."""
-
-    # If we have a valid unit of measurement from all input sensors
-    # the group sensor will go unknown in the case any input sensor
-    # drops the unit of measurement and log a warning.
-
-    config = {
-        SENSOR_DOMAIN: {
-            "platform": GROUP_DOMAIN,
-            "name": "test_sum",
-            "type": "sum",
-            "entities": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            "unique_id": "very_unique_id_sum_sensor",
-        }
-    }
-
-    entity_ids = config["sensor"]["entities"]
-
-    input_attributes = {
-        "state_class": SensorStateClass.MEASUREMENT,
-        "unit_of_measurement": PERCENTAGE,
-    }
-
-    hass.states.async_set(entity_ids[0], VALUES[0], input_attributes)
-    hass.states.async_set(entity_ids[1], VALUES[1], input_attributes)
-    hass.states.async_set(entity_ids[2], VALUES[2], input_attributes)
-    await hass.async_block_till_done()
-
-    assert await async_setup_component(hass, "sensor", config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test_sum")
-    assert state.state == str(sum(VALUES))
-    assert state.attributes.get("state_class") == "measurement"
-    assert state.attributes.get("unit_of_measurement") == "%"
-
-    assert (
-        "Unable to use state. Only entities with correct unit of measurement is"
-        " supported"
-    ) not in caplog.text
-
-    # sensor.test_3 drops the unit of measurement
-    hass.states.async_set(
-        entity_ids[2],
-        VALUES[2],
-        {
-            "state_class": SensorStateClass.MEASUREMENT,
-        },
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test_sum")
-    assert state.state == STATE_UNKNOWN
-    assert state.attributes.get("state_class") == "measurement"
-    assert state.attributes.get("unit_of_measurement") is None
-
-    assert (
-        "Unable to use state. Only entities with correct unit of measurement is"
-        " supported, entity sensor.test_3, value 15.3 with"
-        " device class None and unit of measurement None excluded from calculation"
-        " in sensor.test_sum"
-    ) in caplog.text
-
-
-async def test_sensor_different_attributes_ignore_non_numeric(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the sensor handles calculating attributes when using ignore_non_numeric."""
-    config = {
-        SENSOR_DOMAIN: {
-            "platform": GROUP_DOMAIN,
-            "name": "test_sum",
-            "type": "sum",
-            "ignore_non_numeric": True,
-            "entities": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            "unique_id": "very_unique_id_sum_sensor",
-        }
-    }
-
-    entity_ids = config["sensor"]["entities"]
-
-    assert await async_setup_component(hass, "sensor", config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test_sum")
-    assert state.state == STATE_UNAVAILABLE
-    assert state.attributes.get("state_class") is None
-    assert state.attributes.get("device_class") is None
-    assert state.attributes.get("unit_of_measurement") is None
-
-    test_cases = [
-        {
-            "entity": entity_ids[0],
-            "value": VALUES[0],
-            "attributes": {
-                "state_class": SensorStateClass.MEASUREMENT,
-                "unit_of_measurement": PERCENTAGE,
-            },
-            "expected_state": str(float(VALUES[0])),
-            "expected_state_class": SensorStateClass.MEASUREMENT,
-            "expected_device_class": None,
-            "expected_unit_of_measurement": PERCENTAGE,
-        },
-        {
-            "entity": entity_ids[1],
-            "value": VALUES[1],
-            "attributes": {
-                "state_class": SensorStateClass.MEASUREMENT,
-                "device_class": SensorDeviceClass.HUMIDITY,
-                "unit_of_measurement": PERCENTAGE,
-            },
-            "expected_state": str(float(sum([VALUES[0], VALUES[1]]))),
-            "expected_state_class": SensorStateClass.MEASUREMENT,
-            "expected_device_class": None,
-            "expected_unit_of_measurement": PERCENTAGE,
-        },
-        {
-            "entity": entity_ids[2],
-            "value": VALUES[2],
-            "attributes": {
-                "state_class": SensorStateClass.MEASUREMENT,
-                "device_class": SensorDeviceClass.TEMPERATURE,
-                "unit_of_measurement": UnitOfTemperature.CELSIUS,
-            },
-            "expected_state": str(float(sum(VALUES))),
-            "expected_state_class": SensorStateClass.MEASUREMENT,
-            "expected_device_class": None,
-            "expected_unit_of_measurement": None,
-        },
-        {
-            "entity": entity_ids[2],
-            "value": VALUES[2],
-            "attributes": {
-                "state_class": SensorStateClass.MEASUREMENT,
-                "device_class": SensorDeviceClass.HUMIDITY,
-                "unit_of_measurement": PERCENTAGE,
-            },
-            "expected_state": str(float(sum(VALUES))),
-            "expected_state_class": SensorStateClass.MEASUREMENT,
-            # One sensor does not have a device class
-            "expected_device_class": None,
-            "expected_unit_of_measurement": PERCENTAGE,
-        },
-        {
-            "entity": entity_ids[0],
-            "value": VALUES[0],
-            "attributes": {
-                "state_class": SensorStateClass.MEASUREMENT,
-                "device_class": SensorDeviceClass.HUMIDITY,
-                "unit_of_measurement": PERCENTAGE,
-            },
-            "expected_state": str(float(sum(VALUES))),
-            "expected_state_class": SensorStateClass.MEASUREMENT,
-            # First sensor now has a device class
-            "expected_device_class": SensorDeviceClass.HUMIDITY,
-            "expected_unit_of_measurement": PERCENTAGE,
-        },
-        {
-            "entity": entity_ids[0],
-            "value": VALUES[0],
-            "attributes": {
-                "state_class": SensorStateClass.MEASUREMENT,
-            },
-            "expected_state": str(float(sum(VALUES))),
-            "expected_state_class": SensorStateClass.MEASUREMENT,
-            "expected_device_class": None,
-            "expected_unit_of_measurement": None,
-        },
-    ]
-
-    for test_case in test_cases:
-        hass.states.async_set(
-            test_case["entity"],
-            test_case["value"],
-            test_case["attributes"],
-        )
-        await hass.async_block_till_done()
-        state = hass.states.get("sensor.test_sum")
-        assert state.state == test_case["expected_state"]
-        assert state.attributes.get("state_class") == test_case["expected_state_class"]
-        assert (
-            state.attributes.get("device_class") == test_case["expected_device_class"]
-        )
-        assert (
-            state.attributes.get("unit_of_measurement")
-            == test_case["expected_unit_of_measurement"]
-        )
diff --git a/tests/components/habitica/conftest.py b/tests/components/habitica/conftest.py
index 8d729f4358f..c994b7e3b0b 100644
--- a/tests/components/habitica/conftest.py
+++ b/tests/components/habitica/conftest.py
@@ -3,11 +3,9 @@
 from unittest.mock import patch
 
 import pytest
-from yarl import URL
 
 from homeassistant.components.habitica.const import CONF_API_USER, DEFAULT_URL, DOMAIN
 from homeassistant.const import CONF_API_KEY, CONF_URL
-from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry, load_json_object_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
@@ -23,23 +21,6 @@ def disable_plumbum():
         yield
 
 
-def mock_called_with(
-    mock_client: AiohttpClientMocker,
-    method: str,
-    url: str,
-) -> tuple | None:
-    """Assert request mock was called with json data."""
-
-    return next(
-        (
-            call
-            for call in mock_client.mock_calls
-            if call[0].upper() == method.upper() and call[1] == URL(url)
-        ),
-        None,
-    )
-
-
 @pytest.fixture
 def mock_habitica(aioclient_mock: AiohttpClientMocker) -> AiohttpClientMocker:
     """Mock aiohttp requests."""
@@ -56,11 +37,6 @@ def mock_habitica(aioclient_mock: AiohttpClientMocker) -> AiohttpClientMocker:
         f"{DEFAULT_URL}/api/v3/tasks/user",
         json=load_json_object_fixture("tasks.json", DOMAIN),
     )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/content",
-        params={"language": "en"},
-        json=load_json_object_fixture("content.json", DOMAIN),
-    )
 
     return aioclient_mock
 
@@ -78,9 +54,3 @@ def mock_config_entry() -> MockConfigEntry:
         },
         unique_id="00000000-0000-0000-0000-000000000000",
     )
-
-
-@pytest.fixture
-async def set_tz(hass: HomeAssistant) -> None:
-    """Fixture to set timezone."""
-    await hass.config.async_set_time_zone("Europe/Berlin")
diff --git a/tests/components/habitica/fixtures/common_buttons_unavailable.json b/tests/components/habitica/fixtures/common_buttons_unavailable.json
deleted file mode 100644
index efee5364e02..00000000000
--- a/tests/components/habitica/fixtures/common_buttons_unavailable.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 0,
-        "int": 0,
-        "per": 0,
-        "con": 0,
-        "stealth": 0,
-        "streaks": true,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 50,
-      "exp": 737,
-      "gp": 0,
-      "lvl": 5,
-      "class": "wizard",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 0
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": false,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": false,
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_warrior_5",
-          "armor": "armor_warrior_5",
-          "head": "head_warrior_5",
-          "shield": "shield_warrior_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/content.json b/tests/components/habitica/fixtures/content.json
deleted file mode 100644
index e8e14dead73..00000000000
--- a/tests/components/habitica/fixtures/content.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
-  "success": true,
-  "data": {
-    "gear": {
-      "flat": {
-        "weapon_warrior_5": {
-          "text": "Ruby Sword",
-          "notes": "Weapon whose forge-glow never fades. Increases Strength by 15. ",
-          "str": 15,
-          "value": 90,
-          "type": "weapon",
-          "key": "weapon_warrior_5",
-          "set": "warrior-5",
-          "klass": "warrior",
-          "index": "5",
-          "int": 0,
-          "per": 0,
-          "con": 0
-        },
-        "armor_warrior_5": {
-          "text": "Golden Armor",
-          "notes": "Looks ceremonial, but no known blade can pierce it. Increases Constitution by 11.",
-          "con": 11,
-          "value": 120,
-          "last": true,
-          "type": "armor",
-          "key": "armor_warrior_5",
-          "set": "warrior-5",
-          "klass": "warrior",
-          "index": "5",
-          "str": 0,
-          "int": 0,
-          "per": 0
-        },
-        "head_warrior_5": {
-          "text": "Golden Helm",
-          "notes": "Regal crown bound to shining armor. Increases Strength by 12.",
-          "str": 12,
-          "value": 80,
-          "last": true,
-          "type": "head",
-          "key": "head_warrior_5",
-          "set": "warrior-5",
-          "klass": "warrior",
-          "index": "5",
-          "int": 0,
-          "per": 0,
-          "con": 0
-        },
-        "shield_warrior_5": {
-          "text": "Golden Shield",
-          "notes": "Shining badge of the vanguard. Increases Constitution by 9.",
-          "con": 9,
-          "value": 90,
-          "last": true,
-          "type": "shield",
-          "key": "shield_warrior_5",
-          "set": "warrior-5",
-          "klass": "warrior",
-          "index": "5",
-          "str": 0,
-          "int": 0,
-          "per": 0
-        },
-        "weapon_wizard_5": {
-          "twoHanded": true,
-          "text": "Archmage Staff",
-          "notes": "Assists in weaving the most complex of spells. Increases Intelligence by 15 and Perception by 7. Two-handed item.",
-          "int": 15,
-          "per": 7,
-          "value": 160,
-          "type": "weapon",
-          "key": "weapon_wizard_5",
-          "set": "wizard-5",
-          "klass": "wizard",
-          "index": "5",
-          "str": 0,
-          "con": 0
-        },
-        "armor_wizard_5": {
-          "text": "Royal Magus Robe",
-          "notes": "Symbol of the power behind the throne. Increases Intelligence by 12.",
-          "int": 12,
-          "value": 120,
-          "last": true,
-          "type": "armor",
-          "key": "armor_wizard_5",
-          "set": "wizard-5",
-          "klass": "wizard",
-          "index": "5",
-          "str": 0,
-          "per": 0,
-          "con": 0
-        },
-        "head_wizard_5": {
-          "text": "Royal Magus Hat",
-          "notes": "Shows authority over fortune, weather, and lesser mages. Increases Perception by 10.",
-          "per": 10,
-          "value": 80,
-          "last": true,
-          "type": "head",
-          "key": "head_wizard_5",
-          "set": "wizard-5",
-          "klass": "wizard",
-          "index": "5",
-          "str": 0,
-          "int": 0,
-          "con": 0
-        },
-        "weapon_healer_5": {
-          "text": "Royal Scepter",
-          "notes": "Fit to grace the hand of a monarch, or of one who stands at a monarch's right hand. Increases Intelligence by 9. ",
-          "int": 9,
-          "value": 90,
-          "type": "weapon",
-          "key": "weapon_healer_5",
-          "set": "healer-5",
-          "klass": "healer",
-          "index": "5",
-          "str": 0,
-          "per": 0,
-          "con": 0
-        },
-        "armor_healer_5": {
-          "text": "Royal Mantle",
-          "notes": "Attire of those who have saved the lives of kings. Increases Constitution by 18.",
-          "con": 18,
-          "value": 120,
-          "last": true,
-          "type": "armor",
-          "key": "armor_healer_5",
-          "set": "healer-5",
-          "klass": "healer",
-          "index": "5",
-          "str": 0,
-          "int": 0,
-          "per": 0
-        },
-        "head_healer_5": {
-          "text": "Royal Diadem",
-          "notes": "For king, queen, or miracle-worker. Increases Intelligence by 9.",
-          "int": 9,
-          "value": 80,
-          "last": true,
-          "type": "head",
-          "key": "head_healer_5",
-          "set": "healer-5",
-          "klass": "healer",
-          "index": "5",
-          "str": 0,
-          "per": 0,
-          "con": 0
-        },
-        "shield_healer_5": {
-          "text": "Royal Shield",
-          "notes": "Bestowed upon those most dedicated to the kingdom's defense. Increases Constitution by 12.",
-          "con": 12,
-          "value": 90,
-          "last": true,
-          "type": "shield",
-          "key": "shield_healer_5",
-          "set": "healer-5",
-          "klass": "healer",
-          "index": "5",
-          "str": 0,
-          "int": 0,
-          "per": 0
-        },
-        "weapon_rogue_5": {
-          "text": "Ninja-to",
-          "notes": "Sleek and deadly as the ninja themselves. Increases Strength by 8. ",
-          "str": 8,
-          "value": 90,
-          "type": "weapon",
-          "key": "weapon_rogue_5",
-          "set": "rogue-5",
-          "klass": "rogue",
-          "index": "5",
-          "int": 0,
-          "per": 0,
-          "con": 0
-        },
-        "armor_rogue_5": {
-          "text": "Umbral Armor",
-          "notes": "Allows stealth in the open in broad daylight. Increases Perception by 18.",
-          "per": 18,
-          "value": 120,
-          "last": true,
-          "type": "armor",
-          "key": "armor_rogue_5",
-          "set": "rogue-5",
-          "klass": "rogue",
-          "index": "5",
-          "str": 0,
-          "int": 0,
-          "con": 0
-        },
-        "head_rogue_5": {
-          "text": "Umbral Hood",
-          "notes": "Conceals even thoughts from those who would probe them. Increases Perception by 12.",
-          "per": 12,
-          "value": 80,
-          "last": true,
-          "type": "head",
-          "key": "head_rogue_5",
-          "set": "rogue-5",
-          "klass": "rogue",
-          "index": "5",
-          "str": 0,
-          "int": 0,
-          "con": 0
-        },
-        "shield_rogue_5": {
-          "text": "Ninja-to",
-          "notes": "Sleek and deadly as the ninja themselves. Increases Strength by 8. ",
-          "str": 8,
-          "value": 90,
-          "type": "shield",
-          "key": "shield_rogue_5",
-          "set": "rogue-5",
-          "klass": "rogue",
-          "index": "5",
-          "int": 0,
-          "per": 0,
-          "con": 0
-        },
-        "back_special_heroicAureole": {
-          "text": "Heroic Aureole",
-          "notes": "The gems on this aureole glimmer when you tell your tales of glory. Increases all stats by 7.",
-          "con": 7,
-          "str": 7,
-          "per": 7,
-          "int": 7,
-          "value": 175,
-          "type": "back",
-          "key": "back_special_heroicAureole",
-          "set": "special-heroicAureole",
-          "klass": "special",
-          "index": "heroicAureole"
-        },
-        "headAccessory_armoire_gogglesOfBookbinding": {
-          "per": 8,
-          "set": "bookbinder",
-          "notes": "These goggles will help you zero in on any task, large or small! Increases Perception by 8. Enchanted Armoire: Bookbinder Set (Item 1 of 4).",
-          "text": "Goggles of Bookbinding",
-          "value": 100,
-          "type": "headAccessory",
-          "key": "headAccessory_armoire_gogglesOfBookbinding",
-          "klass": "armoire",
-          "index": "gogglesOfBookbinding",
-          "str": 0,
-          "int": 0,
-          "con": 0
-        },
-        "eyewear_armoire_plagueDoctorMask": {
-          "con": 5,
-          "int": 5,
-          "set": "plagueDoctor",
-          "notes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Increases Constitution and Intelligence by 5 each. Enchanted Armoire: Plague Doctor Set (Item 2 of 3).",
-          "text": "Plague Doctor Mask",
-          "value": 100,
-          "type": "eyewear",
-          "key": "eyewear_armoire_plagueDoctorMask",
-          "klass": "armoire",
-          "index": "plagueDoctorMask",
-          "str": 0,
-          "per": 0
-        },
-        "body_special_aetherAmulet": {
-          "text": "Aether Amulet",
-          "notes": "This amulet has a mysterious history. Increases Constitution and Strength by 10 each.",
-          "value": 175,
-          "str": 10,
-          "con": 10,
-          "type": "body",
-          "key": "body_special_aetherAmulet",
-          "set": "special-aetherAmulet",
-          "klass": "special",
-          "index": "aetherAmulet",
-          "int": 0,
-          "per": 0
-        }
-      }
-    }
-  },
-  "appVersion": "5.29.2"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_1.json b/tests/components/habitica/fixtures/duedate_fixture_1.json
deleted file mode 100644
index d44d5f38498..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_1.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "daily",
-      "everyX": 1,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": ["2024-09-22T22:00:00.000Z", "2024-09-23T22:00:00.000Z"],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-07-06T22:00:00.000Z",
-      "daysOfMonth": [],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": true,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_2.json b/tests/components/habitica/fixtures/duedate_fixture_2.json
deleted file mode 100644
index 99cf4e89454..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_2.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "daily",
-      "everyX": 1,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": ["2024-09-22T22:00:00.000Z", "2024-09-23T22:00:00.000Z"],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-09-23T22:00:00.000Z",
-      "daysOfMonth": [],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": false,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_3.json b/tests/components/habitica/fixtures/duedate_fixture_3.json
deleted file mode 100644
index 78b66ad6643..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_3.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "monthly",
-      "everyX": 1,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": ["2024-10-22T22:00:00.000Z", "2024-11-22T22:00:00.000Z"],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-10-22T22:00:00.000Z",
-      "daysOfMonth": [23],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": false,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_4.json b/tests/components/habitica/fixtures/duedate_fixture_4.json
deleted file mode 100644
index 7e14e3339e2..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_4.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "yearly",
-      "everyX": 1,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": ["2024-10-22T22:00:00.000Z", "2025-10-22T22:00:00.000Z"],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-10-22T22:00:00.000Z",
-      "daysOfMonth": [22],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": false,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_5.json b/tests/components/habitica/fixtures/duedate_fixture_5.json
deleted file mode 100644
index d8d5f4cd773..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_5.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "weekly",
-      "everyX": 1,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": ["2024-09-20T22:00:00.000Z", "2024-09-27T22:00:00.000Z"],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-09-25T22:00:00.000Z",
-      "daysOfMonth": [],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": false,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_6.json b/tests/components/habitica/fixtures/duedate_fixture_6.json
deleted file mode 100644
index dce177b1abc..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_6.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "monthly",
-      "everyX": 1,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": ["2024-09-20T22:00:00.000Z", "2024-10-20T22:00:00.000Z"],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-09-25T22:00:00.000Z",
-      "daysOfMonth": [],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": false,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_7.json b/tests/components/habitica/fixtures/duedate_fixture_7.json
deleted file mode 100644
index 723ee40062d..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_7.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "monthly",
-      "everyX": 0,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": ["2024-09-22T22:00:00.000Z", "2024-09-23T22:00:00.000Z"],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-09-23T22:00:00.000Z",
-      "daysOfMonth": [],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": false,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/duedate_fixture_8.json b/tests/components/habitica/fixtures/duedate_fixture_8.json
deleted file mode 100644
index 21a40a0a649..00000000000
--- a/tests/components/habitica/fixtures/duedate_fixture_8.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "success": true,
-  "data": [
-    {
-      "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-      "frequency": "daily",
-      "everyX": 1,
-      "repeat": {
-        "m": true,
-        "t": true,
-        "w": true,
-        "th": true,
-        "f": true,
-        "s": true,
-        "su": true
-      },
-      "streak": 1,
-      "nextDue": [],
-      "yesterDaily": true,
-      "history": [],
-      "completed": false,
-      "collapseChecklist": false,
-      "type": "daily",
-      "text": "Zahnseide benutzen",
-      "notes": "Klicke um Änderungen zu machen!",
-      "tags": [],
-      "value": -2.9663035443712333,
-      "priority": 1,
-      "attribute": "str",
-      "challenge": {},
-      "group": {
-        "completedBy": {},
-        "assignedUsers": []
-      },
-      "byHabitica": false,
-      "startDate": "2024-09-23T22:00:00.000Z",
-      "daysOfMonth": [],
-      "weeksOfMonth": [],
-      "checklist": [],
-      "reminders": [],
-      "createdAt": "2024-07-07T17:51:53.268Z",
-      "updatedAt": "2024-09-21T22:24:20.154Z",
-      "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "isDue": false,
-      "id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"
-    }
-  ],
-  "notifications": [],
-  "userV": 589,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/healer_fixture.json b/tests/components/habitica/fixtures/healer_fixture.json
deleted file mode 100644
index 85f719f4ca7..00000000000
--- a/tests/components/habitica/fixtures/healer_fixture.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 45,
-      "mp": 50.89999999999998,
-      "exp": 737,
-      "gp": 137.62587214609795,
-      "lvl": 38,
-      "class": "healer",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 5,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": true,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": true,
-    "lastCron": "2024-09-21T22:01:55.586Z",
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_healer_5",
-          "armor": "armor_healer_5",
-          "head": "head_healer_5",
-          "shield": "shield_healer_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/healer_skills_unavailable.json b/tests/components/habitica/fixtures/healer_skills_unavailable.json
deleted file mode 100644
index a6bff246b2a..00000000000
--- a/tests/components/habitica/fixtures/healer_skills_unavailable.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 10,
-      "exp": 737,
-      "gp": 0,
-      "lvl": 34,
-      "class": "healer",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 0,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": false,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": false,
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_healer_5",
-          "armor": "armor_healer_5",
-          "head": "head_healer_5",
-          "shield": "shield_healer_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/quest_invitation_off.json b/tests/components/habitica/fixtures/quest_invitation_off.json
deleted file mode 100644
index b5eccd99e10..00000000000
--- a/tests/components/habitica/fixtures/quest_invitation_off.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 0,
-        "int": 0,
-        "per": 0,
-        "con": 0,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 0,
-      "mp": 50.89999999999998,
-      "exp": 737,
-      "gp": 137.62587214609795,
-      "lvl": 38,
-      "class": "wizard",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 5
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": true,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "tasksOrder": {
-      "rewards": ["5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"],
-      "todos": [
-        "88de7cd9-af2b-49ce-9afd-bf941d87336b",
-        "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        "1aa3137e-ef72-4d1f-91ee-41933602f438",
-        "86ea2475-d1b5-4020-bdcc-c188c7996afa"
-      ],
-      "dailys": [
-        "f21fa608-cfc6-4413-9fc7-0eb1b48ca43a",
-        "bc1d1855-b2b8-4663-98ff-62e7b763dfc4",
-        "e97659e0-2c42-4599-a7bb-00282adc410d",
-        "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-        "f2c85972-1a19-4426-bc6d-ce3337b9d99f",
-        "2c6d136c-a1c3-4bef-b7c4-fa980784b1e1"
-      ],
-      "habits": ["1d147de6-5c02-4740-8e2f-71d3015a37f4"]
-    },
-    "party": {
-      "quest": {
-        "RSVPNeeded": false,
-        "key": null
-      }
-    },
-    "needsCron": true,
-    "lastCron": "2024-09-21T22:01:55.586Z"
-  }
-}
diff --git a/tests/components/habitica/fixtures/rogue_fixture.json b/tests/components/habitica/fixtures/rogue_fixture.json
deleted file mode 100644
index 1e5e996c034..00000000000
--- a/tests/components/habitica/fixtures/rogue_fixture.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 0,
-      "mp": 50.89999999999998,
-      "exp": 737,
-      "gp": 137.62587214609795,
-      "lvl": 38,
-      "class": "rogue",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 5,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": true,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": true,
-    "lastCron": "2024-09-21T22:01:55.586Z",
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_rogue_5",
-          "armor": "armor_rogue_5",
-          "head": "head_rogue_5",
-          "shield": "shield_rogue_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/rogue_skills_unavailable.json b/tests/components/habitica/fixtures/rogue_skills_unavailable.json
deleted file mode 100644
index c7c5ff32245..00000000000
--- a/tests/components/habitica/fixtures/rogue_skills_unavailable.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": true,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 20,
-      "exp": 737,
-      "gp": 0,
-      "lvl": 38,
-      "class": "rogue",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 0,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": false,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": false,
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_rogue_5",
-          "armor": "armor_rogue_5",
-          "head": "head_rogue_5",
-          "shield": "shield_rogue_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/rogue_stealth_unavailable.json b/tests/components/habitica/fixtures/rogue_stealth_unavailable.json
deleted file mode 100644
index 9fd7adcca42..00000000000
--- a/tests/components/habitica/fixtures/rogue_stealth_unavailable.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 4,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 50,
-      "exp": 737,
-      "gp": 0,
-      "lvl": 38,
-      "class": "rogue",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 0,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": false,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": false,
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_rogue_5",
-          "armor": "armor_rogue_5",
-          "head": "head_rogue_5",
-          "shield": "shield_rogue_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/score_with_drop.json b/tests/components/habitica/fixtures/score_with_drop.json
deleted file mode 100644
index f25838d6c37..00000000000
--- a/tests/components/habitica/fixtures/score_with_drop.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "success": true,
-  "data": {
-    "delta": 0.9999999781878414,
-    "_tmp": {
-      "quest": {
-        "progressDelta": 1.049999977097233
-      },
-      "drop": {
-        "value": 3,
-        "key": "Dragon",
-        "type": "Egg",
-        "dialog": "You've found a Dragon Egg!"
-      }
-    },
-    "buffs": {
-      "str": 0,
-      "int": 0,
-      "per": 0,
-      "con": 0,
-      "stealth": 0,
-      "streaks": false,
-      "seafoam": false,
-      "shinySeed": false,
-      "snowball": false,
-      "spookySparkles": false
-    },
-    "training": {
-      "int": 0,
-      "per": 0,
-      "str": 0,
-      "con": 0
-    },
-    "hp": 25.100000000000016,
-    "mp": 24,
-    "exp": 196,
-    "gp": 30.453660284128997,
-    "lvl": 20,
-    "class": "warrior",
-    "points": 2,
-    "str": 0,
-    "con": 0,
-    "int": 0,
-    "per": 0
-  },
-  "notifications": [
-    {
-      "type": "ITEM_RECEIVED",
-      "data": {
-        "icon": "notif_orca_mount",
-        "title": "Orcas for Summer Splash!",
-        "text": "To celebrate Summer Splash, we've given you an Orca Mount!",
-        "destination": "stable"
-      },
-      "seen": true,
-      "id": "b7a85df1-06ed-4ab1-b56d-43418fc6a5e5"
-    },
-    {
-      "type": "UNALLOCATED_STATS_POINTS",
-      "data": {
-        "points": 2
-      },
-      "seen": true,
-      "id": "bc3f8a69-231f-4eb1-ba48-a00b6c0e0f37"
-    }
-  ],
-  "userV": 623,
-  "appVersion": "5.28.6"
-}
diff --git a/tests/components/habitica/fixtures/tasks.json b/tests/components/habitica/fixtures/tasks.json
index 2e8305283d0..a62280cb475 100644
--- a/tests/components/habitica/fixtures/tasks.json
+++ b/tests/components/habitica/fixtures/tasks.json
@@ -121,8 +121,7 @@
       "createdAt": "2024-07-07T17:51:53.264Z",
       "updatedAt": "2024-07-12T09:58:45.438Z",
       "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "id": "e97659e0-2c42-4599-a7bb-00282adc410d",
-      "alias": "create_a_task"
+      "id": "e97659e0-2c42-4599-a7bb-00282adc410d"
     },
     {
       "_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
@@ -445,18 +444,12 @@
         "completedBy": {},
         "assignedUsers": []
       },
-      "reminders": [
-        {
-          "id": "91c09432-10ac-4a49-bd20-823081ec29ed",
-          "time": "2024-09-22T02:00:00.0000Z"
-        }
-      ],
+      "reminders": [],
       "byHabitica": false,
       "createdAt": "2024-09-21T22:17:19.513Z",
       "updatedAt": "2024-09-21T22:19:35.576Z",
       "userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
-      "id": "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-      "alias": "pay_bills"
+      "id": "2f6fcabc-f670-4ec3-ba65-817e8deea490"
     },
     {
       "_id": "1aa3137e-ef72-4d1f-91ee-41933602f438",
@@ -484,7 +477,7 @@
     },
     {
       "_id": "86ea2475-d1b5-4020-bdcc-c188c7996afa",
-      "date": "2024-09-21T22:00:00.000Z",
+      "date": "2024-09-26T22:15:00.000Z",
       "completed": false,
       "collapseChecklist": false,
       "checklist": [],
diff --git a/tests/components/habitica/fixtures/user.json b/tests/components/habitica/fixtures/user.json
index 569c5b81a02..810e4351107 100644
--- a/tests/components/habitica/fixtures/user.json
+++ b/tests/components/habitica/fixtures/user.json
@@ -3,18 +3,6 @@
     "api_user": "test-api-user",
     "profile": { "name": "test-user" },
     "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
       "hp": 0,
       "mp": 50.89999999999998,
       "exp": 737,
@@ -24,60 +12,13 @@
       "maxHealth": 50,
       "maxMP": 166,
       "toNextLevel": 880,
-      "points": 5,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
+      "points": 5
     },
     "preferences": {
       "sleep": false,
-      "automaticAllocation": true,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "tasksOrder": {
-      "rewards": ["5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"],
-      "todos": [
-        "88de7cd9-af2b-49ce-9afd-bf941d87336b",
-        "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        "1aa3137e-ef72-4d1f-91ee-41933602f438",
-        "86ea2475-d1b5-4020-bdcc-c188c7996afa"
-      ],
-      "dailys": [
-        "f21fa608-cfc6-4413-9fc7-0eb1b48ca43a",
-        "bc1d1855-b2b8-4663-98ff-62e7b763dfc4",
-        "e97659e0-2c42-4599-a7bb-00282adc410d",
-        "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-        "f2c85972-1a19-4426-bc6d-ce3337b9d99f",
-        "2c6d136c-a1c3-4bef-b7c4-fa980784b1e1"
-      ],
-      "habits": ["1d147de6-5c02-4740-8e2f-71d3015a37f4"]
-    },
-    "party": {
-      "quest": {
-        "RSVPNeeded": true,
-        "key": "dustbunnies"
-      }
+      "automaticAllocation": true
     },
     "needsCron": true,
-    "lastCron": "2024-09-21T22:01:55.586Z",
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_warrior_5",
-          "armor": "armor_warrior_5",
-          "head": "head_warrior_5",
-          "shield": "shield_warrior_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
+    "lastCron": "2024-09-21T22:01:55.586Z"
   }
 }
diff --git a/tests/components/habitica/fixtures/warrior_fixture.json b/tests/components/habitica/fixtures/warrior_fixture.json
deleted file mode 100644
index 3517e8a908a..00000000000
--- a/tests/components/habitica/fixtures/warrior_fixture.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 50.89999999999998,
-      "exp": 737,
-      "gp": 137.62587214609795,
-      "lvl": 38,
-      "class": "warrior",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 5,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": true,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": true,
-    "lastCron": "2024-09-21T22:01:55.586Z",
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_warrior_5",
-          "armor": "armor_warrior_5",
-          "head": "head_warrior_5",
-          "shield": "shield_warrior_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/warrior_skills_unavailable.json b/tests/components/habitica/fixtures/warrior_skills_unavailable.json
deleted file mode 100644
index b3d33c85d5c..00000000000
--- a/tests/components/habitica/fixtures/warrior_skills_unavailable.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 10,
-      "exp": 737,
-      "gp": 0,
-      "lvl": 34,
-      "class": "warrior",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 0,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": false,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": false,
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_warrior_5",
-          "armor": "armor_warrior_5",
-          "head": "head_warrior_5",
-          "shield": "shield_warrior_5",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/wizard_fixture.json b/tests/components/habitica/fixtures/wizard_fixture.json
deleted file mode 100644
index de596e231de..00000000000
--- a/tests/components/habitica/fixtures/wizard_fixture.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 50.89999999999998,
-      "exp": 737,
-      "gp": 137.62587214609795,
-      "lvl": 38,
-      "class": "wizard",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 5,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": true,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": true,
-    "lastCron": "2024-09-21T22:01:55.586Z",
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_wizard_5",
-          "armor": "armor_wizard_5",
-          "head": "head_wizard_5",
-          "shield": "shield_base_0",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/wizard_frost_unavailable.json b/tests/components/habitica/fixtures/wizard_frost_unavailable.json
deleted file mode 100644
index 31d10fde4b9..00000000000
--- a/tests/components/habitica/fixtures/wizard_frost_unavailable.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": true,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 50,
-      "exp": 737,
-      "gp": 0,
-      "lvl": 34,
-      "class": "wizard",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 0,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": false,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": false,
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_wizard_5",
-          "armor": "armor_wizard_5",
-          "head": "head_wizard_5",
-          "shield": "shield_base_0",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/fixtures/wizard_skills_unavailable.json b/tests/components/habitica/fixtures/wizard_skills_unavailable.json
deleted file mode 100644
index f3bdee9dd74..00000000000
--- a/tests/components/habitica/fixtures/wizard_skills_unavailable.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "data": {
-    "api_user": "test-api-user",
-    "profile": { "name": "test-user" },
-    "stats": {
-      "buffs": {
-        "str": 26,
-        "int": 26,
-        "per": 26,
-        "con": 26,
-        "stealth": 0,
-        "streaks": false,
-        "seafoam": false,
-        "shinySeed": false,
-        "snowball": false,
-        "spookySparkles": false
-      },
-      "hp": 50,
-      "mp": 10,
-      "exp": 737,
-      "gp": 0,
-      "lvl": 34,
-      "class": "wizard",
-      "maxHealth": 50,
-      "maxMP": 166,
-      "toNextLevel": 880,
-      "points": 0,
-      "str": 15,
-      "con": 15,
-      "int": 15,
-      "per": 15
-    },
-    "preferences": {
-      "sleep": false,
-      "automaticAllocation": false,
-      "disableClasses": false,
-      "language": "en"
-    },
-    "flags": {
-      "classSelected": true
-    },
-    "needsCron": false,
-    "items": {
-      "gear": {
-        "equipped": {
-          "weapon": "weapon_wizard_5",
-          "armor": "armor_wizard_5",
-          "head": "head_wizard_5",
-          "shield": "shield_base_0",
-          "back": "heroicAureole",
-          "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
-          "eyewear": "plagueDoctorMask",
-          "body": "aetherAmulet"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/components/habitica/snapshots/test_binary_sensor.ambr b/tests/components/habitica/snapshots/test_binary_sensor.ambr
deleted file mode 100644
index c18f8f551c9..00000000000
--- a/tests/components/habitica/snapshots/test_binary_sensor.ambr
+++ /dev/null
@@ -1,48 +0,0 @@
-# serializer version: 1
-# name: test_binary_sensors[binary_sensor.test_user_pending_quest_invitation-entry]
-  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.test_user_pending_quest_invitation',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Pending quest invitation',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabiticaBinarySensor.PENDING_QUEST: 'pending_quest'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_pending_quest',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_binary_sensors[binary_sensor.test_user_pending_quest_invitation-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_dustbunnies.png',
-      'friendly_name': 'test-user Pending quest invitation',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.test_user_pending_quest_invitation',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
diff --git a/tests/components/habitica/snapshots/test_button.ambr b/tests/components/habitica/snapshots/test_button.ambr
deleted file mode 100644
index c8f92650874..00000000000
--- a/tests/components/habitica/snapshots/test_button.ambr
+++ /dev/null
@@ -1,1305 +0,0 @@
-# serializer version: 1
-# name: test_buttons[healer_fixture][button.test_user_allocate_all_stat_points-entry]
-  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.test_user_allocate_all_stat_points',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Allocate all stat points',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.ALLOCATE_ALL_STAT_POINTS: 'allocate_all_stat_points'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_allocate_all_stat_points',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_allocate_all_stat_points-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Allocate all stat points',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_allocate_all_stat_points',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_blessing-entry]
-  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.test_user_blessing',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Blessing',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.HEAL_ALL: 'heal_all'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_heal_all',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_blessing-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_healAll.png',
-      'friendly_name': 'test-user Blessing',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_blessing',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_buy_a_health_potion-entry]
-  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.test_user_buy_a_health_potion',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Buy a health potion',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.BUY_HEALTH_POTION: 'buy_health_potion'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_buy_health_potion',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_buy_a_health_potion-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_potion.png',
-      'friendly_name': 'test-user Buy a health potion',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_buy_a_health_potion',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_healing_light-entry]
-  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.test_user_healing_light',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Healing light',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.HEAL: 'heal'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_heal',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_healing_light-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_heal.png',
-      'friendly_name': 'test-user Healing light',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_healing_light',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_protective_aura-entry]
-  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.test_user_protective_aura',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Protective aura',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.PROTECT_AURA: 'protect_aura'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_protect_aura',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_protective_aura-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_protectAura.png',
-      'friendly_name': 'test-user Protective aura',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_protective_aura',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_revive_from_death-entry]
-  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.test_user_revive_from_death',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Revive from death',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.REVIVE: 'revive'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_revive',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_revive_from_death-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Revive from death',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_revive_from_death',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unavailable',
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_searing_brightness-entry]
-  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.test_user_searing_brightness',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Searing brightness',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.BRIGHTNESS: 'brightness'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_brightness',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_searing_brightness-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_brightness.png',
-      'friendly_name': 'test-user Searing brightness',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_searing_brightness',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_start_my_day-entry]
-  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.test_user_start_my_day',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Start my day',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.RUN_CRON: 'run_cron'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_run_cron',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[healer_fixture][button.test_user_start_my_day-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Start my day',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_start_my_day',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_allocate_all_stat_points-entry]
-  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.test_user_allocate_all_stat_points',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Allocate all stat points',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.ALLOCATE_ALL_STAT_POINTS: 'allocate_all_stat_points'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_allocate_all_stat_points',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_allocate_all_stat_points-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Allocate all stat points',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_allocate_all_stat_points',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_buy_a_health_potion-entry]
-  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.test_user_buy_a_health_potion',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Buy a health potion',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.BUY_HEALTH_POTION: 'buy_health_potion'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_buy_health_potion',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_buy_a_health_potion-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_potion.png',
-      'friendly_name': 'test-user Buy a health potion',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_buy_a_health_potion',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_revive_from_death-entry]
-  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.test_user_revive_from_death',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Revive from death',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.REVIVE: 'revive'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_revive',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_revive_from_death-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Revive from death',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_revive_from_death',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_start_my_day-entry]
-  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.test_user_start_my_day',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Start my day',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.RUN_CRON: 'run_cron'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_run_cron',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_start_my_day-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Start my day',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_start_my_day',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_stealth-entry]
-  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.test_user_stealth',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Stealth',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.STEALTH: 'stealth'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_stealth',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_stealth-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_stealth.png',
-      'friendly_name': 'test-user Stealth',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_stealth',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_tools_of_the_trade-entry]
-  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.test_user_tools_of_the_trade',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Tools of the trade',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.TOOLS_OF_TRADE: 'tools_of_trade'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_tools_of_trade',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[rogue_fixture][button.test_user_tools_of_the_trade-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_toolsOfTrade.png',
-      'friendly_name': 'test-user Tools of the trade',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_tools_of_the_trade',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_allocate_all_stat_points-entry]
-  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.test_user_allocate_all_stat_points',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Allocate all stat points',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.ALLOCATE_ALL_STAT_POINTS: 'allocate_all_stat_points'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_allocate_all_stat_points',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_allocate_all_stat_points-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Allocate all stat points',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_allocate_all_stat_points',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_buy_a_health_potion-entry]
-  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.test_user_buy_a_health_potion',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Buy a health potion',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.BUY_HEALTH_POTION: 'buy_health_potion'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_buy_health_potion',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_buy_a_health_potion-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_potion.png',
-      'friendly_name': 'test-user Buy a health potion',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_buy_a_health_potion',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unavailable',
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_defensive_stance-entry]
-  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.test_user_defensive_stance',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Defensive stance',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.DEFENSIVE_STANCE: 'defensive_stance'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_defensive_stance',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_defensive_stance-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_defensiveStance.png',
-      'friendly_name': 'test-user Defensive stance',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_defensive_stance',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_intimidating_gaze-entry]
-  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.test_user_intimidating_gaze',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Intimidating gaze',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.INTIMIDATE: 'intimidate'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_intimidate',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_intimidating_gaze-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_intimidate.png',
-      'friendly_name': 'test-user Intimidating gaze',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_intimidating_gaze',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_revive_from_death-entry]
-  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.test_user_revive_from_death',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Revive from death',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.REVIVE: 'revive'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_revive',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_revive_from_death-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Revive from death',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_revive_from_death',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unavailable',
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_start_my_day-entry]
-  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.test_user_start_my_day',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Start my day',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.RUN_CRON: 'run_cron'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_run_cron',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_start_my_day-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Start my day',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_start_my_day',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_valorous_presence-entry]
-  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.test_user_valorous_presence',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Valorous presence',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.VALOROUS_PRESENCE: 'valorous_presence'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_valorous_presence',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[warrior_fixture][button.test_user_valorous_presence-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_valorousPresence.png',
-      'friendly_name': 'test-user Valorous presence',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_valorous_presence',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_allocate_all_stat_points-entry]
-  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.test_user_allocate_all_stat_points',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Allocate all stat points',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.ALLOCATE_ALL_STAT_POINTS: 'allocate_all_stat_points'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_allocate_all_stat_points',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_allocate_all_stat_points-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Allocate all stat points',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_allocate_all_stat_points',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_buy_a_health_potion-entry]
-  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.test_user_buy_a_health_potion',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Buy a health potion',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.BUY_HEALTH_POTION: 'buy_health_potion'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_buy_health_potion',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_buy_a_health_potion-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_potion.png',
-      'friendly_name': 'test-user Buy a health potion',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_buy_a_health_potion',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unavailable',
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_chilling_frost-entry]
-  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.test_user_chilling_frost',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Chilling frost',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.FROST: 'frost'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_frost',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_chilling_frost-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_frost.png',
-      'friendly_name': 'test-user Chilling frost',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_chilling_frost',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_earthquake-entry]
-  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.test_user_earthquake',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Earthquake',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.EARTH: 'earth'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_earth',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_earthquake-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_earth.png',
-      'friendly_name': 'test-user Earthquake',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_earthquake',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_ethereal_surge-entry]
-  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.test_user_ethereal_surge',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Ethereal surge',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.MPHEAL: 'mpheal'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_mpheal',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_ethereal_surge-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_mpheal.png',
-      'friendly_name': 'test-user Ethereal surge',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_ethereal_surge',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_revive_from_death-entry]
-  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.test_user_revive_from_death',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Revive from death',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.REVIVE: 'revive'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_revive',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_revive_from_death-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Revive from death',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_revive_from_death',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unavailable',
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_start_my_day-entry]
-  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.test_user_start_my_day',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Start my day',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipyButtonEntity.RUN_CRON: 'run_cron'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_run_cron',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_buttons[wizard_fixture][button.test_user_start_my_day-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Start my day',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.test_user_start_my_day',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
diff --git a/tests/components/habitica/snapshots/test_calendar.ambr b/tests/components/habitica/snapshots/test_calendar.ambr
deleted file mode 100644
index 7325e125470..00000000000
--- a/tests/components/habitica/snapshots/test_calendar.ambr
+++ /dev/null
@@ -1,730 +0,0 @@
-# serializer version: 1
-# name: test_api_events[calendar.test_user_dailies]
-  list([
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-22',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-21',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-09-22',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-09-21',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-23',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-22',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-23',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-22',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-09-23',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-09-22',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-24',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-23',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-24',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-23',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-25',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-24',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-25',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-24',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-26',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-25',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-26',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-25',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-09-26',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-09-25',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-27',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-26',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-27',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-26',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-28',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-27',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-28',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-27',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-29',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-28',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-29',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-28',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-09-29',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-09-28',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-09-30',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-29',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-09-30',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-29',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-09-30',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-09-29',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-01',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-30',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-01',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-09-30',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-02',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-01',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-02',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-01',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-03',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-02',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-03',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-02',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-10-03',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-10-02',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-04',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-03',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-04',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-03',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-05',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-04',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-05',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-04',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-06',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-05',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-06',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-05',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-10-06',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-10-05',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-07',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-06',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-07',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-06',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-    dict({
-      'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-      'end': dict({
-        'date': '2024-10-07',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=WE,SA,SU',
-      'start': dict({
-        'date': '2024-10-06',
-      }),
-      'summary': 'Fitnessstudio besuchen',
-      'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-    }),
-    dict({
-      'description': 'Klicke um Änderungen zu machen!',
-      'end': dict({
-        'date': '2024-10-08',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-07',
-      }),
-      'summary': 'Zahnseide benutzen',
-      'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-    }),
-    dict({
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end': dict({
-        'date': '2024-10-08',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': 'FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR,SA,SU',
-      'start': dict({
-        'date': '2024-10-07',
-      }),
-      'summary': '5 Minuten ruhig durchatmen',
-      'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-    }),
-  ])
-# ---
-# name: test_api_events[calendar.test_user_to_do_s]
-  list([
-    dict({
-      'description': 'Strom- und Internetrechnungen rechtzeitig überweisen.',
-      'end': dict({
-        'date': '2024-09-01',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': None,
-      'start': dict({
-        'date': '2024-08-31',
-      }),
-      'summary': 'Rechnungen bezahlen',
-      'uid': '2f6fcabc-f670-4ec3-ba65-817e8deea490',
-    }),
-    dict({
-      'description': 'Den Ausflug für das kommende Wochenende organisieren.',
-      'end': dict({
-        'date': '2024-09-22',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': None,
-      'start': dict({
-        'date': '2024-09-21',
-      }),
-      'summary': 'Wochenendausflug planen',
-      'uid': '86ea2475-d1b5-4020-bdcc-c188c7996afa',
-    }),
-    dict({
-      'description': 'Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.',
-      'end': dict({
-        'date': '2024-09-28',
-      }),
-      'location': None,
-      'recurrence_id': None,
-      'rrule': None,
-      'start': dict({
-        'date': '2024-09-27',
-      }),
-      'summary': 'Buch zu Ende lesen',
-      'uid': '88de7cd9-af2b-49ce-9afd-bf941d87336b',
-    }),
-  ])
-# ---
-# name: test_calendar_platform[calendar.test_user_dailies-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'calendar',
-    'entity_category': None,
-    'entity_id': 'calendar.test_user_dailies',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Dailies',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabiticaCalendar.DAILIES: 'dailys'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_dailys',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_calendar_platform[calendar.test_user_dailies-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'all_day': True,
-      'description': 'Klicke um Deinen Terminplan festzulegen!',
-      'end_time': '2024-09-22 00:00:00',
-      'friendly_name': 'test-user Dailies',
-      'location': '',
-      'message': '5 Minuten ruhig durchatmen',
-      'start_time': '2024-09-21 00:00:00',
-      'yesterdaily': False,
-    }),
-    'context': <ANY>,
-    'entity_id': 'calendar.test_user_dailies',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
-# name: test_calendar_platform[calendar.test_user_to_do_s-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'calendar',
-    'entity_category': None,
-    'entity_id': 'calendar.test_user_to_do_s',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': "To-Do's",
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabiticaCalendar.TODOS: 'todos'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_todos',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_calendar_platform[calendar.test_user_to_do_s-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'all_day': True,
-      'description': 'Den Ausflug für das kommende Wochenende organisieren.',
-      'end_time': '2024-09-22 00:00:00',
-      'friendly_name': "test-user To-Do's",
-      'location': '',
-      'message': 'Wochenendausflug planen',
-      'start_time': '2024-09-21 00:00:00',
-    }),
-    'context': <ANY>,
-    'entity_id': 'calendar.test_user_to_do_s',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
diff --git a/tests/components/habitica/snapshots/test_sensor.ambr b/tests/components/habitica/snapshots/test_sensor.ambr
index 3a43069bfc4..ee75b424a93 100644
--- a/tests/components/habitica/snapshots/test_sensor.ambr
+++ b/tests/components/habitica/snapshots/test_sensor.ambr
@@ -59,61 +59,6 @@
     'state': 'wizard',
   })
 # ---
-# name: test_sensors[sensor.test_user_constitution-entry]
-  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.test_user_constitution',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Constitution',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipySensorEntity.CONSTITUTION: 'constitution'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_constitution',
-    'unit_of_measurement': 'CON',
-  })
-# ---
-# name: test_sensors[sensor.test_user_constitution-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'allocated': 15,
-      'buffs': 26,
-      'class': 0,
-      'equipment': 20,
-      'friendly_name': 'test-user Constitution',
-      'level': 19,
-      'unit_of_measurement': 'CON',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_user_constitution',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '80',
-  })
-# ---
 # name: test_sensors[sensor.test_user_dailies-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -622,61 +567,6 @@
     'state': '0',
   })
 # ---
-# name: test_sensors[sensor.test_user_intelligence-entry]
-  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.test_user_intelligence',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Intelligence',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipySensorEntity.INTELLIGENCE: 'intelligence'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_intelligence',
-    'unit_of_measurement': 'INT',
-  })
-# ---
-# name: test_sensors[sensor.test_user_intelligence-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'allocated': 15,
-      'buffs': 26,
-      'class': 0,
-      'equipment': 0,
-      'friendly_name': 'test-user Intelligence',
-      'level': 19,
-      'unit_of_measurement': 'INT',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_user_intelligence',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '60',
-  })
-# ---
 # name: test_sensors[sensor.test_user_level-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -964,61 +854,6 @@
     'state': '880',
   })
 # ---
-# name: test_sensors[sensor.test_user_perception-entry]
-  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.test_user_perception',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Perception',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipySensorEntity.PERCEPTION: 'perception'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_perception',
-    'unit_of_measurement': 'PER',
-  })
-# ---
-# name: test_sensors[sensor.test_user_perception-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'allocated': 15,
-      'buffs': 26,
-      'class': 0,
-      'equipment': 8,
-      'friendly_name': 'test-user Perception',
-      'level': 19,
-      'unit_of_measurement': 'PER',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_user_perception',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '68',
-  })
-# ---
 # name: test_sensors[sensor.test_user_rewards-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -1080,61 +915,6 @@
     'state': '1',
   })
 # ---
-# name: test_sensors[sensor.test_user_strength-entry]
-  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.test_user_strength',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Strength',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipySensorEntity.STRENGTH: 'strength'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_strength',
-    'unit_of_measurement': 'STR',
-  })
-# ---
-# name: test_sensors[sensor.test_user_strength-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'allocated': 15,
-      'buffs': 26,
-      'class': 0,
-      'equipment': 27,
-      'friendly_name': 'test-user Strength',
-      'level': 19,
-      'unit_of_measurement': 'STR',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_user_strength',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '87',
-  })
-# ---
 # name: test_sensors[sensor.test_user_to_do_s-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/habitica/snapshots/test_switch.ambr b/tests/components/habitica/snapshots/test_switch.ambr
deleted file mode 100644
index 3affbd11e2a..00000000000
--- a/tests/components/habitica/snapshots/test_switch.ambr
+++ /dev/null
@@ -1,48 +0,0 @@
-# serializer version: 1
-# name: test_switch[switch.test_user_rest_in_the_inn-entry]
-  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.test_user_rest_in_the_inn',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
-    'original_icon': None,
-    'original_name': 'Rest in the inn',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabiticaSwitchEntity.SLEEP: 'sleep'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_sleep',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_switch[switch.test_user_rest_in_the_inn-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'switch',
-      'friendly_name': 'test-user Rest in the inn',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.test_user_rest_in_the_inn',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/habitica/snapshots/test_todo.ambr b/tests/components/habitica/snapshots/test_todo.ambr
deleted file mode 100644
index 79eca9dbbb0..00000000000
--- a/tests/components/habitica/snapshots/test_todo.ambr
+++ /dev/null
@@ -1,189 +0,0 @@
-# serializer version: 1
-# name: test_complete_todo_item[daily]
-  tuple(
-    'Habitica',
-    '''
-      ![Dragon](https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_Egg_Dragon.png)
-      You've found a Dragon Egg!
-    ''',
-  )
-# ---
-# name: test_complete_todo_item[todo]
-  tuple(
-    'Habitica',
-    '''
-      ![Dragon](https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_Egg_Dragon.png)
-      You've found a Dragon Egg!
-    ''',
-  )
-# ---
-# name: test_todo_items[todo.test_user_dailies]
-  dict({
-    'todo.test_user_dailies': dict({
-      'items': list([
-        dict({
-          'description': 'Klicke um Änderungen zu machen!',
-          'due': '2024-09-22',
-          'status': 'completed',
-          'summary': 'Zahnseide benutzen',
-          'uid': '564b9ac9-c53d-4638-9e7f-1cd96fe19baa',
-        }),
-        dict({
-          'description': 'Klicke um Deinen Terminplan festzulegen!',
-          'due': '2024-09-21',
-          'status': 'needs_action',
-          'summary': '5 Minuten ruhig durchatmen',
-          'uid': 'f2c85972-1a19-4426-bc6d-ce3337b9d99f',
-        }),
-        dict({
-          'description': 'Ein einstündiges Workout im Fitnessstudio absolvieren.',
-          'due': '2024-09-21',
-          'status': 'needs_action',
-          'summary': 'Fitnessstudio besuchen',
-          'uid': '2c6d136c-a1c3-4bef-b7c4-fa980784b1e1',
-        }),
-      ]),
-    }),
-  })
-# ---
-# name: test_todo_items[todo.test_user_to_do_s]
-  dict({
-    'todo.test_user_to_do_s': dict({
-      'items': list([
-        dict({
-          'description': 'Das Buch, das du angefangen hast, bis zum Wochenende fertig lesen.',
-          'due': '2024-09-27',
-          'status': 'needs_action',
-          'summary': 'Buch zu Ende lesen',
-          'uid': '88de7cd9-af2b-49ce-9afd-bf941d87336b',
-        }),
-        dict({
-          'description': 'Strom- und Internetrechnungen rechtzeitig überweisen.',
-          'due': '2024-08-31',
-          'status': 'needs_action',
-          'summary': 'Rechnungen bezahlen',
-          'uid': '2f6fcabc-f670-4ec3-ba65-817e8deea490',
-        }),
-        dict({
-          'description': 'Rasen mähen und die Pflanzen gießen.',
-          'status': 'needs_action',
-          'summary': 'Garten pflegen',
-          'uid': '1aa3137e-ef72-4d1f-91ee-41933602f438',
-        }),
-        dict({
-          'description': 'Den Ausflug für das kommende Wochenende organisieren.',
-          'due': '2024-09-21',
-          'status': 'needs_action',
-          'summary': 'Wochenendausflug planen',
-          'uid': '86ea2475-d1b5-4020-bdcc-c188c7996afa',
-        }),
-        dict({
-          'description': 'Lebensmittel und Haushaltsbedarf für die Woche einkaufen.',
-          'status': 'completed',
-          'summary': 'Wocheneinkauf erledigen',
-          'uid': '162f0bbe-a097-4a06-b4f4-8fbeed85d2ba',
-        }),
-        dict({
-          'description': 'Wohnzimmer und Küche gründlich aufräumen.',
-          'status': 'completed',
-          'summary': 'Wohnung aufräumen',
-          'uid': '3fa06743-aa0f-472b-af1a-f27c755e329c',
-        }),
-      ]),
-    }),
-  })
-# ---
-# name: test_todos[todo.test_user_dailies-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'todo',
-    'entity_category': None,
-    'entity_id': 'todo.test_user_dailies',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Dailies',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': <TodoListEntityFeature: 92>,
-    'translation_key': <HabiticaTodoList.DAILIES: 'dailys'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_dailys',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_todos[todo.test_user_dailies-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Dailies',
-      'supported_features': <TodoListEntityFeature: 92>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'todo.test_user_dailies',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2',
-  })
-# ---
-# name: test_todos[todo.test_user_to_do_s-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'todo',
-    'entity_category': None,
-    'entity_id': 'todo.test_user_to_do_s',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': "To-Do's",
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': <TodoListEntityFeature: 95>,
-    'translation_key': <HabiticaTodoList.TODOS: 'todos'>,
-    'unique_id': '00000000-0000-0000-0000-000000000000_todos',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_todos[todo.test_user_to_do_s-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': "test-user To-Do's",
-      'supported_features': <TodoListEntityFeature: 95>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'todo.test_user_to_do_s',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '4',
-  })
-# ---
diff --git a/tests/components/habitica/test_binary_sensor.py b/tests/components/habitica/test_binary_sensor.py
deleted file mode 100644
index 1710f8f217e..00000000000
--- a/tests/components/habitica/test_binary_sensor.py
+++ /dev/null
@@ -1,84 +0,0 @@
-"""Tests for the Habitica binary sensor platform."""
-
-from collections.abc import Generator
-from unittest.mock import patch
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.habitica.const import ASSETS_URL, DEFAULT_URL, DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_OFF, STATE_ON, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from tests.common import MockConfigEntry, load_json_object_fixture, snapshot_platform
-from tests.test_util.aiohttp import AiohttpClientMocker
-
-
-@pytest.fixture(autouse=True)
-def binary_sensor_only() -> Generator[None]:
-    """Enable only the binarty sensor platform."""
-    with patch(
-        "homeassistant.components.habitica.PLATFORMS",
-        [Platform.BINARY_SENSOR],
-    ):
-        yield
-
-
-@pytest.mark.usefixtures("mock_habitica")
-async def test_binary_sensors(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test setup of the Habitica binary sensor platform."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
-    ("fixture", "entity_state", "entity_picture"),
-    [
-        ("user", STATE_ON, f"{ASSETS_URL}inventory_quest_scroll_dustbunnies.png"),
-        ("quest_invitation_off", STATE_OFF, None),
-    ],
-)
-async def test_pending_quest_states(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    aioclient_mock: AiohttpClientMocker,
-    fixture: str,
-    entity_state: str,
-    entity_picture: str | None,
-) -> None:
-    """Test states of pending quest sensor."""
-
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/user",
-        json=load_json_object_fixture(f"{fixture}.json", DOMAIN),
-    )
-    aioclient_mock.get(f"{DEFAULT_URL}/api/v3/tasks/user", json={"data": []})
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/content",
-        params={"language": "en"},
-        json=load_json_object_fixture("content.json", DOMAIN),
-    )
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    assert (
-        state := hass.states.get("binary_sensor.test_user_pending_quest_invitation")
-    )
-    assert state.state == entity_state
-    assert state.attributes.get("entity_picture") == entity_picture
diff --git a/tests/components/habitica/test_button.py b/tests/components/habitica/test_button.py
deleted file mode 100644
index 979cefef923..00000000000
--- a/tests/components/habitica/test_button.py
+++ /dev/null
@@ -1,342 +0,0 @@
-"""Tests for Habitica button platform."""
-
-from collections.abc import Generator
-from http import HTTPStatus
-import re
-from unittest.mock import patch
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
-from homeassistant.components.habitica.const import DEFAULT_URL, DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import entity_registry as er
-
-from .conftest import mock_called_with
-
-from tests.common import MockConfigEntry, load_json_object_fixture, snapshot_platform
-from tests.test_util.aiohttp import AiohttpClientMocker
-
-
-@pytest.fixture(autouse=True)
-def button_only() -> Generator[None]:
-    """Enable only the button platform."""
-    with patch(
-        "homeassistant.components.habitica.PLATFORMS",
-        [Platform.BUTTON],
-    ):
-        yield
-
-
-@pytest.mark.parametrize(
-    "fixture",
-    [
-        "wizard_fixture",
-        "rogue_fixture",
-        "warrior_fixture",
-        "healer_fixture",
-    ],
-)
-async def test_buttons(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    aioclient_mock: AiohttpClientMocker,
-    snapshot: SnapshotAssertion,
-    entity_registry: er.EntityRegistry,
-    fixture: str,
-) -> None:
-    """Test button entities."""
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/user",
-        json=load_json_object_fixture(f"{fixture}.json", DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        params={"type": "completedTodos"},
-        json=load_json_object_fixture("completed_todos.json", DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        json=load_json_object_fixture("tasks.json", DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/content",
-        params={"language": "en"},
-        json=load_json_object_fixture("content.json", DOMAIN),
-    )
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "api_url", "fixture"),
-    [
-        ("button.test_user_allocate_all_stat_points", "user/allocate-now", "user"),
-        ("button.test_user_buy_a_health_potion", "user/buy-health-potion", "user"),
-        ("button.test_user_revive_from_death", "user/revive", "user"),
-        ("button.test_user_start_my_day", "cron", "user"),
-        (
-            "button.test_user_chilling_frost",
-            "user/class/cast/frost",
-            "wizard_fixture",
-        ),
-        (
-            "button.test_user_earthquake",
-            "user/class/cast/earth",
-            "wizard_fixture",
-        ),
-        (
-            "button.test_user_ethereal_surge",
-            "user/class/cast/mpheal",
-            "wizard_fixture",
-        ),
-        (
-            "button.test_user_stealth",
-            "user/class/cast/stealth",
-            "rogue_fixture",
-        ),
-        (
-            "button.test_user_tools_of_the_trade",
-            "user/class/cast/toolsOfTrade",
-            "rogue_fixture",
-        ),
-        (
-            "button.test_user_defensive_stance",
-            "user/class/cast/defensiveStance",
-            "warrior_fixture",
-        ),
-        (
-            "button.test_user_intimidating_gaze",
-            "user/class/cast/intimidate",
-            "warrior_fixture",
-        ),
-        (
-            "button.test_user_valorous_presence",
-            "user/class/cast/valorousPresence",
-            "warrior_fixture",
-        ),
-        (
-            "button.test_user_healing_light",
-            "user/class/cast/heal",
-            "healer_fixture",
-        ),
-        (
-            "button.test_user_protective_aura",
-            "user/class/cast/protectAura",
-            "healer_fixture",
-        ),
-        (
-            "button.test_user_searing_brightness",
-            "user/class/cast/brightness",
-            "healer_fixture",
-        ),
-        (
-            "button.test_user_blessing",
-            "user/class/cast/healAll",
-            "healer_fixture",
-        ),
-    ],
-)
-async def test_button_press(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    aioclient_mock: AiohttpClientMocker,
-    entity_id: str,
-    api_url: str,
-    fixture: str,
-) -> None:
-    """Test button press method."""
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/user",
-        json=load_json_object_fixture(f"{fixture}.json", DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        params={"type": "completedTodos"},
-        json=load_json_object_fixture("completed_todos.json", DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        json=load_json_object_fixture("tasks.json", DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/content",
-        params={"language": "en"},
-        json=load_json_object_fixture("content.json", DOMAIN),
-    )
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    aioclient_mock.post(f"{DEFAULT_URL}/api/v3/{api_url}", json={"data": None})
-
-    await hass.services.async_call(
-        BUTTON_DOMAIN,
-        SERVICE_PRESS,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-
-    assert mock_called_with(aioclient_mock, "post", f"{DEFAULT_URL}/api/v3/{api_url}")
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "api_url"),
-    [
-        ("button.test_user_allocate_all_stat_points", "user/allocate-now"),
-        ("button.test_user_buy_a_health_potion", "user/buy-health-potion"),
-        ("button.test_user_revive_from_death", "user/revive"),
-        ("button.test_user_start_my_day", "cron"),
-        ("button.test_user_chilling_frost", "user/class/cast/frost"),
-        ("button.test_user_earthquake", "user/class/cast/earth"),
-        ("button.test_user_ethereal_surge", "user/class/cast/mpheal"),
-    ],
-    ids=[
-        "allocate-points",
-        "health-potion",
-        "revive",
-        "run-cron",
-        "chilling frost",
-        "earthquake",
-        "ethereal surge",
-    ],
-)
-@pytest.mark.parametrize(
-    ("status_code", "msg", "exception"),
-    [
-        (
-            HTTPStatus.TOO_MANY_REQUESTS,
-            "Rate limit exceeded, try again later",
-            ServiceValidationError,
-        ),
-        (
-            HTTPStatus.BAD_REQUEST,
-            "Unable to connect to Habitica, try again later",
-            HomeAssistantError,
-        ),
-        (
-            HTTPStatus.UNAUTHORIZED,
-            "Unable to complete action, the required conditions are not met",
-            ServiceValidationError,
-        ),
-    ],
-)
-async def test_button_press_exceptions(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    entity_id: str,
-    api_url: str,
-    status_code: HTTPStatus,
-    msg: str,
-    exception: Exception,
-) -> None:
-    """Test button press exceptions."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/{api_url}",
-        status=status_code,
-        json={"data": None},
-    )
-
-    with pytest.raises(exception, match=msg):
-        await hass.services.async_call(
-            BUTTON_DOMAIN,
-            SERVICE_PRESS,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=True,
-        )
-
-    assert mock_called_with(mock_habitica, "post", f"{DEFAULT_URL}/api/v3/{api_url}")
-
-
-@pytest.mark.parametrize(
-    ("fixture", "entity_ids"),
-    [
-        (
-            "common_buttons_unavailable",
-            [
-                "button.test_user_allocate_all_stat_points",
-                "button.test_user_revive_from_death",
-                "button.test_user_buy_a_health_potion",
-                "button.test_user_start_my_day",
-            ],
-        ),
-        (
-            "wizard_skills_unavailable",
-            [
-                "button.test_user_chilling_frost",
-                "button.test_user_earthquake",
-                "button.test_user_ethereal_surge",
-            ],
-        ),
-        ("wizard_frost_unavailable", ["button.test_user_chilling_frost"]),
-        (
-            "rogue_skills_unavailable",
-            ["button.test_user_tools_of_the_trade", "button.test_user_stealth"],
-        ),
-        ("rogue_stealth_unavailable", ["button.test_user_stealth"]),
-        (
-            "warrior_skills_unavailable",
-            [
-                "button.test_user_defensive_stance",
-                "button.test_user_intimidating_gaze",
-                "button.test_user_valorous_presence",
-            ],
-        ),
-        (
-            "healer_skills_unavailable",
-            [
-                "button.test_user_healing_light",
-                "button.test_user_protective_aura",
-                "button.test_user_searing_brightness",
-                "button.test_user_blessing",
-            ],
-        ),
-    ],
-)
-async def test_button_unavailable(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    aioclient_mock: AiohttpClientMocker,
-    fixture: str,
-    entity_ids: list[str],
-) -> None:
-    """Test buttons are unavailable if conditions are not met."""
-
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/user",
-        json=load_json_object_fixture(f"{fixture}.json", DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        json=load_json_object_fixture("tasks.json", DOMAIN),
-    )
-    aioclient_mock.get(re.compile(r".*"), json={"data": []})
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    for entity_id in entity_ids:
-        assert (state := hass.states.get(entity_id))
-        assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/habitica/test_calendar.py b/tests/components/habitica/test_calendar.py
deleted file mode 100644
index 7c0a2686038..00000000000
--- a/tests/components/habitica/test_calendar.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""Tests for the Habitica calendar platform."""
-
-from collections.abc import Generator
-from unittest.mock import patch
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from tests.common import MockConfigEntry, snapshot_platform
-from tests.typing import ClientSessionGenerator
-
-
-@pytest.fixture(autouse=True)
-def calendar_only() -> Generator[None]:
-    """Enable only the calendar platform."""
-    with patch(
-        "homeassistant.components.habitica.PLATFORMS",
-        [Platform.CALENDAR],
-    ):
-        yield
-
-
-@pytest.fixture(autouse=True)
-async def set_tz(hass: HomeAssistant) -> None:
-    """Fixture to set timezone."""
-    await hass.config.async_set_time_zone("Europe/Berlin")
-
-
-@pytest.mark.usefixtures("mock_habitica")
-@pytest.mark.freeze_time("2024-09-20T22:00:00.000Z")
-async def test_calendar_platform(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test setup of the Habitica calendar platform."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
-    ("entity"),
-    [
-        "calendar.test_user_to_do_s",
-        "calendar.test_user_dailies",
-    ],
-)
-@pytest.mark.freeze_time("2024-09-20T22:00:00.000Z")
-@pytest.mark.usefixtures("mock_habitica")
-async def test_api_events(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    config_entry: MockConfigEntry,
-    hass_client: ClientSessionGenerator,
-    entity: str,
-) -> None:
-    """Test calendar event."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    client = await hass_client()
-    response = await client.get(
-        f"/api/calendars/{entity}?start=2024-08-29&end=2024-10-08"
-    )
-
-    assert await response.json() == snapshot
diff --git a/tests/components/habitica/test_init.py b/tests/components/habitica/test_init.py
index fd8a18b2d44..4b2ebbdc6ad 100644
--- a/tests/components/habitica/test_init.py
+++ b/tests/components/habitica/test_init.py
@@ -38,47 +38,121 @@ def capture_api_call_success(hass: HomeAssistant) -> list[Event]:
     return async_capture_events(hass, EVENT_API_CALL_SUCCESS)
 
 
-@pytest.mark.usefixtures("mock_habitica")
-async def test_entry_setup_unload(
-    hass: HomeAssistant, config_entry: MockConfigEntry
-) -> None:
-    """Test integration setup and unload."""
-
-    config_entry.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    assert await hass.config_entries.async_unload(config_entry.entry_id)
-
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
+@pytest.fixture
+def habitica_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Test entry for the following tests."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="test-api-user",
+        data={
+            "api_user": "test-api-user",
+            "api_key": "test-api-key",
+            "url": DEFAULT_URL,
+        },
+    )
+    entry.add_to_hass(hass)
+    return entry
 
 
-@pytest.mark.usefixtures("mock_habitica")
-async def test_service_call(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    capture_api_call_success: list[Event],
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test integration setup, service call and unload."""
-    config_entry.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
+@pytest.fixture
+def common_requests(aioclient_mock: AiohttpClientMocker) -> AiohttpClientMocker:
+    """Register requests for the tests."""
+    aioclient_mock.get(
+        "https://habitica.com/api/v3/user",
+        json={
+            "data": {
+                "auth": {"local": {"username": TEST_USER_NAME}},
+                "api_user": "test-api-user",
+                "profile": {"name": TEST_USER_NAME},
+                "stats": {
+                    "class": "warrior",
+                    "con": 1,
+                    "exp": 2,
+                    "gp": 3,
+                    "hp": 4,
+                    "int": 5,
+                    "lvl": 6,
+                    "maxHealth": 7,
+                    "maxMP": 8,
+                    "mp": 9,
+                    "per": 10,
+                    "points": 11,
+                    "str": 12,
+                    "toNextLevel": 13,
+                },
+            }
+        },
+    )
 
-    assert config_entry.state is ConfigEntryState.LOADED
+    aioclient_mock.get(
+        "https://habitica.com/api/v3/tasks/user",
+        json={
+            "data": [
+                {
+                    "text": f"this is a mock {task} #{i}",
+                    "id": f"{i}",
+                    "type": task,
+                    "completed": False,
+                }
+                for i, task in enumerate(("habit", "daily", "todo", "reward"), start=1)
+            ]
+        },
+    )
+    aioclient_mock.get(
+        "https://habitica.com/api/v3/tasks/user?type=completedTodos",
+        json={
+            "data": [
+                {
+                    "text": "this is a mock todo #5",
+                    "id": 5,
+                    "type": "todo",
+                    "completed": True,
+                }
+            ]
+        },
+    )
 
-    assert len(capture_api_call_success) == 0
-
-    mock_habitica.post(
+    aioclient_mock.post(
         "https://habitica.com/api/v3/tasks/user",
         status=HTTPStatus.CREATED,
         json={"data": TEST_API_CALL_ARGS},
     )
 
+    return aioclient_mock
+
+
+@pytest.mark.usefixtures("common_requests")
+async def test_entry_setup_unload(
+    hass: HomeAssistant, habitica_entry: MockConfigEntry
+) -> None:
+    """Test integration setup and unload."""
+    assert await hass.config_entries.async_setup(habitica_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert hass.services.has_service(DOMAIN, SERVICE_API_CALL)
+
+    assert await hass.config_entries.async_unload(habitica_entry.entry_id)
+
+    assert not hass.services.has_service(DOMAIN, SERVICE_API_CALL)
+
+
+@pytest.mark.usefixtures("common_requests")
+async def test_service_call(
+    hass: HomeAssistant,
+    habitica_entry: MockConfigEntry,
+    capture_api_call_success: list[Event],
+) -> None:
+    """Test integration setup, service call and unload."""
+
+    assert await hass.config_entries.async_setup(habitica_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert hass.services.has_service(DOMAIN, SERVICE_API_CALL)
+
+    assert len(capture_api_call_success) == 0
+
     TEST_SERVICE_DATA = {
-        ATTR_NAME: "test-user",
+        ATTR_NAME: "test_user",
         ATTR_PATH: ["tasks", "user", "post"],
         ATTR_ARGS: TEST_API_CALL_ARGS,
     }
@@ -92,6 +166,10 @@ async def test_service_call(
     del captured_data[ATTR_DATA]
     assert captured_data == TEST_SERVICE_DATA
 
+    assert await hass.config_entries.async_unload(habitica_entry.entry_id)
+
+    assert not hass.services.has_service(DOMAIN, SERVICE_API_CALL)
+
 
 @pytest.mark.parametrize(
     ("status"), [HTTPStatus.NOT_FOUND, HTTPStatus.TOO_MANY_REQUESTS]
@@ -165,4 +243,4 @@ async def test_coordinator_rate_limited(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
 
-        assert "Rate limit exceeded, will try again later" in caplog.text
+        assert "Currently rate limited, skipping update" in caplog.text
diff --git a/tests/components/habitica/test_services.py b/tests/components/habitica/test_services.py
deleted file mode 100644
index 403779bcbfb..00000000000
--- a/tests/components/habitica/test_services.py
+++ /dev/null
@@ -1,548 +0,0 @@
-"""Test Habitica actions."""
-
-from collections.abc import Generator
-from http import HTTPStatus
-from typing import Any
-from unittest.mock import patch
-
-import pytest
-
-from homeassistant.components.habitica.const import (
-    ATTR_CONFIG_ENTRY,
-    ATTR_DIRECTION,
-    ATTR_SKILL,
-    ATTR_TASK,
-    DEFAULT_URL,
-    DOMAIN,
-    SERVICE_ABORT_QUEST,
-    SERVICE_ACCEPT_QUEST,
-    SERVICE_CANCEL_QUEST,
-    SERVICE_CAST_SKILL,
-    SERVICE_LEAVE_QUEST,
-    SERVICE_REJECT_QUEST,
-    SERVICE_SCORE_HABIT,
-    SERVICE_SCORE_REWARD,
-    SERVICE_START_QUEST,
-)
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-
-from .conftest import mock_called_with
-
-from tests.common import MockConfigEntry
-from tests.test_util.aiohttp import AiohttpClientMocker
-
-REQUEST_EXCEPTION_MSG = "Unable to connect to Habitica, try again later"
-RATE_LIMIT_EXCEPTION_MSG = "Rate limit exceeded, try again later"
-
-
-@pytest.fixture(autouse=True)
-def services_only() -> Generator[None]:
-    """Enable only services."""
-    with patch(
-        "homeassistant.components.habitica.PLATFORMS",
-        [],
-    ):
-        yield
-
-
-@pytest.fixture(autouse=True)
-async def load_entry(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    services_only: Generator,
-) -> None:
-    """Load config entry."""
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-
-@pytest.mark.parametrize(
-    ("service_data", "item", "target_id"),
-    [
-        (
-            {
-                ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-                ATTR_SKILL: "pickpocket",
-            },
-            "pickPocket",
-            "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        ),
-        (
-            {
-                ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-                ATTR_SKILL: "backstab",
-            },
-            "backStab",
-            "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        ),
-        (
-            {
-                ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-                ATTR_SKILL: "fireball",
-            },
-            "fireball",
-            "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        ),
-        (
-            {
-                ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-                ATTR_SKILL: "smash",
-            },
-            "smash",
-            "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        ),
-        (
-            {
-                ATTR_TASK: "Rechnungen bezahlen",
-                ATTR_SKILL: "smash",
-            },
-            "smash",
-            "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        ),
-        (
-            {
-                ATTR_TASK: "pay_bills",
-                ATTR_SKILL: "smash",
-            },
-            "smash",
-            "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        ),
-    ],
-    ids=[
-        "cast pickpocket",
-        "cast backstab",
-        "cast fireball",
-        "cast smash",
-        "select task by name",
-        "select task_by_alias",
-    ],
-)
-async def test_cast_skill(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    service_data: dict[str, Any],
-    item: str,
-    target_id: str,
-) -> None:
-    """Test Habitica cast skill action."""
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/user/class/cast/{item}?targetId={target_id}",
-        json={"success": True, "data": {}},
-    )
-
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_CAST_SKILL,
-        service_data={
-            ATTR_CONFIG_ENTRY: config_entry.entry_id,
-            **service_data,
-        },
-        return_response=True,
-        blocking=True,
-    )
-
-    assert mock_called_with(
-        mock_habitica,
-        "post",
-        f"{DEFAULT_URL}/api/v3/user/class/cast/{item}?targetId={target_id}",
-    )
-
-
-@pytest.mark.parametrize(
-    (
-        "service_data",
-        "http_status",
-        "expected_exception",
-        "expected_exception_msg",
-    ),
-    [
-        (
-            {
-                ATTR_TASK: "task-not-found",
-                ATTR_SKILL: "smash",
-            },
-            HTTPStatus.OK,
-            ServiceValidationError,
-            "Unable to complete action, could not find the task 'task-not-found'",
-        ),
-        (
-            {
-                ATTR_TASK: "Rechnungen bezahlen",
-                ATTR_SKILL: "smash",
-            },
-            HTTPStatus.TOO_MANY_REQUESTS,
-            ServiceValidationError,
-            RATE_LIMIT_EXCEPTION_MSG,
-        ),
-        (
-            {
-                ATTR_TASK: "Rechnungen bezahlen",
-                ATTR_SKILL: "smash",
-            },
-            HTTPStatus.NOT_FOUND,
-            ServiceValidationError,
-            "Unable to cast skill, your character does not have the skill or spell smash",
-        ),
-        (
-            {
-                ATTR_TASK: "Rechnungen bezahlen",
-                ATTR_SKILL: "smash",
-            },
-            HTTPStatus.UNAUTHORIZED,
-            ServiceValidationError,
-            "Unable to cast skill, not enough mana. Your character has 50 MP, but the skill costs 10 MP",
-        ),
-        (
-            {
-                ATTR_TASK: "Rechnungen bezahlen",
-                ATTR_SKILL: "smash",
-            },
-            HTTPStatus.BAD_REQUEST,
-            HomeAssistantError,
-            REQUEST_EXCEPTION_MSG,
-        ),
-    ],
-)
-@pytest.mark.usefixtures("mock_habitica")
-async def test_cast_skill_exceptions(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    service_data: dict[str, Any],
-    http_status: HTTPStatus,
-    expected_exception: Exception,
-    expected_exception_msg: str,
-) -> None:
-    """Test Habitica cast skill action exceptions."""
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/user/class/cast/smash?targetId=2f6fcabc-f670-4ec3-ba65-817e8deea490",
-        json={"success": True, "data": {}},
-        status=http_status,
-    )
-
-    with pytest.raises(expected_exception, match=expected_exception_msg):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_CAST_SKILL,
-            service_data={
-                ATTR_CONFIG_ENTRY: config_entry.entry_id,
-                **service_data,
-            },
-            return_response=True,
-            blocking=True,
-        )
-
-
-@pytest.mark.usefixtures("mock_habitica")
-async def test_get_config_entry(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test Habitica config entry exceptions."""
-
-    with pytest.raises(
-        ServiceValidationError,
-        match="The selected character is not configured in Home Assistant",
-    ):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_CAST_SKILL,
-            service_data={
-                ATTR_CONFIG_ENTRY: "0000000000000000",
-                ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-                ATTR_SKILL: "smash",
-            },
-            return_response=True,
-            blocking=True,
-        )
-
-    assert await hass.config_entries.async_unload(config_entry.entry_id)
-
-    with pytest.raises(
-        ServiceValidationError,
-        match="The selected character is currently not loaded or disabled in Home Assistant",
-    ):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_CAST_SKILL,
-            service_data={
-                ATTR_CONFIG_ENTRY: config_entry.entry_id,
-                ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
-                ATTR_SKILL: "smash",
-            },
-            return_response=True,
-            blocking=True,
-        )
-
-
-@pytest.mark.parametrize(
-    ("service", "command"),
-    [
-        (SERVICE_ABORT_QUEST, "abort"),
-        (SERVICE_ACCEPT_QUEST, "accept"),
-        (SERVICE_CANCEL_QUEST, "cancel"),
-        (SERVICE_LEAVE_QUEST, "leave"),
-        (SERVICE_REJECT_QUEST, "reject"),
-        (SERVICE_START_QUEST, "force-start"),
-    ],
-    ids=[],
-)
-async def test_handle_quests(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    service: str,
-    command: str,
-) -> None:
-    """Test Habitica actions for quest handling."""
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/groups/party/quests/{command}",
-        json={"success": True, "data": {}},
-    )
-
-    await hass.services.async_call(
-        DOMAIN,
-        service,
-        service_data={ATTR_CONFIG_ENTRY: config_entry.entry_id},
-        return_response=True,
-        blocking=True,
-    )
-
-    assert mock_called_with(
-        mock_habitica,
-        "post",
-        f"{DEFAULT_URL}/api/v3/groups/party/quests/{command}",
-    )
-
-
-@pytest.mark.parametrize(
-    (
-        "http_status",
-        "expected_exception",
-        "expected_exception_msg",
-    ),
-    [
-        (
-            HTTPStatus.TOO_MANY_REQUESTS,
-            ServiceValidationError,
-            RATE_LIMIT_EXCEPTION_MSG,
-        ),
-        (
-            HTTPStatus.NOT_FOUND,
-            ServiceValidationError,
-            "Unable to complete action, quest or group not found",
-        ),
-        (
-            HTTPStatus.UNAUTHORIZED,
-            ServiceValidationError,
-            "Action not allowed, only quest leader or group leader can perform this action",
-        ),
-        (
-            HTTPStatus.BAD_REQUEST,
-            HomeAssistantError,
-            REQUEST_EXCEPTION_MSG,
-        ),
-    ],
-)
-@pytest.mark.usefixtures("mock_habitica")
-async def test_handle_quests_exceptions(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    http_status: HTTPStatus,
-    expected_exception: Exception,
-    expected_exception_msg: str,
-) -> None:
-    """Test Habitica handle quests action exceptions."""
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/groups/party/quests/accept",
-        json={"success": True, "data": {}},
-        status=http_status,
-    )
-
-    with pytest.raises(expected_exception, match=expected_exception_msg):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_ACCEPT_QUEST,
-            service_data={ATTR_CONFIG_ENTRY: config_entry.entry_id},
-            return_response=True,
-            blocking=True,
-        )
-
-
-@pytest.mark.parametrize(
-    ("service", "service_data", "task_id"),
-    [
-        (
-            SERVICE_SCORE_HABIT,
-            {
-                ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
-                ATTR_DIRECTION: "up",
-            },
-            "e97659e0-2c42-4599-a7bb-00282adc410d",
-        ),
-        (
-            SERVICE_SCORE_HABIT,
-            {
-                ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
-                ATTR_DIRECTION: "down",
-            },
-            "e97659e0-2c42-4599-a7bb-00282adc410d",
-        ),
-        (
-            SERVICE_SCORE_REWARD,
-            {
-                ATTR_TASK: "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b",
-            },
-            "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b",
-        ),
-        (
-            SERVICE_SCORE_HABIT,
-            {
-                ATTR_TASK: "Füge eine Aufgabe zu Habitica hinzu",
-                ATTR_DIRECTION: "up",
-            },
-            "e97659e0-2c42-4599-a7bb-00282adc410d",
-        ),
-        (
-            SERVICE_SCORE_HABIT,
-            {
-                ATTR_TASK: "create_a_task",
-                ATTR_DIRECTION: "up",
-            },
-            "e97659e0-2c42-4599-a7bb-00282adc410d",
-        ),
-    ],
-    ids=[
-        "habit score up",
-        "habit score down",
-        "buy reward",
-        "match task by name",
-        "match task by alias",
-    ],
-)
-async def test_score_task(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    service: str,
-    service_data: dict[str, Any],
-    task_id: str,
-) -> None:
-    """Test Habitica score task action."""
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/{task_id}/score/{service_data.get(ATTR_DIRECTION, "up")}",
-        json={"success": True, "data": {}},
-    )
-
-    await hass.services.async_call(
-        DOMAIN,
-        service,
-        service_data={
-            ATTR_CONFIG_ENTRY: config_entry.entry_id,
-            **service_data,
-        },
-        return_response=True,
-        blocking=True,
-    )
-
-    assert mock_called_with(
-        mock_habitica,
-        "post",
-        f"{DEFAULT_URL}/api/v3/tasks/{task_id}/score/{service_data.get(ATTR_DIRECTION, "up")}",
-    )
-
-
-@pytest.mark.parametrize(
-    (
-        "service_data",
-        "http_status",
-        "expected_exception",
-        "expected_exception_msg",
-    ),
-    [
-        (
-            {
-                ATTR_TASK: "task does not exist",
-                ATTR_DIRECTION: "up",
-            },
-            HTTPStatus.OK,
-            ServiceValidationError,
-            "Unable to complete action, could not find the task 'task does not exist'",
-        ),
-        (
-            {
-                ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
-                ATTR_DIRECTION: "up",
-            },
-            HTTPStatus.TOO_MANY_REQUESTS,
-            ServiceValidationError,
-            RATE_LIMIT_EXCEPTION_MSG,
-        ),
-        (
-            {
-                ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
-                ATTR_DIRECTION: "up",
-            },
-            HTTPStatus.BAD_REQUEST,
-            HomeAssistantError,
-            REQUEST_EXCEPTION_MSG,
-        ),
-        (
-            {
-                ATTR_TASK: "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b",
-                ATTR_DIRECTION: "up",
-            },
-            HTTPStatus.UNAUTHORIZED,
-            HomeAssistantError,
-            "Unable to buy reward, not enough gold. Your character has 137.63 GP, but the reward costs 10 GP",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("mock_habitica")
-async def test_score_task_exceptions(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    service_data: dict[str, Any],
-    http_status: HTTPStatus,
-    expected_exception: Exception,
-    expected_exception_msg: str,
-) -> None:
-    """Test Habitica score task action exceptions."""
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/e97659e0-2c42-4599-a7bb-00282adc410d/score/up",
-        json={"success": True, "data": {}},
-        status=http_status,
-    )
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b/score/up",
-        json={"success": True, "data": {}},
-        status=http_status,
-    )
-
-    with pytest.raises(expected_exception, match=expected_exception_msg):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_SCORE_HABIT,
-            service_data={
-                ATTR_CONFIG_ENTRY: config_entry.entry_id,
-                **service_data,
-            },
-            return_response=True,
-            blocking=True,
-        )
diff --git a/tests/components/habitica/test_switch.py b/tests/components/habitica/test_switch.py
deleted file mode 100644
index 55ba7b19b22..00000000000
--- a/tests/components/habitica/test_switch.py
+++ /dev/null
@@ -1,138 +0,0 @@
-"""Tests for the Habitica switch platform."""
-
-from collections.abc import Generator
-from http import HTTPStatus
-from unittest.mock import patch
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.habitica.const import DEFAULT_URL
-from homeassistant.components.switch import (
-    DOMAIN as SWITCH_DOMAIN,
-    SERVICE_TOGGLE,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-)
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import entity_registry as er
-
-from .conftest import mock_called_with
-
-from tests.common import MockConfigEntry, snapshot_platform
-from tests.test_util.aiohttp import AiohttpClientMocker
-
-
-@pytest.fixture(autouse=True)
-def switch_only() -> Generator[None]:
-    """Enable only the switch platform."""
-    with patch(
-        "homeassistant.components.habitica.PLATFORMS",
-        [Platform.SWITCH],
-    ):
-        yield
-
-
-@pytest.mark.usefixtures("mock_habitica")
-async def test_switch(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test switch entities."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
-    ("service_call"),
-    [
-        SERVICE_TURN_ON,
-        SERVICE_TURN_OFF,
-        SERVICE_TOGGLE,
-    ],
-)
-async def test_turn_on_off_toggle(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    service_call: str,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test switch turn on/off, toggle method."""
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/user/sleep",
-        json={"success": True, "data": False},
-    )
-    config_entry.add_to_hass(hass)
-    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.services.async_call(
-        SWITCH_DOMAIN,
-        service_call,
-        {ATTR_ENTITY_ID: "switch.test_user_rest_in_the_inn"},
-        blocking=True,
-    )
-
-    assert mock_called_with(mock_habitica, "post", f"{DEFAULT_URL}/api/v3/user/sleep")
-
-
-@pytest.mark.parametrize(
-    ("service_call"),
-    [
-        SERVICE_TURN_ON,
-        SERVICE_TURN_OFF,
-        SERVICE_TOGGLE,
-    ],
-)
-@pytest.mark.parametrize(
-    ("status_code", "exception"),
-    [
-        (HTTPStatus.TOO_MANY_REQUESTS, ServiceValidationError),
-        (HTTPStatus.BAD_REQUEST, HomeAssistantError),
-    ],
-)
-async def test_turn_on_off_toggle_exceptions(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    service_call: str,
-    mock_habitica: AiohttpClientMocker,
-    status_code: HTTPStatus,
-    exception: Exception,
-) -> None:
-    """Test switch turn on/off, toggle method."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/user/sleep",
-        status=status_code,
-        json={"success": True, "data": False},
-    )
-
-    with pytest.raises(expected_exception=exception):
-        await hass.services.async_call(
-            SWITCH_DOMAIN,
-            service_call,
-            {ATTR_ENTITY_ID: "switch.test_user_rest_in_the_inn"},
-            blocking=True,
-        )
-
-    assert mock_called_with(mock_habitica, "post", f"{DEFAULT_URL}/api/v3/user/sleep")
diff --git a/tests/components/habitica/test_todo.py b/tests/components/habitica/test_todo.py
deleted file mode 100644
index c9a4b3dd37a..00000000000
--- a/tests/components/habitica/test_todo.py
+++ /dev/null
@@ -1,700 +0,0 @@
-"""Tests for Habitica todo platform."""
-
-from collections.abc import Generator
-from datetime import datetime
-from http import HTTPStatus
-import json
-import re
-from unittest.mock import patch
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.habitica.const import DEFAULT_URL, DOMAIN
-from homeassistant.components.todo import (
-    ATTR_DESCRIPTION,
-    ATTR_DUE_DATE,
-    ATTR_ITEM,
-    ATTR_RENAME,
-    ATTR_STATUS,
-    DOMAIN as TODO_DOMAIN,
-    TodoServices,
-)
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import entity_registry as er
-
-from .conftest import mock_called_with
-
-from tests.common import (
-    MockConfigEntry,
-    async_get_persistent_notifications,
-    load_json_object_fixture,
-    snapshot_platform,
-)
-from tests.test_util.aiohttp import AiohttpClientMocker
-from tests.typing import WebSocketGenerator
-
-
-@pytest.fixture(autouse=True)
-def switch_only() -> Generator[None]:
-    """Enable only the todo platform."""
-    with patch(
-        "homeassistant.components.habitica.PLATFORMS",
-        [Platform.TODO],
-    ):
-        yield
-
-
-@pytest.mark.usefixtures("mock_habitica")
-async def test_todos(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test todo platform."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
-    ("entity_id"),
-    [
-        "todo.test_user_to_do_s",
-        "todo.test_user_dailies",
-    ],
-)
-@pytest.mark.usefixtures("mock_habitica")
-async def test_todo_items(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-    entity_id: str,
-) -> None:
-    """Test items on todo lists."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    result = await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.GET_ITEMS,
-        {},
-        target={ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-        return_response=True,
-    )
-
-    assert result == snapshot
-
-
-@pytest.mark.freeze_time("2024-09-21 00:00:00")
-@pytest.mark.parametrize(
-    ("entity_id", "uid"),
-    [
-        ("todo.test_user_to_do_s", "88de7cd9-af2b-49ce-9afd-bf941d87336b"),
-        ("todo.test_user_dailies", "f2c85972-1a19-4426-bc6d-ce3337b9d99f"),
-    ],
-    ids=["todo", "daily"],
-)
-async def test_complete_todo_item(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    snapshot: SnapshotAssertion,
-    entity_id: str,
-    uid: str,
-) -> None:
-    """Test completing an item on the todo list."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/{uid}/score/up",
-        json=load_json_object_fixture("score_with_drop.json", DOMAIN),
-    )
-    await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.UPDATE_ITEM,
-        {ATTR_ITEM: uid, ATTR_STATUS: "completed"},
-        target={ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-
-    assert mock_called_with(
-        mock_habitica, "post", f"{DEFAULT_URL}/api/v3/tasks/{uid}/score/up"
-    )
-
-    # Test notification for item drop
-    notifications = async_get_persistent_notifications(hass)
-    assert len(notifications) == 1
-    _id, *_ = notifications
-    assert snapshot == (notifications[_id]["title"], notifications[_id]["message"])
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "uid"),
-    [
-        ("todo.test_user_to_do_s", "162f0bbe-a097-4a06-b4f4-8fbeed85d2ba"),
-        ("todo.test_user_dailies", "564b9ac9-c53d-4638-9e7f-1cd96fe19baa"),
-    ],
-    ids=["todo", "daily"],
-)
-async def test_uncomplete_todo_item(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    entity_id: str,
-    uid: str,
-) -> None:
-    """Test uncompleting an item on the todo list."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/{uid}/score/down",
-        json={"data": {}, "success": True},
-    )
-    await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.UPDATE_ITEM,
-        {ATTR_ITEM: uid, ATTR_STATUS: "needs_action"},
-        target={ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-
-    assert mock_called_with(
-        mock_habitica, "post", f"{DEFAULT_URL}/api/v3/tasks/{uid}/score/down"
-    )
-
-
-@pytest.mark.parametrize(
-    ("uid", "status"),
-    [
-        ("88de7cd9-af2b-49ce-9afd-bf941d87336b", "completed"),
-        ("162f0bbe-a097-4a06-b4f4-8fbeed85d2ba", "needs_action"),
-    ],
-    ids=["completed", "needs_action"],
-)
-async def test_complete_todo_item_exception(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    uid: str,
-    status: str,
-) -> None:
-    """Test exception when completing/uncompleting an item on the todo list."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        re.compile(f"{DEFAULT_URL}/api/v3/tasks/{uid}/score/.+"),
-        status=HTTPStatus.NOT_FOUND,
-    )
-    with pytest.raises(
-        expected_exception=ServiceValidationError,
-        match=r"Unable to update the score for your Habitica to-do `.+`, please try again",
-    ):
-        await hass.services.async_call(
-            TODO_DOMAIN,
-            TodoServices.UPDATE_ITEM,
-            {ATTR_ITEM: uid, ATTR_STATUS: status},
-            target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-            blocking=True,
-        )
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "uid", "date"),
-    [
-        (
-            "todo.test_user_to_do_s",
-            "88de7cd9-af2b-49ce-9afd-bf941d87336b",
-            "2024-07-30",
-        ),
-        (
-            "todo.test_user_dailies",
-            "f2c85972-1a19-4426-bc6d-ce3337b9d99f",
-            None,
-        ),
-    ],
-    ids=["todo", "daily"],
-)
-async def test_update_todo_item(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    entity_id: str,
-    uid: str,
-    date: str,
-) -> None:
-    """Test update details of a item on the todo list."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.put(
-        f"{DEFAULT_URL}/api/v3/tasks/{uid}",
-        json={"data": {}, "success": True},
-    )
-    await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.UPDATE_ITEM,
-        {
-            ATTR_ITEM: uid,
-            ATTR_RENAME: "test-summary",
-            ATTR_DESCRIPTION: "test-description",
-            ATTR_DUE_DATE: date,
-        },
-        target={ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-
-    mock_call = mock_called_with(
-        mock_habitica, "PUT", f"{DEFAULT_URL}/api/v3/tasks/{uid}"
-    )
-    assert mock_call
-    assert json.loads(mock_call[2]) == {
-        "date": date,
-        "notes": "test-description",
-        "text": "test-summary",
-    }
-
-
-async def test_update_todo_item_exception(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test exception when update item on the todo list."""
-    uid = "88de7cd9-af2b-49ce-9afd-bf941d87336b"
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.put(
-        f"{DEFAULT_URL}/api/v3/tasks/{uid}",
-        status=HTTPStatus.NOT_FOUND,
-    )
-    with pytest.raises(
-        expected_exception=ServiceValidationError,
-        match="Unable to update the Habitica to-do `test-summary`, please try again",
-    ):
-        await hass.services.async_call(
-            TODO_DOMAIN,
-            TodoServices.UPDATE_ITEM,
-            {
-                ATTR_ITEM: uid,
-                ATTR_RENAME: "test-summary",
-                ATTR_DESCRIPTION: "test-description",
-                ATTR_DUE_DATE: "2024-07-30",
-            },
-            target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-            blocking=True,
-        )
-
-
-async def test_add_todo_item(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test add a todo item to the todo list."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        json={"data": {}, "success": True},
-        status=HTTPStatus.CREATED,
-    )
-    await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.ADD_ITEM,
-        {
-            ATTR_ITEM: "test-summary",
-            ATTR_DESCRIPTION: "test-description",
-            ATTR_DUE_DATE: "2024-07-30",
-        },
-        target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-        blocking=True,
-    )
-
-    mock_call = mock_called_with(
-        mock_habitica,
-        "post",
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-    )
-    assert mock_call
-    assert json.loads(mock_call[2]) == {
-        "date": "2024-07-30",
-        "notes": "test-description",
-        "text": "test-summary",
-        "type": "todo",
-    }
-
-
-async def test_add_todo_item_exception(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test exception when adding a todo item to the todo list."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        status=HTTPStatus.NOT_FOUND,
-    )
-    with pytest.raises(
-        expected_exception=ServiceValidationError,
-        match="Unable to create new to-do `test-summary` for Habitica, please try again",
-    ):
-        await hass.services.async_call(
-            TODO_DOMAIN,
-            TodoServices.ADD_ITEM,
-            {
-                ATTR_ITEM: "test-summary",
-                ATTR_DESCRIPTION: "test-description",
-                ATTR_DUE_DATE: "2024-07-30",
-            },
-            target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-            blocking=True,
-        )
-
-
-async def test_delete_todo_item(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test deleting a todo item from the todo list."""
-
-    uid = "2f6fcabc-f670-4ec3-ba65-817e8deea490"
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.delete(
-        f"{DEFAULT_URL}/api/v3/tasks/{uid}",
-        json={"data": {}, "success": True},
-    )
-    await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.REMOVE_ITEM,
-        {ATTR_ITEM: uid},
-        target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-        blocking=True,
-    )
-
-    assert mock_called_with(
-        mock_habitica, "delete", f"{DEFAULT_URL}/api/v3/tasks/{uid}"
-    )
-
-
-async def test_delete_todo_item_exception(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test exception when deleting a todo item from the todo list."""
-
-    uid = "2f6fcabc-f670-4ec3-ba65-817e8deea490"
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.delete(
-        f"{DEFAULT_URL}/api/v3/tasks/{uid}",
-        status=HTTPStatus.NOT_FOUND,
-    )
-    with pytest.raises(
-        expected_exception=ServiceValidationError,
-        match="Unable to delete item from Habitica to-do list, please try again",
-    ):
-        await hass.services.async_call(
-            TODO_DOMAIN,
-            TodoServices.REMOVE_ITEM,
-            {ATTR_ITEM: uid},
-            target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-            blocking=True,
-        )
-
-
-async def test_delete_completed_todo_items(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test deleting completed todo items from the todo list."""
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/clearCompletedTodos",
-        json={"data": {}, "success": True},
-    )
-    await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.REMOVE_COMPLETED_ITEMS,
-        {},
-        target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-        blocking=True,
-    )
-
-    assert mock_called_with(
-        mock_habitica, "post", f"{DEFAULT_URL}/api/v3/tasks/clearCompletedTodos"
-    )
-
-
-async def test_delete_completed_todo_items_exception(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-) -> None:
-    """Test exception when deleting completed todo items from the todo list."""
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/clearCompletedTodos",
-        status=HTTPStatus.NOT_FOUND,
-    )
-    with pytest.raises(
-        expected_exception=ServiceValidationError,
-        match="Unable to delete completed to-do items from Habitica to-do list, please try again",
-    ):
-        await hass.services.async_call(
-            TODO_DOMAIN,
-            TodoServices.REMOVE_COMPLETED_ITEMS,
-            {},
-            target={ATTR_ENTITY_ID: "todo.test_user_to_do_s"},
-            blocking=True,
-        )
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "uid", "previous_uid"),
-    [
-        (
-            "todo.test_user_to_do_s",
-            "1aa3137e-ef72-4d1f-91ee-41933602f438",
-            "88de7cd9-af2b-49ce-9afd-bf941d87336b",
-        ),
-        (
-            "todo.test_user_dailies",
-            "2c6d136c-a1c3-4bef-b7c4-fa980784b1e1",
-            "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
-        ),
-    ],
-    ids=["todo", "daily"],
-)
-async def test_move_todo_item(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    hass_ws_client: WebSocketGenerator,
-    entity_id: str,
-    uid: str,
-    previous_uid: str,
-) -> None:
-    """Test move todo items."""
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    for pos in (0, 1):
-        mock_habitica.post(
-            f"{DEFAULT_URL}/api/v3/tasks/{uid}/move/to/{pos}",
-            json={"data": {}, "success": True},
-        )
-
-    client = await hass_ws_client()
-    # move to second position
-    data = {
-        "id": id,
-        "type": "todo/item/move",
-        "entity_id": entity_id,
-        "uid": uid,
-        "previous_uid": previous_uid,
-    }
-    await client.send_json_auto_id(data)
-    resp = await client.receive_json()
-    assert resp.get("success")
-
-    # move to top position
-    data = {
-        "id": id,
-        "type": "todo/item/move",
-        "entity_id": entity_id,
-        "uid": uid,
-    }
-    await client.send_json_auto_id(data)
-    resp = await client.receive_json()
-    assert resp.get("success")
-
-    for pos in (0, 1):
-        assert mock_called_with(
-            mock_habitica,
-            "post",
-            f"{DEFAULT_URL}/api/v3/tasks/{uid}/move/to/{pos}",
-        )
-
-
-async def test_move_todo_item_exception(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    mock_habitica: AiohttpClientMocker,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test exception when moving todo item."""
-
-    uid = "1aa3137e-ef72-4d1f-91ee-41933602f438"
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    mock_habitica.post(
-        f"{DEFAULT_URL}/api/v3/tasks/{uid}/move/to/0",
-        status=HTTPStatus.NOT_FOUND,
-    )
-
-    client = await hass_ws_client()
-
-    data = {
-        "id": id,
-        "type": "todo/item/move",
-        "entity_id": "todo.test_user_to_do_s",
-        "uid": uid,
-    }
-    await client.send_json_auto_id(data)
-    resp = await client.receive_json()
-    assert resp.get("success") is False
-
-
-@pytest.mark.parametrize(
-    ("fixture", "calculated_due_date"),
-    [
-        ("duedate_fixture_1.json", (2024, 9, 23)),
-        ("duedate_fixture_2.json", (2024, 9, 24)),
-        ("duedate_fixture_3.json", (2024, 10, 23)),
-        ("duedate_fixture_4.json", (2024, 10, 23)),
-        ("duedate_fixture_5.json", (2024, 9, 28)),
-        ("duedate_fixture_6.json", (2024, 10, 21)),
-        ("duedate_fixture_7.json", None),
-        ("duedate_fixture_8.json", None),
-    ],
-    ids=[
-        "default",
-        "daily starts on startdate",
-        "monthly starts on startdate",
-        "yearly starts on startdate",
-        "weekly",
-        "monthly starts on fixed day",
-        "grey daily",
-        "empty nextDue",
-    ],
-)
-@pytest.mark.usefixtures("set_tz")
-async def test_next_due_date(
-    hass: HomeAssistant,
-    fixture: str,
-    calculated_due_date: tuple | None,
-    config_entry: MockConfigEntry,
-    aioclient_mock: AiohttpClientMocker,
-) -> None:
-    """Test next_due_date calculation."""
-
-    dailies_entity = "todo.test_user_dailies"
-
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/user", json=load_json_object_fixture("user.json", DOMAIN)
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        params={"type": "completedTodos"},
-        json={"data": []},
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/tasks/user",
-        json=load_json_object_fixture(fixture, DOMAIN),
-    )
-    aioclient_mock.get(
-        f"{DEFAULT_URL}/api/v3/content",
-        params={"language": "en"},
-        json=load_json_object_fixture("content.json", DOMAIN),
-    )
-
-    config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    result = await hass.services.async_call(
-        TODO_DOMAIN,
-        TodoServices.GET_ITEMS,
-        {},
-        target={ATTR_ENTITY_ID: dailies_entity},
-        blocking=True,
-        return_response=True,
-    )
-
-    assert (
-        result[dailies_entity]["items"][0].get("due") is None
-        if not calculated_due_date
-        else datetime(*calculated_due_date).date()
-    )
diff --git a/tests/components/hassio/common.py b/tests/components/hassio/common.py
index 82d3564440b..25178467b38 100644
--- a/tests/components/hassio/common.py
+++ b/tests/components/hassio/common.py
@@ -7,7 +7,7 @@ from dataclasses import fields
 import logging
 from types import MethodType
 from typing import Any
-from unittest.mock import AsyncMock, Mock, patch
+from unittest.mock import DEFAULT, AsyncMock, Mock, patch
 
 from aiohasupervisor.models import (
     AddonsOptions,
@@ -75,6 +75,23 @@ def mock_addon_manager(hass: HomeAssistant) -> AddonManager:
     return AddonManager(hass, LOGGER, "Test", "test_addon")
 
 
+def mock_discovery_info() -> Any:
+    """Return the discovery info from the supervisor."""
+    return DEFAULT
+
+
+def mock_get_addon_discovery_info(
+    discovery_info: dict[str, Any], discovery_info_side_effect: Any | None
+) -> Generator[AsyncMock]:
+    """Mock get add-on discovery info."""
+    with patch(
+        "homeassistant.components.hassio.addon_manager.async_get_addon_discovery_info",
+        side_effect=discovery_info_side_effect,
+        return_value=discovery_info,
+    ) as get_addon_discovery_info:
+        yield get_addon_discovery_info
+
+
 def mock_addon_store_info(
     supervisor_client: AsyncMock,
     addon_store_info_side_effect: Any | None,
diff --git a/tests/components/hassio/conftest.py b/tests/components/hassio/conftest.py
index 7075b9d6982..654275ece98 100644
--- a/tests/components/hassio/conftest.py
+++ b/tests/components/hassio/conftest.py
@@ -32,10 +32,14 @@ def disable_security_filter() -> Generator[None]:
 
 
 @pytest.fixture
-def hassio_env(supervisor_is_connected: AsyncMock) -> Generator[None]:
+def hassio_env() -> Generator[None]:
     """Fixture to inject hassio env."""
     with (
         patch.dict(os.environ, {"SUPERVISOR": "127.0.0.1"}),
+        patch(
+            "homeassistant.components.hassio.HassIO.is_connected",
+            return_value={"result": "ok", "data": {}},
+        ),
         patch.dict(os.environ, {"SUPERVISOR_TOKEN": SUPERVISOR_TOKEN}),
         patch(
             "homeassistant.components.hassio.HassIO.get_info",
@@ -74,6 +78,9 @@ def hassio_stubs(
         patch(
             "homeassistant.components.hassio.issues.SupervisorIssues.setup",
         ),
+        patch(
+            "homeassistant.components.hassio.HassIO.refresh_updates",
+        ),
     ):
         hass.set_state(CoreState.starting)
         hass.loop.run_until_complete(async_setup_component(hass, "hassio", {}))
@@ -137,6 +144,7 @@ def all_setup_requests(
     )
 
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -217,6 +225,7 @@ def all_setup_requests(
     aioclient_mock.get(
         "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"})
 
     addon_installed.return_value.update_available = False
     addon_installed.return_value.version = "1.0.0"
diff --git a/tests/components/hassio/test_addon_manager.py b/tests/components/hassio/test_addon_manager.py
index 3d4644fbfd9..9c053c284c1 100644
--- a/tests/components/hassio/test_addon_manager.py
+++ b/tests/components/hassio/test_addon_manager.py
@@ -5,10 +5,9 @@ from __future__ import annotations
 import asyncio
 from typing import Any
 from unittest.mock import AsyncMock, call
-from uuid import uuid4
 
 from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import AddonsOptions, Discovery
+from aiohasupervisor.models import AddonsOptions
 import pytest
 
 from homeassistant.components.hassio.addon_manager import (
@@ -63,11 +62,7 @@ async def test_get_addon_discovery_info(
     addon_manager: AddonManager, get_addon_discovery_info: AsyncMock
 ) -> None:
     """Test get addon discovery info."""
-    get_addon_discovery_info.return_value = [
-        Discovery(
-            addon="test_addon", service="", uuid=uuid4(), config={"test_key": "test"}
-        )
-    ]
+    get_addon_discovery_info.return_value = {"config": {"test_key": "test"}}
 
     assert await addon_manager.async_get_addon_discovery_info() == {"test_key": "test"}
 
@@ -78,6 +73,8 @@ async def test_missing_addon_discovery_info(
     addon_manager: AddonManager, get_addon_discovery_info: AsyncMock
 ) -> None:
     """Test missing addon discovery info."""
+    get_addon_discovery_info.return_value = None
+
     with pytest.raises(AddonError):
         await addon_manager.async_get_addon_discovery_info()
 
@@ -88,7 +85,7 @@ async def test_get_addon_discovery_info_error(
     addon_manager: AddonManager, get_addon_discovery_info: AsyncMock
 ) -> None:
     """Test get addon discovery info raises error."""
-    get_addon_discovery_info.side_effect = SupervisorError("Boom")
+    get_addon_discovery_info.side_effect = HassioAPIError("Boom")
 
     with pytest.raises(AddonError) as err:
         assert await addon_manager.async_get_addon_discovery_info()
diff --git a/tests/components/hassio/test_addon_panel.py b/tests/components/hassio/test_addon_panel.py
index 2c3552c8d08..f7407152f7e 100644
--- a/tests/components/hassio/test_addon_panel.py
+++ b/tests/components/hassio/test_addon_panel.py
@@ -1,7 +1,7 @@
 """Test add-on panel."""
 
 from http import HTTPStatus
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 
@@ -13,11 +13,10 @@ from tests.typing import ClientSessionGenerator
 
 
 @pytest.fixture(autouse=True)
-def mock_all(
-    aioclient_mock: AiohttpClientMocker, supervisor_is_connected: AsyncMock
-) -> None:
+def mock_all(aioclient_mock: AiohttpClientMocker) -> None:
     """Mock all setup requests."""
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/homeassistant/info",
diff --git a/tests/components/hassio/test_binary_sensor.py b/tests/components/hassio/test_binary_sensor.py
index 9878dd67a21..1cfc9defcb8 100644
--- a/tests/components/hassio/test_binary_sensor.py
+++ b/tests/components/hassio/test_binary_sensor.py
@@ -25,10 +25,10 @@ def mock_all(
     store_info: AsyncMock,
     addon_changelog: AsyncMock,
     addon_stats: AsyncMock,
-    resolution_info: AsyncMock,
 ) -> None:
     """Mock all setup requests."""
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -141,6 +141,20 @@ def mock_all(
     aioclient_mock.get(
         "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/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [],
+                "checks": [],
+            },
+        },
+    )
     aioclient_mock.get(
         "http://127.0.0.1/network/info",
         json={
diff --git a/tests/components/hassio/test_diagnostics.py b/tests/components/hassio/test_diagnostics.py
index c95cde67b8a..64beb30f4e2 100644
--- a/tests/components/hassio/test_diagnostics.py
+++ b/tests/components/hassio/test_diagnostics.py
@@ -24,10 +24,10 @@ def mock_all(
     store_info: AsyncMock,
     addon_stats: AsyncMock,
     addon_changelog: AsyncMock,
-    resolution_info: AsyncMock,
 ) -> None:
     """Mock all setup requests."""
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -144,6 +144,20 @@ def mock_all(
     aioclient_mock.get(
         "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/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [],
+                "checks": [],
+            },
+        },
+    )
     aioclient_mock.get(
         "http://127.0.0.1/network/info",
         json={
diff --git a/tests/components/hassio/test_discovery.py b/tests/components/hassio/test_discovery.py
index ba6338f84e2..021be51f1c4 100644
--- a/tests/components/hassio/test_discovery.py
+++ b/tests/components/hassio/test_discovery.py
@@ -3,19 +3,17 @@
 from collections.abc import Generator
 from http import HTTPStatus
 from unittest.mock import AsyncMock, Mock, patch
-from uuid import uuid4
 
-from aiohasupervisor.models import Discovery
 from aiohttp.test_utils import TestClient
 import pytest
 
 from homeassistant import config_entries
+from homeassistant.components.hassio.discovery import HassioServiceInfo
 from homeassistant.components.hassio.handler import HassioAPIError
 from homeassistant.components.mqtt import DOMAIN as MQTT_DOMAIN
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STARTED
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.discovery_flow import DiscoveryKey
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
@@ -50,34 +48,42 @@ def mock_mqtt_fixture(
 @pytest.mark.usefixtures("hassio_client")
 async def test_hassio_discovery_startup(
     hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
     mock_mqtt: type[config_entries.ConfigFlow],
     addon_installed: AsyncMock,
-    get_addon_discovery_info: AsyncMock,
 ) -> None:
     """Test startup and discovery after event."""
-    get_addon_discovery_info.return_value = [
-        Discovery(
-            addon="mosquitto",
-            service="mqtt",
-            uuid=(uuid := uuid4()),
-            config={
-                "broker": "mock-broker",
-                "port": 1883,
-                "username": "mock-user",
-                "password": "mock-pass",
-                "protocol": "3.1.1",
+    aioclient_mock.get(
+        "http://127.0.0.1/discovery",
+        json={
+            "result": "ok",
+            "data": {
+                "discovery": [
+                    {
+                        "service": "mqtt",
+                        "uuid": "test",
+                        "addon": "mosquitto",
+                        "config": {
+                            "broker": "mock-broker",
+                            "port": 1883,
+                            "username": "mock-user",
+                            "password": "mock-pass",
+                            "protocol": "3.1.1",
+                        },
+                    }
+                ]
             },
-        )
-    ]
+        },
+    )
     addon_installed.return_value.name = "Mosquitto Test"
 
-    assert get_addon_discovery_info.call_count == 0
+    assert aioclient_mock.call_count == 0
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
     await hass.async_block_till_done()
     hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
     await hass.async_block_till_done()
-    assert get_addon_discovery_info.call_count == 1
+    assert aioclient_mock.call_count == 1
     assert mock_mqtt.async_step_hassio.called
     mock_mqtt.async_step_hassio.assert_called_with(
         HassioServiceInfo(
@@ -91,7 +97,7 @@ async def test_hassio_discovery_startup(
             },
             name="Mosquitto Test",
             slug="mosquitto",
-            uuid=uuid.hex,
+            uuid="test",
         )
     )
 
@@ -102,27 +108,34 @@ async def test_hassio_discovery_startup_done(
     aioclient_mock: AiohttpClientMocker,
     mock_mqtt: type[config_entries.ConfigFlow],
     addon_installed: AsyncMock,
-    get_addon_discovery_info: AsyncMock,
 ) -> None:
     """Test startup and discovery with hass discovery."""
     aioclient_mock.post(
         "http://127.0.0.1/supervisor/options",
         json={"result": "ok", "data": {}},
     )
-    get_addon_discovery_info.return_value = [
-        Discovery(
-            addon="mosquitto",
-            service="mqtt",
-            uuid=(uuid := uuid4()),
-            config={
-                "broker": "mock-broker",
-                "port": 1883,
-                "username": "mock-user",
-                "password": "mock-pass",
-                "protocol": "3.1.1",
+    aioclient_mock.get(
+        "http://127.0.0.1/discovery",
+        json={
+            "result": "ok",
+            "data": {
+                "discovery": [
+                    {
+                        "service": "mqtt",
+                        "uuid": "test",
+                        "addon": "mosquitto",
+                        "config": {
+                            "broker": "mock-broker",
+                            "port": 1883,
+                            "username": "mock-user",
+                            "password": "mock-pass",
+                            "protocol": "3.1.1",
+                        },
+                    }
+                ]
             },
-        )
-    ]
+        },
+    )
     addon_installed.return_value.name = "Mosquitto Test"
 
     with (
@@ -139,7 +152,7 @@ async def test_hassio_discovery_startup_done(
         await async_setup_component(hass, "hassio", {})
         await hass.async_block_till_done()
 
-        assert get_addon_discovery_info.call_count == 1
+        assert aioclient_mock.call_count == 1
         assert mock_mqtt.async_step_hassio.called
         mock_mqtt.async_step_hassio.assert_called_with(
             HassioServiceInfo(
@@ -153,43 +166,49 @@ async def test_hassio_discovery_startup_done(
                 },
                 name="Mosquitto Test",
                 slug="mosquitto",
-                uuid=uuid.hex,
+                uuid="test",
             )
         )
 
 
 async def test_hassio_discovery_webhook(
     hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
     hassio_client: TestClient,
     mock_mqtt: type[config_entries.ConfigFlow],
     addon_installed: AsyncMock,
-    get_discovery_message: AsyncMock,
 ) -> None:
     """Test discovery webhook."""
-    get_discovery_message.return_value = Discovery(
-        addon="mosquitto",
-        service="mqtt",
-        uuid=(uuid := uuid4()),
-        config={
-            "broker": "mock-broker",
-            "port": 1883,
-            "username": "mock-user",
-            "password": "mock-pass",
-            "protocol": "3.1.1",
+    aioclient_mock.get(
+        "http://127.0.0.1/discovery/testuuid",
+        json={
+            "result": "ok",
+            "data": {
+                "service": "mqtt",
+                "uuid": "test",
+                "addon": "mosquitto",
+                "config": {
+                    "broker": "mock-broker",
+                    "port": 1883,
+                    "username": "mock-user",
+                    "password": "mock-pass",
+                    "protocol": "3.1.1",
+                },
+            },
         },
     )
     addon_installed.return_value.name = "Mosquitto Test"
 
     resp = await hassio_client.post(
-        f"/api/hassio_push/discovery/{uuid!s}",
-        json={"addon": "mosquitto", "service": "mqtt", "uuid": str(uuid)},
+        "/api/hassio_push/discovery/testuuid",
+        json={"addon": "mosquitto", "service": "mqtt", "uuid": "testuuid"},
     )
     await hass.async_block_till_done()
     hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
     await hass.async_block_till_done()
 
     assert resp.status == HTTPStatus.OK
-    assert get_discovery_message.call_count == 1
+    assert aioclient_mock.call_count == 1
     assert mock_mqtt.async_step_hassio.called
     mock_mqtt.async_step_hassio.assert_called_with(
         HassioServiceInfo(
@@ -203,14 +222,11 @@ async def test_hassio_discovery_webhook(
             },
             name="Mosquitto Test",
             slug="mosquitto",
-            uuid=uuid.hex,
+            uuid="test",
         )
     )
 
 
-TEST_UUID = str(uuid4())
-
-
 @pytest.mark.parametrize(
     (
         "entry_domain",
@@ -220,13 +236,13 @@ TEST_UUID = str(uuid4())
         # Matching discovery key
         (
             "mock-domain",
-            {"hassio": (DiscoveryKey(domain="hassio", key=TEST_UUID, version=1),)},
+            {"hassio": (DiscoveryKey(domain="hassio", key="test", version=1),)},
         ),
         # Matching discovery key
         (
             "mock-domain",
             {
-                "hassio": (DiscoveryKey(domain="hassio", key=TEST_UUID, version=1),),
+                "hassio": (DiscoveryKey(domain="hassio", key="test", version=1),),
                 "other": (DiscoveryKey(domain="other", key="blah", version=1),),
             },
         ),
@@ -235,7 +251,7 @@ TEST_UUID = str(uuid4())
         # entry. Such a check can be added if needed.
         (
             "comp",
-            {"hassio": (DiscoveryKey(domain="hassio", key=TEST_UUID, version=1),)},
+            {"hassio": (DiscoveryKey(domain="hassio", key="test", version=1),)},
         ),
     ],
 )
@@ -255,8 +271,6 @@ async def test_hassio_rediscover(
     entry_domain: str,
     entry_discovery_keys: dict[str, tuple[DiscoveryKey, ...]],
     entry_source: str,
-    get_addon_discovery_info: AsyncMock,
-    get_discovery_message: AsyncMock,
 ) -> None:
     """Test we reinitiate flows when an ignored config entry is removed."""
 
@@ -272,21 +286,30 @@ async def test_hassio_rediscover(
     )
     entry.add_to_hass(hass)
 
-    get_discovery_message.return_value = Discovery(
-        addon="mosquitto",
-        service="mqtt",
-        uuid=(uuid := uuid4()),
-        config={
-            "broker": "mock-broker",
-            "port": 1883,
-            "username": "mock-user",
-            "password": "mock-pass",
-            "protocol": "3.1.1",
+    aioclient_mock.get(
+        "http://127.0.0.1/discovery/test",
+        json={
+            "result": "ok",
+            "data": {
+                "service": "mqtt",
+                "uuid": "test",
+                "addon": "mosquitto",
+                "config": {
+                    "broker": "mock-broker",
+                    "port": 1883,
+                    "username": "mock-user",
+                    "password": "mock-pass",
+                    "protocol": "3.1.1",
+                },
+            },
         },
     )
+    aioclient_mock.get(
+        "http://127.0.0.1/discovery", json={"result": "ok", "data": {"discovery": []}}
+    )
 
     expected_context = {
-        "discovery_key": DiscoveryKey(domain="hassio", key=uuid.hex, version=1),
+        "discovery_key": DiscoveryKey(domain="hassio", key="test", version=1),
         "source": config_entries.SOURCE_HASSIO,
     }
 
diff --git a/tests/components/hassio/test_handler.py b/tests/components/hassio/test_handler.py
index 56f0dcb706c..300e4104e97 100644
--- a/tests/components/hassio/test_handler.py
+++ b/tests/components/hassio/test_handler.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Literal
 
+import aiohttp
 from aiohttp import hdrs, web
 import pytest
 
@@ -15,6 +16,36 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 
+async def test_api_ping(
+    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test setup with API ping."""
+    aioclient_mock.get("http://127.0.0.1/supervisor/ping", json={"result": "ok"})
+
+    assert await hassio_handler.is_connected()
+    assert aioclient_mock.call_count == 1
+
+
+async def test_api_ping_error(
+    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test setup with API ping error."""
+    aioclient_mock.get("http://127.0.0.1/supervisor/ping", json={"result": "error"})
+
+    assert not (await hassio_handler.is_connected())
+    assert aioclient_mock.call_count == 1
+
+
+async def test_api_ping_exeption(
+    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test setup with API ping exception."""
+    aioclient_mock.get("http://127.0.0.1/supervisor/ping", exc=aiohttp.ClientError())
+
+    assert not (await hassio_handler.is_connected())
+    assert aioclient_mock.call_count == 1
+
+
 async def test_api_info(
     hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
 ) -> None:
@@ -150,6 +181,26 @@ async def test_api_core_info_error(
     assert aioclient_mock.call_count == 1
 
 
+async def test_api_homeassistant_stop(
+    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test setup with API Home Assistant stop."""
+    aioclient_mock.post("http://127.0.0.1/homeassistant/stop", json={"result": "ok"})
+
+    assert await hassio_handler.stop_homeassistant()
+    assert aioclient_mock.call_count == 1
+
+
+async def test_api_homeassistant_restart(
+    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test setup with API Home Assistant restart."""
+    aioclient_mock.post("http://127.0.0.1/homeassistant/restart", json={"result": "ok"})
+
+    assert await hassio_handler.restart_homeassistant()
+    assert aioclient_mock.call_count == 1
+
+
 async def test_api_core_stats(
     hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
 ) -> None:
@@ -178,6 +229,34 @@ async def test_api_supervisor_stats(
     assert aioclient_mock.call_count == 1
 
 
+async def test_api_discovery_message(
+    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test setup with API discovery message."""
+    aioclient_mock.get(
+        "http://127.0.0.1/discovery/test",
+        json={"result": "ok", "data": {"service": "mqtt"}},
+    )
+
+    data = await hassio_handler.get_discovery_message("test")
+    assert data["service"] == "mqtt"
+    assert aioclient_mock.call_count == 1
+
+
+async def test_api_retrieve_discovery(
+    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test setup with API discovery message."""
+    aioclient_mock.get(
+        "http://127.0.0.1/discovery",
+        json={"result": "ok", "data": {"discovery": [{"service": "mqtt"}]}},
+    )
+
+    data = await hassio_handler.retrieve_discovery_messages()
+    assert data["discovery"][-1]["service"] == "mqtt"
+    assert aioclient_mock.call_count == 1
+
+
 async def test_api_ingress_panels(
     hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
 ) -> None:
@@ -208,7 +287,8 @@ async def test_api_ingress_panels(
 @pytest.mark.parametrize(
     ("api_call", "method", "payload"),
     [
-        ("get_network_info", "GET", None),
+        ("retrieve_discovery_messages", "GET", None),
+        ("refresh_updates", "POST", None),
         ("update_diagnostics", "POST", True),
     ],
 )
diff --git a/tests/components/hassio/test_http.py b/tests/components/hassio/test_http.py
index 8ed59bc78d1..404c047a56c 100644
--- a/tests/components/hassio/test_http.py
+++ b/tests/components/hassio/test_http.py
@@ -82,9 +82,7 @@ async def test_forward_request_onboarded_user_unallowed_methods(
         # Unauthenticated path
         ("supervisor/info", HTTPStatus.UNAUTHORIZED),
         ("supervisor/logs", HTTPStatus.UNAUTHORIZED),
-        ("supervisor/logs/follow", HTTPStatus.UNAUTHORIZED),
         ("addons/bl_b392/logs", HTTPStatus.UNAUTHORIZED),
-        ("addons/bl_b392/logs/follow", HTTPStatus.UNAUTHORIZED),
     ],
 )
 async def test_forward_request_onboarded_user_unallowed_paths(
@@ -154,9 +152,7 @@ async def test_forward_request_onboarded_noauth_unallowed_methods(
         # Unauthenticated path
         ("supervisor/info", HTTPStatus.UNAUTHORIZED),
         ("supervisor/logs", HTTPStatus.UNAUTHORIZED),
-        ("supervisor/logs/follow", HTTPStatus.UNAUTHORIZED),
         ("addons/bl_b392/logs", HTTPStatus.UNAUTHORIZED),
-        ("addons/bl_b392/logs/follow", HTTPStatus.UNAUTHORIZED),
     ],
 )
 async def test_forward_request_onboarded_noauth_unallowed_paths(
@@ -269,9 +265,7 @@ async def test_forward_request_not_onboarded_unallowed_methods(
         # Unauthenticated path
         ("supervisor/info", HTTPStatus.UNAUTHORIZED),
         ("supervisor/logs", HTTPStatus.UNAUTHORIZED),
-        ("supervisor/logs/follow", HTTPStatus.UNAUTHORIZED),
         ("addons/bl_b392/logs", HTTPStatus.UNAUTHORIZED),
-        ("addons/bl_b392/logs/follow", HTTPStatus.UNAUTHORIZED),
     ],
 )
 async def test_forward_request_not_onboarded_unallowed_paths(
@@ -298,9 +292,7 @@ async def test_forward_request_not_onboarded_unallowed_paths(
         ("addons/bl_b392/icon", False),
         ("backups/1234abcd/info", True),
         ("supervisor/logs", True),
-        ("supervisor/logs/follow", True),
         ("addons/bl_b392/logs", True),
-        ("addons/bl_b392/logs/follow", True),
         ("addons/bl_b392/changelog", True),
         ("addons/bl_b392/documentation", True),
     ],
@@ -502,70 +494,3 @@ async def test_entrypoint_cache_control(
     assert resp1.headers["Cache-Control"] == "no-store, max-age=0"
 
     assert "Cache-Control" not in resp2.headers
-
-
-async def test_no_follow_logs_compress(
-    hassio_client: TestClient, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test that we do not compress follow logs."""
-    aioclient_mock.get("http://127.0.0.1/supervisor/logs/follow")
-    aioclient_mock.get("http://127.0.0.1/supervisor/logs")
-
-    resp1 = await hassio_client.get("/api/hassio/supervisor/logs/follow")
-    resp2 = await hassio_client.get("/api/hassio/supervisor/logs")
-
-    # Check we got right response
-    assert resp1.status == HTTPStatus.OK
-    assert resp1.headers.get("Content-Encoding") is None
-
-    assert resp2.status == HTTPStatus.OK
-    assert resp2.headers.get("Content-Encoding") == "deflate"
-
-
-async def test_forward_range_header_for_logs(
-    hassio_client: TestClient, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test that we forward the Range header for logs."""
-    aioclient_mock.get("http://127.0.0.1/host/logs")
-    aioclient_mock.get("http://127.0.0.1/host/logs/boots/-1")
-    aioclient_mock.get("http://127.0.0.1/host/logs/boots/-2/follow?lines=100")
-    aioclient_mock.get("http://127.0.0.1/addons/123abc_esphome/logs")
-    aioclient_mock.get("http://127.0.0.1/addons/123abc_esphome/logs/follow")
-    aioclient_mock.get("http://127.0.0.1/backups/1234abcd/download")
-
-    test_range = ":-100:50"
-
-    host_resp = await hassio_client.get(
-        "/api/hassio/host/logs", headers={"Range": test_range}
-    )
-    host_resp2 = await hassio_client.get(
-        "/api/hassio/host/logs/boots/-1", headers={"Range": test_range}
-    )
-    host_resp3 = await hassio_client.get(
-        "/api/hassio/host/logs/boots/-2/follow?lines=100", headers={"Range": test_range}
-    )
-    addon_resp = await hassio_client.get(
-        "/api/hassio/addons/123abc_esphome/logs", headers={"Range": test_range}
-    )
-    addon_resp2 = await hassio_client.get(
-        "/api/hassio/addons/123abc_esphome/logs/follow", headers={"Range": test_range}
-    )
-    backup_resp = await hassio_client.get(
-        "/api/hassio/backups/1234abcd/download", headers={"Range": test_range}
-    )
-
-    assert host_resp.status == HTTPStatus.OK
-    assert host_resp2.status == HTTPStatus.OK
-    assert host_resp3.status == HTTPStatus.OK
-    assert addon_resp.status == HTTPStatus.OK
-    assert addon_resp2.status == HTTPStatus.OK
-    assert backup_resp.status == HTTPStatus.OK
-
-    assert len(aioclient_mock.mock_calls) == 6
-
-    assert aioclient_mock.mock_calls[0][-1].get("Range") == test_range
-    assert aioclient_mock.mock_calls[1][-1].get("Range") == test_range
-    assert aioclient_mock.mock_calls[2][-1].get("Range") == test_range
-    assert aioclient_mock.mock_calls[3][-1].get("Range") == test_range
-    assert aioclient_mock.mock_calls[4][-1].get("Range") == test_range
-    assert aioclient_mock.mock_calls[5][-1].get("Range") is None
diff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py
index 5c11370ae74..9426b215179 100644
--- a/tests/components/hassio/test_init.py
+++ b/tests/components/hassio/test_init.py
@@ -1,42 +1,34 @@
 """The tests for the hassio component."""
 
 from datetime import timedelta
-import logging
 import os
 from typing import Any
 from unittest.mock import AsyncMock, patch
 
-from aiohasupervisor import SupervisorError
 from aiohasupervisor.models import AddonsStats
 import pytest
 from voluptuous import Invalid
 
 from homeassistant.auth.const import GROUP_ID_ADMIN
-from homeassistant.components import frontend, hassio
+from homeassistant.components import frontend
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
 from homeassistant.components.hassio import (
     ADDONS_COORDINATOR,
     DOMAIN,
     STORAGE_KEY,
     get_core_info,
-    get_supervisor_ip,
     hostname_from_addon_slug,
-    is_hassio as deprecated_is_hassio,
+    is_hassio,
 )
 from homeassistant.components.hassio.const import REQUEST_REFRESH_DELAY
+from homeassistant.components.hassio.handler import HassioAPIError
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, issue_registry as ir
-from homeassistant.helpers.hassio import is_hassio
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import (
-    MockConfigEntry,
-    async_fire_time_changed,
-    import_and_test_deprecated_constant,
-)
+from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 MOCK_ENVIRON = {"SUPERVISOR": "127.0.0.1", "SUPERVISOR_TOKEN": "abcdefgh"}
@@ -67,10 +59,10 @@ def mock_all(
     addon_info: AsyncMock,
     addon_stats: AsyncMock,
     addon_changelog: AsyncMock,
-    resolution_info: AsyncMock,
 ) -> None:
     """Mock all setup requests."""
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -205,6 +197,20 @@ def mock_all(
     aioclient_mock.get(
         "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/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [],
+                "checks": [],
+            },
+        },
+    )
     aioclient_mock.get(
         "http://127.0.0.1/network/info",
         json={
@@ -276,9 +282,9 @@ async def test_setup_api_push_api_data(
 
     assert result
     assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 20
-    assert not aioclient_mock.mock_calls[0][2]["ssl"]
-    assert aioclient_mock.mock_calls[0][2]["port"] == 9999
-    assert "watchdog" not in aioclient_mock.mock_calls[0][2]
+    assert not aioclient_mock.mock_calls[1][2]["ssl"]
+    assert aioclient_mock.mock_calls[1][2]["port"] == 9999
+    assert "watchdog" not in aioclient_mock.mock_calls[1][2]
 
 
 async def test_setup_api_push_api_data_server_host(
@@ -297,9 +303,9 @@ async def test_setup_api_push_api_data_server_host(
 
     assert result
     assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 20
-    assert not aioclient_mock.mock_calls[0][2]["ssl"]
-    assert aioclient_mock.mock_calls[0][2]["port"] == 9999
-    assert not aioclient_mock.mock_calls[0][2]["watchdog"]
+    assert not aioclient_mock.mock_calls[1][2]["ssl"]
+    assert aioclient_mock.mock_calls[1][2]["port"] == 9999
+    assert not aioclient_mock.mock_calls[1][2]["watchdog"]
 
 
 async def test_setup_api_push_api_data_default(
@@ -315,9 +321,9 @@ async def test_setup_api_push_api_data_default(
 
     assert result
     assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 20
-    assert not aioclient_mock.mock_calls[0][2]["ssl"]
-    assert aioclient_mock.mock_calls[0][2]["port"] == 8123
-    refresh_token = aioclient_mock.mock_calls[0][2]["refresh_token"]
+    assert not aioclient_mock.mock_calls[1][2]["ssl"]
+    assert aioclient_mock.mock_calls[1][2]["port"] == 8123
+    refresh_token = aioclient_mock.mock_calls[1][2]["refresh_token"]
     hassio_user = await hass.auth.async_get_user(
         hass_storage[STORAGE_KEY]["data"]["hassio_user"]
     )
@@ -396,9 +402,9 @@ async def test_setup_api_existing_hassio_user(
 
     assert result
     assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 20
-    assert not aioclient_mock.mock_calls[0][2]["ssl"]
-    assert aioclient_mock.mock_calls[0][2]["port"] == 8123
-    assert aioclient_mock.mock_calls[0][2]["refresh_token"] == token.token
+    assert not aioclient_mock.mock_calls[1][2]["ssl"]
+    assert aioclient_mock.mock_calls[1][2]["port"] == 8123
+    assert aioclient_mock.mock_calls[1][2]["refresh_token"] == token.token
 
 
 async def test_setup_core_push_timezone(
@@ -415,7 +421,7 @@ async def test_setup_core_push_timezone(
 
     assert result
     assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 20
-    assert aioclient_mock.mock_calls[1][2]["timezone"] == "testzone"
+    assert aioclient_mock.mock_calls[2][2]["timezone"] == "testzone"
 
     with patch("homeassistant.util.dt.set_default_time_zone"):
         await hass.config.async_update(time_zone="America/New_York")
@@ -449,13 +455,16 @@ async def test_fail_setup_without_environ_var(hass: HomeAssistant) -> None:
 
 
 async def test_warn_when_cannot_connect(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    supervisor_is_connected: AsyncMock,
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Fail warn when we cannot connect."""
-    supervisor_is_connected.side_effect = SupervisorError
-    with patch.dict(os.environ, MOCK_ENVIRON):
+    with (
+        patch.dict(os.environ, MOCK_ENVIRON),
+        patch(
+            "homeassistant.components.hassio.HassIO.is_connected",
+            return_value=None,
+        ),
+    ):
         result = await async_setup_component(hass, "hassio", {})
         assert result
 
@@ -487,13 +496,17 @@ async def test_service_calls(
     aioclient_mock: AiohttpClientMocker,
     caplog: pytest.LogCaptureFixture,
     supervisor_client: AsyncMock,
-    addon_installed: AsyncMock,
-    supervisor_is_connected: AsyncMock,
+    addon_installed,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Call service and check the API calls behind that."""
-    supervisor_is_connected.side_effect = SupervisorError
-    with patch.dict(os.environ, MOCK_ENVIRON):
+    with (
+        patch.dict(os.environ, MOCK_ENVIRON),
+        patch(
+            "homeassistant.components.hassio.HassIO.is_connected",
+            return_value=None,
+        ),
+    ):
         assert await async_setup_component(hass, "hassio", {})
         await hass.async_block_till_done()
 
@@ -523,14 +536,14 @@ async def test_service_calls(
     )
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 25
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 24
     assert aioclient_mock.mock_calls[-1][2] == "test"
 
     await hass.services.async_call("hassio", "host_shutdown", {})
     await hass.services.async_call("hassio", "host_reboot", {})
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 27
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 26
 
     await hass.services.async_call("hassio", "backup_full", {})
     await hass.services.async_call(
@@ -545,7 +558,7 @@ async def test_service_calls(
     )
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 29
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 28
     assert aioclient_mock.mock_calls[-1][2] == {
         "name": "2021-11-13 03:48:00",
         "homeassistant": True,
@@ -570,7 +583,7 @@ async def test_service_calls(
     )
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 31
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 30
     assert aioclient_mock.mock_calls[-1][2] == {
         "addons": ["test"],
         "folders": ["ssl"],
@@ -589,7 +602,7 @@ async def test_service_calls(
     )
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 32
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 31
     assert aioclient_mock.mock_calls[-1][2] == {
         "name": "backup_name",
         "location": "backup_share",
@@ -605,7 +618,7 @@ async def test_service_calls(
     )
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 33
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 32
     assert aioclient_mock.mock_calls[-1][2] == {
         "name": "2021-11-13 03:48:00",
         "location": None,
@@ -624,7 +637,7 @@ async def test_service_calls(
     )
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 35
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 34
     assert aioclient_mock.mock_calls[-1][2] == {
         "name": "2021-11-13 11:48:00",
         "location": None,
@@ -634,11 +647,15 @@ async def test_service_calls(
 async def test_invalid_service_calls(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
-    supervisor_is_connected: AsyncMock,
 ) -> None:
     """Call service with invalid input and check that it raises."""
-    supervisor_is_connected.side_effect = SupervisorError
-    with patch.dict(os.environ, MOCK_ENVIRON):
+    with (
+        patch.dict(os.environ, MOCK_ENVIRON),
+        patch(
+            "homeassistant.components.hassio.HassIO.is_connected",
+            return_value=None,
+        ),
+    ):
         assert await async_setup_component(hass, "hassio", {})
         await hass.async_block_till_done()
 
@@ -655,7 +672,6 @@ async def test_invalid_service_calls(
 async def test_addon_service_call_with_complex_slug(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
-    supervisor_is_connected: AsyncMock,
 ) -> None:
     """Addon slugs can have ., - and _, confirm that passes validation."""
     supervisor_mock_data = {
@@ -675,9 +691,12 @@ async def test_addon_service_call_with_complex_slug(
             },
         ],
     }
-    supervisor_is_connected.side_effect = SupervisorError
     with (
         patch.dict(os.environ, MOCK_ENVIRON),
+        patch(
+            "homeassistant.components.hassio.HassIO.is_connected",
+            return_value=None,
+        ),
         patch(
             "homeassistant.components.hassio.HassIO.get_supervisor_info",
             return_value=supervisor_mock_data,
@@ -705,12 +724,12 @@ async def test_service_calls_core(
     await hass.services.async_call("homeassistant", "stop")
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 6
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 5
 
     await hass.services.async_call("homeassistant", "check_config")
     await hass.async_block_till_done()
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 6
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 5
 
     with patch(
         "homeassistant.config.async_check_ha_config_file", return_value=None
@@ -719,7 +738,7 @@ async def test_service_calls_core(
         await hass.async_block_till_done()
         assert mock_check_config.called
 
-    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 7
+    assert aioclient_mock.call_count + len(supervisor_client.mock_calls) == 6
 
 
 @pytest.mark.usefixtures("addon_installed")
@@ -904,108 +923,129 @@ async def test_device_registry_calls(
 
 @pytest.mark.usefixtures("addon_installed")
 async def test_coordinator_updates(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, supervisor_client: AsyncMock
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test coordinator updates."""
     await async_setup_component(hass, "homeassistant", {})
-    with patch.dict(os.environ, MOCK_ENVIRON):
+    with (
+        patch.dict(os.environ, MOCK_ENVIRON),
+        patch(
+            "homeassistant.components.hassio.HassIO.refresh_updates"
+        ) as refresh_updates_mock,
+    ):
         config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
         config_entry.add_to_hass(hass)
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
 
         # Initial refresh, no update refresh call
-        supervisor_client.refresh_updates.assert_not_called()
+        assert refresh_updates_mock.call_count == 0
 
-    async_fire_time_changed(hass, dt_util.now() + timedelta(minutes=20))
-    await hass.async_block_till_done()
+    with patch(
+        "homeassistant.components.hassio.HassIO.refresh_updates",
+    ) as refresh_updates_mock:
+        async_fire_time_changed(hass, dt_util.now() + timedelta(minutes=20))
+        await hass.async_block_till_done()
 
-    # Scheduled refresh, no update refresh call
-    supervisor_client.refresh_updates.assert_not_called()
+        # Scheduled refresh, no update refresh call
+        assert refresh_updates_mock.call_count == 0
 
-    await hass.services.async_call(
-        "homeassistant",
-        "update_entity",
-        {
-            "entity_id": [
-                "update.home_assistant_core_update",
-                "update.home_assistant_supervisor_update",
-            ]
-        },
-        blocking=True,
-    )
+    with patch(
+        "homeassistant.components.hassio.HassIO.refresh_updates",
+    ) as refresh_updates_mock:
+        await hass.services.async_call(
+            "homeassistant",
+            "update_entity",
+            {
+                "entity_id": [
+                    "update.home_assistant_core_update",
+                    "update.home_assistant_supervisor_update",
+                ]
+            },
+            blocking=True,
+        )
 
-    # There is a REQUEST_REFRESH_DELAYs cooldown on the debouncer
-    supervisor_client.refresh_updates.assert_not_called()
-    async_fire_time_changed(
-        hass, dt_util.now() + timedelta(seconds=REQUEST_REFRESH_DELAY)
-    )
-    await hass.async_block_till_done()
-    supervisor_client.refresh_updates.assert_called_once()
+        # There is a REQUEST_REFRESH_DELAYs cooldown on the debouncer
+        assert refresh_updates_mock.call_count == 0
+        async_fire_time_changed(
+            hass, dt_util.now() + timedelta(seconds=REQUEST_REFRESH_DELAY)
+        )
+        await hass.async_block_till_done()
+        assert refresh_updates_mock.call_count == 1
 
-    supervisor_client.refresh_updates.reset_mock()
-    supervisor_client.refresh_updates.side_effect = SupervisorError("Unknown")
-    await hass.services.async_call(
-        "homeassistant",
-        "update_entity",
-        {
-            "entity_id": [
-                "update.home_assistant_core_update",
-                "update.home_assistant_supervisor_update",
-            ]
-        },
-        blocking=True,
-    )
-    # There is a REQUEST_REFRESH_DELAYs cooldown on the debouncer
-    async_fire_time_changed(
-        hass, dt_util.now() + timedelta(seconds=REQUEST_REFRESH_DELAY)
-    )
-    await hass.async_block_till_done()
-    supervisor_client.refresh_updates.assert_called_once()
-    assert "Error on Supervisor API: Unknown" in caplog.text
+    with patch(
+        "homeassistant.components.hassio.HassIO.refresh_updates",
+        side_effect=HassioAPIError("Unknown"),
+    ) as refresh_updates_mock:
+        await hass.services.async_call(
+            "homeassistant",
+            "update_entity",
+            {
+                "entity_id": [
+                    "update.home_assistant_core_update",
+                    "update.home_assistant_supervisor_update",
+                ]
+            },
+            blocking=True,
+        )
+        # There is a REQUEST_REFRESH_DELAYs cooldown on the debouncer
+        async_fire_time_changed(
+            hass, dt_util.now() + timedelta(seconds=REQUEST_REFRESH_DELAY)
+        )
+        await hass.async_block_till_done()
+        assert refresh_updates_mock.call_count == 1
+        assert "Error on Supervisor API: Unknown" in caplog.text
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default", "addon_installed")
 async def test_coordinator_updates_stats_entities_enabled(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
-    supervisor_client: AsyncMock,
 ) -> None:
     """Test coordinator updates with stats entities enabled."""
     await async_setup_component(hass, "homeassistant", {})
-    with patch.dict(os.environ, MOCK_ENVIRON):
+    with (
+        patch.dict(os.environ, MOCK_ENVIRON),
+        patch(
+            "homeassistant.components.hassio.HassIO.refresh_updates"
+        ) as refresh_updates_mock,
+    ):
         config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
         config_entry.add_to_hass(hass)
         assert await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
         # Initial refresh without stats
-        supervisor_client.refresh_updates.assert_not_called()
+        assert refresh_updates_mock.call_count == 0
 
         # Refresh with stats once we know which ones are needed
         async_fire_time_changed(
             hass, dt_util.now() + timedelta(seconds=REQUEST_REFRESH_DELAY)
         )
         await hass.async_block_till_done()
+        assert refresh_updates_mock.call_count == 1
 
-        supervisor_client.refresh_updates.assert_called_once()
+    with patch(
+        "homeassistant.components.hassio.HassIO.refresh_updates",
+    ) as refresh_updates_mock:
+        async_fire_time_changed(hass, dt_util.now() + timedelta(minutes=20))
+        await hass.async_block_till_done()
+        assert refresh_updates_mock.call_count == 0
 
-    supervisor_client.refresh_updates.reset_mock()
-    async_fire_time_changed(hass, dt_util.now() + timedelta(minutes=20))
-    await hass.async_block_till_done()
-    supervisor_client.refresh_updates.assert_not_called()
-
-    await hass.services.async_call(
-        "homeassistant",
-        "update_entity",
-        {
-            "entity_id": [
-                "update.home_assistant_core_update",
-                "update.home_assistant_supervisor_update",
-            ]
-        },
-        blocking=True,
-    )
-    supervisor_client.refresh_updates.assert_not_called()
+    with patch(
+        "homeassistant.components.hassio.HassIO.refresh_updates",
+    ) as refresh_updates_mock:
+        await hass.services.async_call(
+            "homeassistant",
+            "update_entity",
+            {
+                "entity_id": [
+                    "update.home_assistant_core_update",
+                    "update.home_assistant_supervisor_update",
+                ]
+            },
+            blocking=True,
+        )
+        assert refresh_updates_mock.call_count == 0
 
     # There is a REQUEST_REFRESH_DELAYs cooldown on the debouncer
     async_fire_time_changed(
@@ -1013,26 +1053,28 @@ async def test_coordinator_updates_stats_entities_enabled(
     )
     await hass.async_block_till_done()
 
-    supervisor_client.refresh_updates.reset_mock()
-    supervisor_client.refresh_updates.side_effect = SupervisorError("Unknown")
-    await hass.services.async_call(
-        "homeassistant",
-        "update_entity",
-        {
-            "entity_id": [
-                "update.home_assistant_core_update",
-                "update.home_assistant_supervisor_update",
-            ]
-        },
-        blocking=True,
-    )
-    # There is a REQUEST_REFRESH_DELAYs cooldown on the debouncer
-    async_fire_time_changed(
-        hass, dt_util.now() + timedelta(seconds=REQUEST_REFRESH_DELAY)
-    )
-    await hass.async_block_till_done()
-    supervisor_client.refresh_updates.assert_called_once()
-    assert "Error on Supervisor API: Unknown" in caplog.text
+    with patch(
+        "homeassistant.components.hassio.HassIO.refresh_updates",
+        side_effect=HassioAPIError("Unknown"),
+    ) as refresh_updates_mock:
+        await hass.services.async_call(
+            "homeassistant",
+            "update_entity",
+            {
+                "entity_id": [
+                    "update.home_assistant_core_update",
+                    "update.home_assistant_supervisor_update",
+                ]
+            },
+            blocking=True,
+        )
+        # There is a REQUEST_REFRESH_DELAYs cooldown on the debouncer
+        async_fire_time_changed(
+            hass, dt_util.now() + timedelta(seconds=REQUEST_REFRESH_DELAY)
+        )
+        await hass.async_block_till_done()
+        assert refresh_updates_mock.call_count == 1
+        assert "Error on Supervisor API: Unknown" in caplog.text
 
 
 @pytest.mark.parametrize(
@@ -1081,62 +1123,3 @@ def test_hostname_from_addon_slug() -> None:
         hostname_from_addon_slug("core_silabs_multiprotocol")
         == "core-silabs-multiprotocol"
     )
-
-
-def test_deprecated_function_is_hassio(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test calling deprecated_is_hassio function will create log entry."""
-
-    deprecated_is_hassio(hass)
-    assert caplog.record_tuples == [
-        (
-            "homeassistant.components.hassio",
-            logging.WARNING,
-            "is_hassio is a deprecated function which will be removed in HA Core 2025.11. Use homeassistant.helpers.hassio.is_hassio instead",
-        )
-    ]
-
-
-def test_deprecated_function_get_supervisor_ip(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test calling get_supervisor_ip function will create log entry."""
-
-    get_supervisor_ip()
-    assert caplog.record_tuples == [
-        (
-            "homeassistant.helpers.hassio",
-            logging.WARNING,
-            "get_supervisor_ip is a deprecated function which will be removed in HA Core 2025.11. Use homeassistant.helpers.hassio.get_supervisor_ip instead",
-        )
-    ]
-
-
-@pytest.mark.parametrize(
-    ("constant_name", "replacement_name", "replacement"),
-    [
-        (
-            "HassioServiceInfo",
-            "homeassistant.helpers.service_info.hassio.HassioServiceInfo",
-            HassioServiceInfo,
-        ),
-    ],
-)
-def test_deprecated_constants(
-    caplog: pytest.LogCaptureFixture,
-    constant_name: str,
-    replacement_name: str,
-    replacement: Any,
-) -> None:
-    """Test deprecated automation constants."""
-    import_and_test_deprecated_constant(
-        caplog,
-        hassio,
-        constant_name,
-        replacement_name,
-        replacement,
-        "2025.11",
-    )
diff --git a/tests/components/hassio/test_issues.py b/tests/components/hassio/test_issues.py
index 7ce11a18fb5..1a3d3d83f95 100644
--- a/tests/components/hassio/test_issues.py
+++ b/tests/components/hassio/test_issues.py
@@ -4,28 +4,11 @@ from __future__ import annotations
 
 from collections.abc import Generator
 from datetime import timedelta
+from http import HTTPStatus
 import os
 from typing import Any
-from unittest.mock import ANY, AsyncMock, patch
-from uuid import UUID, uuid4
+from unittest.mock import ANY, patch
 
-from aiohasupervisor import (
-    SupervisorBadRequestError,
-    SupervisorError,
-    SupervisorTimeoutError,
-)
-from aiohasupervisor.models import (
-    Check,
-    CheckType,
-    ContextType,
-    Issue,
-    IssueType,
-    ResolutionInfo,
-    Suggestion,
-    SuggestionType,
-    UnhealthyReason,
-    UnsupportedReason,
-)
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 
@@ -35,6 +18,7 @@ from homeassistant.setup import async_setup_component
 
 from .test_init import MOCK_ENVIRON
 
+from tests.test_util.aiohttp import AiohttpClientMocker, AiohttpClientMockResponse
 from tests.typing import WebSocketGenerator
 
 
@@ -52,41 +36,49 @@ def fixture_supervisor_environ() -> Generator[None]:
 
 
 def mock_resolution_info(
-    supervisor_client: AsyncMock,
-    unsupported: list[UnsupportedReason] | None = None,
-    unhealthy: list[UnhealthyReason] | None = None,
-    issues: list[Issue] | None = None,
-    suggestions_by_issue: dict[UUID, list[Suggestion]] | None = None,
-    suggestion_result: SupervisorError | None = None,
+    aioclient_mock: AiohttpClientMocker,
+    unsupported: list[str] | None = None,
+    unhealthy: list[str] | None = None,
+    issues: list[dict[str, str]] | None = None,
+    suggestion_result: str = "ok",
 ) -> None:
     """Mock resolution/info endpoint with unsupported/unhealthy reasons and/or issues."""
-    supervisor_client.resolution.info.return_value = ResolutionInfo(
-        unsupported=unsupported or [],
-        unhealthy=unhealthy or [],
-        issues=issues or [],
-        suggestions=[
-            suggestion
-            for issue_list in suggestions_by_issue.values()
-            for suggestion in issue_list
-        ]
-        if suggestions_by_issue
-        else [],
-        checks=[
-            Check(enabled=True, slug=CheckType.SUPERVISOR_TRUST),
-            Check(enabled=True, slug=CheckType.FREE_SPACE),
-        ],
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": unsupported or [],
+                "unhealthy": unhealthy or [],
+                "suggestions": [],
+                "issues": [
+                    {k: v for k, v in issue.items() if k != "suggestions"}
+                    for issue in issues
+                ]
+                if issues
+                else [],
+                "checks": [
+                    {"enabled": True, "slug": "supervisor_trust"},
+                    {"enabled": True, "slug": "free_space"},
+                ],
+            },
+        },
     )
 
-    if suggestions_by_issue:
-
-        async def mock_suggestions_for_issue(uuid: UUID) -> list[Suggestion]:
-            """Mock of suggestions for issue api."""
-            return suggestions_by_issue.get(uuid, [])
-
-        supervisor_client.resolution.suggestions_for_issue.side_effect = (
-            mock_suggestions_for_issue
-        )
-        supervisor_client.resolution.apply_suggestion.side_effect = suggestion_result
+    if issues:
+        suggestions_by_issue = {
+            issue["uuid"]: issue.get("suggestions", []) for issue in issues
+        }
+        for issue_uuid, suggestions in suggestions_by_issue.items():
+            aioclient_mock.get(
+                f"http://127.0.0.1/resolution/issue/{issue_uuid}/suggestions",
+                json={"result": "ok", "data": {"suggestions": suggestions}},
+            )
+            for suggestion in suggestions:
+                aioclient_mock.post(
+                    f"http://127.0.0.1/resolution/suggestion/{suggestion['uuid']}",
+                    json={"result": suggestion_result},
+                )
 
 
 def assert_repair_in_list(
@@ -142,13 +134,11 @@ def assert_issue_repair_in_list(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_unhealthy_issues(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test issues added for unhealthy systems."""
-    mock_resolution_info(
-        supervisor_client, unhealthy=[UnhealthyReason.DOCKER, UnhealthyReason.SETUP]
-    )
+    mock_resolution_info(aioclient_mock, unhealthy=["docker", "setup"])
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -166,14 +156,11 @@ async def test_unhealthy_issues(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_unsupported_issues(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test issues added for unsupported systems."""
-    mock_resolution_info(
-        supervisor_client,
-        unsupported=[UnsupportedReason.CONTENT_TRUST, UnsupportedReason.OS],
-    )
+    mock_resolution_info(aioclient_mock, unsupported=["content_trust", "os"])
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -193,11 +180,11 @@ async def test_unsupported_issues(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_unhealthy_issues_add_remove(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test unhealthy issues added and removed from dispatches."""
-    mock_resolution_info(supervisor_client)
+    mock_resolution_info(aioclient_mock)
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -250,11 +237,11 @@ async def test_unhealthy_issues_add_remove(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_unsupported_issues_add_remove(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test unsupported issues added and removed from dispatches."""
-    mock_resolution_info(supervisor_client)
+    mock_resolution_info(aioclient_mock)
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -307,21 +294,21 @@ async def test_unsupported_issues_add_remove(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_reset_issues_supervisor_restart(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """All issues reset on supervisor restart."""
     mock_resolution_info(
-        supervisor_client,
-        unsupported=[UnsupportedReason.OS],
-        unhealthy=[UnhealthyReason.DOCKER],
+        aioclient_mock,
+        unsupported=["os"],
+        unhealthy=["docker"],
         issues=[
-            Issue(
-                type=IssueType.REBOOT_REQUIRED,
-                context=ContextType.SYSTEM,
-                reference=None,
-                uuid=(uuid := uuid4()),
-            )
+            {
+                "uuid": "1234",
+                "type": "reboot_required",
+                "context": "system",
+                "reference": None,
+            }
         ],
     )
 
@@ -338,14 +325,15 @@ async def test_reset_issues_supervisor_restart(
     assert_repair_in_list(msg["result"]["issues"], unhealthy=False, reason="os")
     assert_issue_repair_in_list(
         msg["result"]["issues"],
-        uuid=uuid.hex,
+        uuid="1234",
         context="system",
         type_="reboot_required",
         fixable=False,
         reference=None,
     )
 
-    mock_resolution_info(supervisor_client)
+    aioclient_mock.clear_requests()
+    mock_resolution_info(aioclient_mock)
     await client.send_json(
         {
             "id": 2,
@@ -370,15 +358,11 @@ async def test_reset_issues_supervisor_restart(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_reasons_added_and_removed(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test an unsupported/unhealthy reasons being added and removed at same time."""
-    mock_resolution_info(
-        supervisor_client,
-        unsupported=[UnsupportedReason.OS],
-        unhealthy=[UnhealthyReason.DOCKER],
-    )
+    mock_resolution_info(aioclient_mock, unsupported=["os"], unhealthy=["docker"])
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -392,10 +376,9 @@ async def test_reasons_added_and_removed(
     assert_repair_in_list(msg["result"]["issues"], unhealthy=True, reason="docker")
     assert_repair_in_list(msg["result"]["issues"], unhealthy=False, reason="os")
 
+    aioclient_mock.clear_requests()
     mock_resolution_info(
-        supervisor_client,
-        unsupported=[UnsupportedReason.CONTENT_TRUST],
-        unhealthy=[UnhealthyReason.SETUP],
+        aioclient_mock, unsupported=["content_trust"], unhealthy=["setup"]
     )
     await client.send_json(
         {
@@ -425,14 +408,12 @@ async def test_reasons_added_and_removed(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_ignored_unsupported_skipped(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Unsupported reasons which have an identical unhealthy reason are ignored."""
     mock_resolution_info(
-        supervisor_client,
-        unsupported=[UnsupportedReason.PRIVILEGED],
-        unhealthy=[UnhealthyReason.PRIVILEGED],
+        aioclient_mock, unsupported=["privileged"], unhealthy=["privileged"]
     )
 
     result = await async_setup_component(hass, "hassio", {})
@@ -450,14 +431,12 @@ async def test_ignored_unsupported_skipped(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_new_unsupported_unhealthy_reason(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """New unsupported/unhealthy reasons result in a generic repair until next core update."""
     mock_resolution_info(
-        supervisor_client,
-        unsupported=["fake_unsupported"],
-        unhealthy=["fake_unhealthy"],
+        aioclient_mock, unsupported=["fake_unsupported"], unhealthy=["fake_unhealthy"]
     )
 
     result = await async_setup_component(hass, "hassio", {})
@@ -502,43 +481,40 @@ async def test_new_unsupported_unhealthy_reason(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issues(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test repairs added for supervisor issue."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.REBOOT_REQUIRED,
-                context=ContextType.SYSTEM,
-                reference=None,
-                uuid=(uuid_issue1 := uuid4()),
-            ),
-            Issue(
-                type=IssueType.MULTIPLE_DATA_DISKS,
-                context=ContextType.SYSTEM,
-                reference="/dev/sda1",
-                uuid=(uuid_issue2 := uuid4()),
-            ),
-            Issue(
-                type="should_not_be_repair",
-                context=ContextType.OS,
-                reference=None,
-                uuid=uuid4(),
-            ),
+            {
+                "uuid": "1234",
+                "type": "reboot_required",
+                "context": "system",
+                "reference": None,
+            },
+            {
+                "uuid": "1235",
+                "type": "multiple_data_disks",
+                "context": "system",
+                "reference": "/dev/sda1",
+                "suggestions": [
+                    {
+                        "uuid": "1236",
+                        "type": "rename_data_disk",
+                        "context": "system",
+                        "reference": "/dev/sda1",
+                    }
+                ],
+            },
+            {
+                "uuid": "1237",
+                "type": "should_not_be_repair",
+                "context": "os",
+                "reference": None,
+            },
         ],
-        suggestions_by_issue={
-            uuid_issue2: [
-                Suggestion(
-                    type=SuggestionType.RENAME_DATA_DISK,
-                    context=ContextType.SYSTEM,
-                    reference="/dev/sda1",
-                    uuid=uuid4(),
-                    auto=False,
-                )
-            ]
-        },
     )
 
     result = await async_setup_component(hass, "hassio", {})
@@ -552,7 +528,7 @@ async def test_supervisor_issues(
     assert len(msg["result"]["issues"]) == 2
     assert_issue_repair_in_list(
         msg["result"]["issues"],
-        uuid=uuid_issue1.hex,
+        uuid="1234",
         context="system",
         type_="reboot_required",
         fixable=False,
@@ -560,7 +536,7 @@ async def test_supervisor_issues(
     )
     assert_issue_repair_in_list(
         msg["result"]["issues"],
-        uuid=uuid_issue2.hex,
+        uuid="1235",
         context="system",
         type_="multiple_data_disks",
         fixable=True,
@@ -571,33 +547,61 @@ async def test_supervisor_issues(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issues_initial_failure(
     hass: HomeAssistant,
-    resolution_info: AsyncMock,
-    resolution_suggestions_for_issue: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
     freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test issues manager retries after initial update failure."""
-    resolution_info.side_effect = [
-        SupervisorBadRequestError("System is not ready with state: setup"),
-        ResolutionInfo(
-            unsupported=[],
-            unhealthy=[],
-            suggestions=[],
-            issues=[
-                Issue(
-                    type=IssueType.REBOOT_REQUIRED,
-                    context=ContextType.SYSTEM,
-                    reference=None,
-                    uuid=uuid4(),
-                )
-            ],
-            checks=[
-                Check(enabled=True, slug=CheckType.SUPERVISOR_TRUST),
-                Check(enabled=True, slug=CheckType.FREE_SPACE),
-            ],
+    responses = [
+        AiohttpClientMockResponse(
+            method="get",
+            url="http://127.0.0.1/resolution/info",
+            status=HTTPStatus.BAD_REQUEST,
+            json={
+                "result": "error",
+                "message": "System is not ready with state: setup",
+            },
+        ),
+        AiohttpClientMockResponse(
+            method="get",
+            url="http://127.0.0.1/resolution/info",
+            status=HTTPStatus.OK,
+            json={
+                "result": "ok",
+                "data": {
+                    "unsupported": [],
+                    "unhealthy": [],
+                    "suggestions": [],
+                    "issues": [
+                        {
+                            "uuid": "1234",
+                            "type": "reboot_required",
+                            "context": "system",
+                            "reference": None,
+                        },
+                    ],
+                    "checks": [
+                        {"enabled": True, "slug": "supervisor_trust"},
+                        {"enabled": True, "slug": "free_space"},
+                    ],
+                },
+            },
         ),
     ]
 
+    async def mock_responses(*args):
+        nonlocal responses
+        return responses.pop(0)
+
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/info",
+        side_effect=mock_responses,
+    )
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/issue/1234/suggestions",
+        json={"result": "ok", "data": {"suggestions": []}},
+    )
+
     with patch("homeassistant.components.hassio.issues.REQUEST_REFRESH_DELAY", new=0.1):
         result = await async_setup_component(hass, "hassio", {})
         await hass.async_block_till_done()
@@ -621,11 +625,11 @@ async def test_supervisor_issues_initial_failure(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issues_add_remove(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test supervisor issues added and removed from dispatches."""
-    mock_resolution_info(supervisor_client)
+    mock_resolution_info(aioclient_mock)
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -639,7 +643,7 @@ async def test_supervisor_issues_add_remove(
             "data": {
                 "event": "issue_changed",
                 "data": {
-                    "uuid": (issue_uuid := uuid4().hex),
+                    "uuid": "1234",
                     "type": "reboot_required",
                     "context": "system",
                     "reference": None,
@@ -657,7 +661,7 @@ async def test_supervisor_issues_add_remove(
     assert len(msg["result"]["issues"]) == 1
     assert_issue_repair_in_list(
         msg["result"]["issues"],
-        uuid=issue_uuid,
+        uuid="1234",
         context="system",
         type_="reboot_required",
         fixable=False,
@@ -671,13 +675,13 @@ async def test_supervisor_issues_add_remove(
             "data": {
                 "event": "issue_changed",
                 "data": {
-                    "uuid": issue_uuid,
+                    "uuid": "1234",
                     "type": "reboot_required",
                     "context": "system",
                     "reference": None,
                     "suggestions": [
                         {
-                            "uuid": uuid4().hex,
+                            "uuid": "1235",
                             "type": "execute_reboot",
                             "context": "system",
                             "reference": None,
@@ -697,7 +701,7 @@ async def test_supervisor_issues_add_remove(
     assert len(msg["result"]["issues"]) == 1
     assert_issue_repair_in_list(
         msg["result"]["issues"],
-        uuid=issue_uuid,
+        uuid="1234",
         context="system",
         type_="reboot_required",
         fixable=True,
@@ -711,7 +715,7 @@ async def test_supervisor_issues_add_remove(
             "data": {
                 "event": "issue_removed",
                 "data": {
-                    "uuid": issue_uuid,
+                    "uuid": "1234",
                     "type": "reboot_required",
                     "context": "system",
                     "reference": None,
@@ -732,23 +736,37 @@ async def test_supervisor_issues_add_remove(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issues_suggestions_fail(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
-    resolution_suggestions_for_issue: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test failing to get suggestions for issue skips it."""
-    mock_resolution_info(
-        supervisor_client,
-        issues=[
-            Issue(
-                type=IssueType.REBOOT_REQUIRED,
-                context=ContextType.SYSTEM,
-                reference=None,
-                uuid=uuid4(),
-            )
-        ],
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [
+                    {
+                        "uuid": "1234",
+                        "type": "reboot_required",
+                        "context": "system",
+                        "reference": None,
+                    }
+                ],
+                "checks": [
+                    {"enabled": True, "slug": "supervisor_trust"},
+                    {"enabled": True, "slug": "free_space"},
+                ],
+            },
+        },
+    )
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/issue/1234/suggestions",
+        exc=TimeoutError(),
     )
-    resolution_suggestions_for_issue.side_effect = SupervisorTimeoutError
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -764,11 +782,11 @@ async def test_supervisor_issues_suggestions_fail(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_remove_missing_issue_without_error(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test HA skips message to remove issue that it didn't know about (sync issue)."""
-    mock_resolution_info(supervisor_client)
+    mock_resolution_info(aioclient_mock)
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -798,12 +816,16 @@ async def test_supervisor_remove_missing_issue_without_error(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_system_is_not_ready(
     hass: HomeAssistant,
-    resolution_info: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Ensure hassio starts despite error."""
-    resolution_info.side_effect = SupervisorBadRequestError(
-        "System is not ready with state: setup"
+    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", {})
@@ -816,11 +838,11 @@ async def test_system_is_not_ready(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issues_detached_addon_missing(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test supervisor issue for detached addon due to missing repository."""
-    mock_resolution_info(supervisor_client)
+    mock_resolution_info(aioclient_mock)
 
     result = await async_setup_component(hass, "hassio", {})
     assert result
@@ -834,7 +856,7 @@ async def test_supervisor_issues_detached_addon_missing(
             "data": {
                 "event": "issue_changed",
                 "data": {
-                    "uuid": (issue_uuid := uuid4().hex),
+                    "uuid": "1234",
                     "type": "detached_addon_missing",
                     "context": "addon",
                     "reference": "test",
@@ -852,7 +874,7 @@ async def test_supervisor_issues_detached_addon_missing(
     assert len(msg["result"]["issues"]) == 1
     assert_issue_repair_in_list(
         msg["result"]["issues"],
-        uuid=issue_uuid,
+        uuid="1234",
         context="addon",
         type_="detached_addon_missing",
         fixable=False,
diff --git a/tests/components/hassio/test_repairs.py b/tests/components/hassio/test_repairs.py
index f8cac4e1a97..907529ec9c4 100644
--- a/tests/components/hassio/test_repairs.py
+++ b/tests/components/hassio/test_repairs.py
@@ -3,17 +3,8 @@
 from collections.abc import Generator
 from http import HTTPStatus
 import os
-from unittest.mock import AsyncMock, patch
-from uuid import uuid4
+from unittest.mock import patch
 
-from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import (
-    ContextType,
-    Issue,
-    IssueType,
-    Suggestion,
-    SuggestionType,
-)
 import pytest
 
 from homeassistant.core import HomeAssistant
@@ -23,6 +14,7 @@ from homeassistant.setup import async_setup_component
 from .test_init import MOCK_ENVIRON
 from .test_issues import mock_resolution_info
 
+from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
 
@@ -36,39 +28,34 @@ def fixture_supervisor_environ() -> Generator[None]:
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issue_repair_flow(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test fix flow for supervisor issue."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.MULTIPLE_DATA_DISKS,
-                context=ContextType.SYSTEM,
-                reference="/dev/sda1",
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "uuid": "1234",
+                "type": "multiple_data_disks",
+                "context": "system",
+                "reference": "/dev/sda1",
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "rename_data_disk",
+                        "context": "system",
+                        "reference": "/dev/sda1",
+                    }
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.RENAME_DATA_DISK,
-                    context=ContextType.SYSTEM,
-                    reference="/dev/sda1",
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                )
-            ]
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -108,53 +95,52 @@ async def test_supervisor_issue_repair_flow(
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    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.usefixtures("all_setup_requests")
 async def test_supervisor_issue_repair_flow_with_multiple_suggestions(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test fix flow for supervisor issue with multiple suggestions."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.REBOOT_REQUIRED,
-                context=ContextType.SYSTEM,
-                reference="test",
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "uuid": "1234",
+                "type": "reboot_required",
+                "context": "system",
+                "reference": "test",
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "execute_reboot",
+                        "context": "system",
+                        "reference": "test",
+                    },
+                    {
+                        "uuid": "1236",
+                        "type": "test_type",
+                        "context": "system",
+                        "reference": "test",
+                    },
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REBOOT,
-                    context=ContextType.SYSTEM,
-                    reference="test",
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-                Suggestion(
-                    type="test_type",
-                    context=ContextType.SYSTEM,
-                    reference="test",
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-            ]
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -203,53 +189,52 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions(
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    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/1236"
+    )
 
 
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issue_repair_flow_with_multiple_suggestions_and_confirmation(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test fix flow for supervisor issue with multiple suggestions and choice requires confirmation."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.REBOOT_REQUIRED,
-                context=ContextType.SYSTEM,
-                reference=None,
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "uuid": "1234",
+                "type": "reboot_required",
+                "context": "system",
+                "reference": None,
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "execute_reboot",
+                        "context": "system",
+                        "reference": None,
+                    },
+                    {
+                        "uuid": "1236",
+                        "type": "test_type",
+                        "context": "system",
+                        "reference": None,
+                    },
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REBOOT,
-                    context=ContextType.SYSTEM,
-                    reference=None,
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-                Suggestion(
-                    type="test_type",
-                    context=ContextType.SYSTEM,
-                    reference=None,
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-            ]
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -317,46 +302,46 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions_and_confir
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    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.usefixtures("all_setup_requests")
 async def test_supervisor_issue_repair_flow_skip_confirmation(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test confirmation skipped for fix flow for supervisor issue with one suggestion."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.REBOOT_REQUIRED,
-                context=ContextType.SYSTEM,
-                reference=None,
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "uuid": "1234",
+                "type": "reboot_required",
+                "context": "system",
+                "reference": None,
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "execute_reboot",
+                        "context": "system",
+                        "reference": None,
+                    }
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REBOOT,
-                    context=ContextType.SYSTEM,
-                    reference=None,
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-            ]
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -396,54 +381,53 @@ async def test_supervisor_issue_repair_flow_skip_confirmation(
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    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.usefixtures("all_setup_requests")
 async def test_mount_failed_repair_flow_error(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test repair flow fails when repair fails to apply."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.MOUNT_FAILED,
-                context=ContextType.MOUNT,
-                reference="backup_share",
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "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",
+                    },
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_RELOAD,
-                    context=ContextType.MOUNT,
-                    reference="backup_share",
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REMOVE,
-                    context=ContextType.MOUNT,
-                    reference="backup_share",
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-            ]
-        },
-        suggestion_result=SupervisorError("boom"),
+        suggestion_result=False,
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -475,52 +459,46 @@ async def test_mount_failed_repair_flow_error(
         "description_placeholders": None,
     }
 
-    assert issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
+    assert issue_registry.async_get_issue(domain="hassio", issue_id="1234")
 
 
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_mount_failed_repair_flow(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test repair flow for mount_failed issue."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.MOUNT_FAILED,
-                context=ContextType.MOUNT,
-                reference="backup_share",
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "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",
+                    },
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_RELOAD,
-                    context=ContextType.MOUNT,
-                    reference="backup_share",
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REMOVE,
-                    context=ContextType.MOUNT,
-                    reference="backup_share",
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-            ]
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -573,8 +551,13 @@ async def test_mount_failed_repair_flow(
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    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(
@@ -583,69 +566,62 @@ async def test_mount_failed_repair_flow(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issue_docker_config_repair_flow(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test fix flow for supervisor issue."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.DOCKER_CONFIG,
-                context=ContextType.SYSTEM,
-                reference=None,
-                uuid=(issue1_uuid := uuid4()),
-            ),
-            Issue(
-                type=IssueType.DOCKER_CONFIG,
-                context=ContextType.CORE,
-                reference=None,
-                uuid=(issue2_uuid := uuid4()),
-            ),
-            Issue(
-                type=IssueType.DOCKER_CONFIG,
-                context=ContextType.ADDON,
-                reference="test",
-                uuid=(issue3_uuid := uuid4()),
-            ),
+            {
+                "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",
+                    }
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue1_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REBUILD,
-                    context=ContextType.SYSTEM,
-                    reference=None,
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-            ],
-            issue2_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REBUILD,
-                    context=ContextType.CORE,
-                    reference=None,
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-            ],
-            issue3_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REBUILD,
-                    context=ContextType.ADDON,
-                    reference="test",
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-            ],
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue1_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -685,53 +661,52 @@ async def test_supervisor_issue_docker_config_repair_flow(
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue1_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    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.usefixtures("all_setup_requests")
 async def test_supervisor_issue_repair_flow_multiple_data_disks(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test fix flow for multiple data disks supervisor issue."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.MULTIPLE_DATA_DISKS,
-                context=ContextType.SYSTEM,
-                reference="/dev/sda1",
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "uuid": "1234",
+                "type": "multiple_data_disks",
+                "context": "system",
+                "reference": "/dev/sda1",
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "rename_data_disk",
+                        "context": "system",
+                        "reference": "/dev/sda1",
+                    },
+                    {
+                        "uuid": "1236",
+                        "type": "adopt_data_disk",
+                        "context": "system",
+                        "reference": "/dev/sda1",
+                    },
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.RENAME_DATA_DISK,
-                    context=ContextType.SYSTEM,
-                    reference="/dev/sda1",
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-                Suggestion(
-                    type=SuggestionType.ADOPT_DATA_DISK,
-                    context=ContextType.SYSTEM,
-                    reference="/dev/sda1",
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-            ]
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -799,8 +774,13 @@ async def test_supervisor_issue_repair_flow_multiple_data_disks(
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    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/1236"
+    )
 
 
 @pytest.mark.parametrize(
@@ -809,39 +789,34 @@ async def test_supervisor_issue_repair_flow_multiple_data_disks(
 @pytest.mark.usefixtures("all_setup_requests")
 async def test_supervisor_issue_detached_addon_removed(
     hass: HomeAssistant,
-    supervisor_client: AsyncMock,
+    aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test fix flow for supervisor issue."""
     mock_resolution_info(
-        supervisor_client,
+        aioclient_mock,
         issues=[
-            Issue(
-                type=IssueType.DETACHED_ADDON_REMOVED,
-                context=ContextType.ADDON,
-                reference="test",
-                uuid=(issue_uuid := uuid4()),
-            ),
+            {
+                "uuid": "1234",
+                "type": "detached_addon_removed",
+                "context": "addon",
+                "reference": "test",
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "execute_remove",
+                        "context": "addon",
+                        "reference": "test",
+                    }
+                ],
+            },
         ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type=SuggestionType.EXECUTE_REMOVE,
-                    context=ContextType.ADDON,
-                    reference="test",
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-            ]
-        },
     )
 
     assert await async_setup_component(hass, "hassio", {})
 
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
 
     client = await hass_client()
@@ -886,107 +861,10 @@ async def test_supervisor_issue_detached_addon_removed(
         "description_placeholders": None,
     }
 
-    assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+    assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
 
-
-@pytest.mark.parametrize(
-    "all_setup_requests", [{"include_addons": True}], indirect=True
-)
-@pytest.mark.usefixtures("all_setup_requests")
-async def test_supervisor_issue_addon_boot_fail(
-    hass: HomeAssistant,
-    supervisor_client: AsyncMock,
-    hass_client: ClientSessionGenerator,
-    issue_registry: ir.IssueRegistry,
-) -> None:
-    """Test fix flow for supervisor issue."""
-    mock_resolution_info(
-        supervisor_client,
-        issues=[
-            Issue(
-                type="boot_fail",
-                context=ContextType.ADDON,
-                reference="test",
-                uuid=(issue_uuid := uuid4()),
-            ),
-        ],
-        suggestions_by_issue={
-            issue_uuid: [
-                Suggestion(
-                    type="execute_start",
-                    context=ContextType.ADDON,
-                    reference="test",
-                    uuid=(sugg_uuid := uuid4()),
-                    auto=False,
-                ),
-                Suggestion(
-                    type="disable_boot",
-                    context=ContextType.ADDON,
-                    reference="test",
-                    uuid=uuid4(),
-                    auto=False,
-                ),
-            ]
-        },
+    assert aioclient_mock.mock_calls[-1][0] == "post"
+    assert (
+        str(aioclient_mock.mock_calls[-1][1])
+        == "http://127.0.0.1/resolution/suggestion/1235"
     )
-
-    assert await async_setup_component(hass, "hassio", {})
-
-    repair_issue = issue_registry.async_get_issue(
-        domain="hassio", issue_id=issue_uuid.hex
-    )
-    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": [
-                    ["addon_execute_start", "addon_execute_start"],
-                    ["addon_disable_boot", "addon_disable_boot"],
-                ],
-                "name": "next_step_id",
-            }
-        ],
-        "menu_options": ["addon_execute_start", "addon_disable_boot"],
-        "description_placeholders": {
-            "reference": "test",
-            "addon": "test",
-        },
-    }
-
-    resp = await client.post(
-        f"/api/repairs/issues/fix/{flow_id}",
-        json={"next_step_id": "addon_execute_start"},
-    )
-
-    assert resp.status == HTTPStatus.OK
-    data = await resp.json()
-
-    flow_id = data["flow_id"]
-    assert data == {
-        "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=issue_uuid.hex)
-    supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
diff --git a/tests/components/hassio/test_sensor.py b/tests/components/hassio/test_sensor.py
index 7160a2cbf16..be9ff107668 100644
--- a/tests/components/hassio/test_sensor.py
+++ b/tests/components/hassio/test_sensor.py
@@ -33,7 +33,6 @@ def mock_all(
     store_info: AsyncMock,
     addon_stats: AsyncMock,
     addon_changelog: AsyncMock,
-    resolution_info: AsyncMock,
 ) -> None:
     """Mock all setup requests."""
     _install_default_mocks(aioclient_mock)
@@ -42,6 +41,7 @@ def mock_all(
 def _install_default_mocks(aioclient_mock: AiohttpClientMocker):
     """Install default mocks."""
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -147,6 +147,20 @@ def _install_default_mocks(aioclient_mock: AiohttpClientMocker):
     aioclient_mock.get(
         "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/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [],
+                "checks": [],
+            },
+        },
+    )
     aioclient_mock.get(
         "http://127.0.0.1/network/info",
         json={
diff --git a/tests/components/hassio/test_update.py b/tests/components/hassio/test_update.py
index c1775d6e0b4..3598dabfba5 100644
--- a/tests/components/hassio/test_update.py
+++ b/tests/components/hassio/test_update.py
@@ -8,7 +8,7 @@ from aiohasupervisor import SupervisorBadRequestError, SupervisorError
 from aiohasupervisor.models import StoreAddonUpdate
 import pytest
 
-from homeassistant.components.hassio import DOMAIN
+from homeassistant.components.hassio import DOMAIN, HassioAPIError
 from homeassistant.components.hassio.const import REQUEST_REFRESH_DELAY
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -29,10 +29,10 @@ def mock_all(
     store_info: AsyncMock,
     addon_stats: AsyncMock,
     addon_changelog: AsyncMock,
-    resolution_info: AsyncMock,
 ) -> None:
     """Mock all setup requests."""
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -150,6 +150,20 @@ def mock_all(
     aioclient_mock.get(
         "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/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [],
+                "checks": [],
+            },
+        },
+    )
     aioclient_mock.get(
         "http://127.0.0.1/network/info",
         json={
@@ -225,7 +239,9 @@ async def test_update_addon(hass: HomeAssistant, update_addon: AsyncMock) -> Non
     update_addon.assert_called_once_with("test", StoreAddonUpdate(backup=False))
 
 
-async def test_update_os(hass: HomeAssistant, supervisor_client: AsyncMock) -> None:
+async def test_update_os(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
     """Test updating OS update entity."""
     config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
     config_entry.add_to_hass(hass)
@@ -239,17 +255,22 @@ async def test_update_os(hass: HomeAssistant, supervisor_client: AsyncMock) -> N
         assert result
     await hass.async_block_till_done()
 
-    supervisor_client.os.update.return_value = None
+    aioclient_mock.post(
+        "http://127.0.0.1/os/update",
+        json={"result": "ok", "data": {}},
+    )
+
     await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_operating_system_update"},
         blocking=True,
     )
-    supervisor_client.os.update.assert_called_once()
 
 
-async def test_update_core(hass: HomeAssistant, supervisor_client: AsyncMock) -> None:
+async def test_update_core(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
     """Test updating core update entity."""
     config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
     config_entry.add_to_hass(hass)
@@ -263,18 +284,21 @@ async def test_update_core(hass: HomeAssistant, supervisor_client: AsyncMock) ->
         assert result
     await hass.async_block_till_done()
 
-    supervisor_client.homeassistant.update.return_value = None
+    aioclient_mock.post(
+        "http://127.0.0.1/core/update",
+        json={"result": "ok", "data": {}},
+    )
+
     await hass.services.async_call(
         "update",
         "install",
-        {"entity_id": "update.home_assistant_core_update"},
+        {"entity_id": "update.home_assistant_os_update"},
         blocking=True,
     )
-    supervisor_client.homeassistant.update.assert_called_once()
 
 
 async def test_update_supervisor(
-    hass: HomeAssistant, supervisor_client: AsyncMock
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test updating supervisor update entity."""
     config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
@@ -289,14 +313,17 @@ async def test_update_supervisor(
         assert result
     await hass.async_block_till_done()
 
-    supervisor_client.supervisor.update.return_value = None
+    aioclient_mock.post(
+        "http://127.0.0.1/supervisor/update",
+        json={"result": "ok", "data": {}},
+    )
+
     await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_supervisor_update"},
         blocking=True,
     )
-    supervisor_client.supervisor.update.assert_called_once()
 
 
 async def test_update_addon_with_error(
@@ -326,7 +353,7 @@ async def test_update_addon_with_error(
 
 
 async def test_update_os_with_error(
-    hass: HomeAssistant, supervisor_client: AsyncMock
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test updating OS update entity with error."""
     config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
@@ -340,7 +367,11 @@ async def test_update_os_with_error(
         )
     await hass.async_block_till_done()
 
-    supervisor_client.os.update.side_effect = SupervisorError
+    aioclient_mock.post(
+        "http://127.0.0.1/os/update",
+        exc=HassioAPIError,
+    )
+
     with pytest.raises(
         HomeAssistantError, match=r"^Error updating Home Assistant Operating System:"
     ):
@@ -353,7 +384,7 @@ async def test_update_os_with_error(
 
 
 async def test_update_supervisor_with_error(
-    hass: HomeAssistant, supervisor_client: AsyncMock
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test updating supervisor update entity with error."""
     config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
@@ -367,7 +398,11 @@ async def test_update_supervisor_with_error(
         )
     await hass.async_block_till_done()
 
-    supervisor_client.supervisor.update.side_effect = SupervisorError
+    aioclient_mock.post(
+        "http://127.0.0.1/supervisor/update",
+        exc=HassioAPIError,
+    )
+
     with pytest.raises(
         HomeAssistantError, match=r"^Error updating Home Assistant Supervisor:"
     ):
@@ -380,7 +415,7 @@ async def test_update_supervisor_with_error(
 
 
 async def test_update_core_with_error(
-    hass: HomeAssistant, supervisor_client: AsyncMock
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test updating core update entity with error."""
     config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)
@@ -394,7 +429,11 @@ async def test_update_core_with_error(
         )
     await hass.async_block_till_done()
 
-    supervisor_client.homeassistant.update.side_effect = SupervisorError
+    aioclient_mock.post(
+        "http://127.0.0.1/core/update",
+        exc=HassioAPIError,
+    )
+
     with pytest.raises(
         HomeAssistantError, match=r"^Error updating Home Assistant Core:"
     ):
diff --git a/tests/components/hassio/test_websocket_api.py b/tests/components/hassio/test_websocket_api.py
index 21e6b03678b..7d8f07bfaec 100644
--- a/tests/components/hassio/test_websocket_api.py
+++ b/tests/components/hassio/test_websocket_api.py
@@ -1,7 +1,5 @@
 """Test websocket API."""
 
-from unittest.mock import AsyncMock
-
 import pytest
 
 from homeassistant.components.hassio.const import (
@@ -25,13 +23,10 @@ from tests.typing import WebSocketGenerator
 
 
 @pytest.fixture(autouse=True)
-def mock_all(
-    aioclient_mock: AiohttpClientMocker,
-    supervisor_is_connected: AsyncMock,
-    resolution_info: AsyncMock,
-) -> None:
+def mock_all(aioclient_mock: AiohttpClientMocker) -> None:
     """Mock all setup requests."""
     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"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -69,6 +64,19 @@ def mock_all(
     aioclient_mock.get(
         "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
     )
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [],
+                "checks": [],
+            },
+        },
+    )
 
 
 @pytest.mark.usefixtures("hassio_env")
diff --git a/tests/components/home_connect/conftest.py b/tests/components/home_connect/conftest.py
index 4e790074700..2c5231d2e7d 100644
--- a/tests/components/home_connect/conftest.py
+++ b/tests/components/home_connect/conftest.py
@@ -178,7 +178,6 @@ def mock_problematic_appliance(request: pytest.FixtureRequest) -> Mock:
     )
     mock.name = app
     type(mock).status = PropertyMock(return_value={})
-    mock.get.side_effect = HomeConnectError
     mock.get_programs_active.side_effect = HomeConnectError
     mock.get_programs_available.side_effect = HomeConnectError
     mock.start_program.side_effect = HomeConnectError
diff --git a/tests/components/home_connect/test_binary_sensor.py b/tests/components/home_connect/test_binary_sensor.py
index b564b003af6..990943a34e6 100644
--- a/tests/components/home_connect/test_binary_sensor.py
+++ b/tests/components/home_connect/test_binary_sensor.py
@@ -6,25 +6,19 @@ from unittest.mock import MagicMock, Mock
 from homeconnect.api import HomeConnectAPI
 import pytest
 
-from homeassistant.components import automation, script
-from homeassistant.components.automation import automations_with_entity
 from homeassistant.components.home_connect.const import (
     BSH_DOOR_STATE,
     BSH_DOOR_STATE_CLOSED,
     BSH_DOOR_STATE_LOCKED,
     BSH_DOOR_STATE_OPEN,
-    DOMAIN,
     REFRIGERATION_STATUS_DOOR_CLOSED,
     REFRIGERATION_STATUS_DOOR_OPEN,
     REFRIGERATION_STATUS_DOOR_REFRIGERATOR,
 )
-from homeassistant.components.script import scripts_with_entity
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_component import async_update_entity
-import homeassistant.helpers.issue_registry as ir
-from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry, load_json_object_fixture
 
@@ -136,72 +130,3 @@ async def test_bianry_sensors_fridge_door_states(
     await async_update_entity(hass, entity_id)
     await hass.async_block_till_done()
     assert hass.states.is_state(entity_id, expected)
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_create_issue(
-    hass: HomeAssistant,
-    appliance: Mock,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-    issue_registry: ir.IssueRegistry,
-) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
-    entity_id = "binary_sensor.washer_door"
-    get_appliances.return_value = [appliance]
-    issue_id = f"deprecated_binary_common_door_sensor_{entity_id}"
-
-    assert await async_setup_component(
-        hass,
-        automation.DOMAIN,
-        {
-            automation.DOMAIN: {
-                "alias": "test",
-                "trigger": {"platform": "state", "entity_id": entity_id},
-                "action": {
-                    "action": "automation.turn_on",
-                    "target": {
-                        "entity_id": "automation.test",
-                    },
-                },
-            }
-        },
-    )
-    assert await async_setup_component(
-        hass,
-        script.DOMAIN,
-        {
-            script.DOMAIN: {
-                "test": {
-                    "sequence": [
-                        {
-                            "condition": "state",
-                            "entity_id": entity_id,
-                            "state": "on",
-                        },
-                    ],
-                }
-            }
-        },
-    )
-
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    appliance.status.update({BSH_DOOR_STATE: {"value": BSH_DOOR_STATE_OPEN}})
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-
-    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
-    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
-
-    assert len(issue_registry.issues) == 1
-    assert issue_registry.async_get_issue(DOMAIN, issue_id)
-
-    await hass.config_entries.async_unload(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    # Assert the issue is no longer present
-    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
-    assert len(issue_registry.issues) == 0
diff --git a/tests/components/home_connect/test_light.py b/tests/components/home_connect/test_light.py
index 7a9747929c9..70c23f73c0a 100644
--- a/tests/components/home_connect/test_light.py
+++ b/tests/components/home_connect/test_light.py
@@ -8,7 +8,6 @@ import pytest
 
 from homeassistant.components.home_connect.const import (
     BSH_AMBIENT_LIGHT_BRIGHTNESS,
-    BSH_AMBIENT_LIGHT_COLOR,
     BSH_AMBIENT_LIGHT_CUSTOM_COLOR,
     BSH_AMBIENT_LIGHT_ENABLED,
     COOKING_LIGHTING,
@@ -27,7 +26,6 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
 
 from .conftest import get_all_appliances
 
@@ -152,22 +150,6 @@ async def test_light(
             STATE_ON,
             "Hood",
         ),
-        (
-            "light.hood_ambient_light",
-            {
-                BSH_AMBIENT_LIGHT_ENABLED: {"value": True},
-                BSH_AMBIENT_LIGHT_COLOR: {
-                    "value": "",
-                },
-                BSH_AMBIENT_LIGHT_CUSTOM_COLOR: {},
-            },
-            SERVICE_TURN_ON,
-            {
-                "rgb_color": [255, 255, 0],
-            },
-            STATE_ON,
-            "Hood",
-        ),
         (
             "light.fridgefreezer_external_light",
             {
@@ -233,7 +215,6 @@ async def test_light_functionality(
         "mock_attr",
         "attr_side_effect",
         "problematic_appliance",
-        "exception_match",
     ),
     [
         (
@@ -248,7 +229,6 @@ async def test_light_functionality(
             "set_setting",
             [HomeConnectError, HomeConnectError],
             "Hood",
-            r"Error.*turn.*on.*",
         ),
         (
             "light.hood_functional_light",
@@ -263,7 +243,6 @@ async def test_light_functionality(
             "set_setting",
             [HomeConnectError, HomeConnectError],
             "Hood",
-            r"Error.*turn.*on.*",
         ),
         (
             "light.hood_functional_light",
@@ -275,7 +254,6 @@ async def test_light_functionality(
             "set_setting",
             [HomeConnectError, HomeConnectError],
             "Hood",
-            r"Error.*turn.*off.*",
         ),
         (
             "light.hood_ambient_light",
@@ -290,7 +268,6 @@ async def test_light_functionality(
             "set_setting",
             [HomeConnectError, HomeConnectError],
             "Hood",
-            r"Error.*turn.*on.*",
         ),
         (
             "light.hood_ambient_light",
@@ -303,9 +280,8 @@ async def test_light_functionality(
             SERVICE_TURN_ON,
             {"brightness": 200},
             "set_setting",
-            [HomeConnectError, None, HomeConnectError],
+            [HomeConnectError, None, HomeConnectError, HomeConnectError],
             "Hood",
-            r"Error.*set.*color.*",
         ),
     ],
     indirect=["problematic_appliance"],
@@ -318,7 +294,6 @@ async def test_switch_exception_handling(
     mock_attr: str,
     attr_side_effect: list,
     problematic_appliance: Mock,
-    exception_match: str,
     bypass_throttle: Generator[None],
     hass: HomeAssistant,
     integration_setup: Callable[[], Awaitable[bool]],
@@ -341,8 +316,5 @@ async def test_switch_exception_handling(
 
     problematic_appliance.status.update(status)
     service_data["entity_id"] = entity_id
-    with pytest.raises(ServiceValidationError, match=exception_match):
-        await hass.services.async_call(
-            LIGHT_DOMAIN, service, service_data, blocking=True
-        )
+    await hass.services.async_call(LIGHT_DOMAIN, service, service_data, blocking=True)
     assert getattr(problematic_appliance, mock_attr).call_count == len(attr_side_effect)
diff --git a/tests/components/home_connect/test_number.py b/tests/components/home_connect/test_number.py
deleted file mode 100644
index f70e307cb41..00000000000
--- a/tests/components/home_connect/test_number.py
+++ /dev/null
@@ -1,176 +0,0 @@
-"""Tests for home_connect number entities."""
-
-from collections.abc import Awaitable, Callable, Generator
-import random
-from unittest.mock import MagicMock, Mock
-
-from homeconnect.api import HomeConnectError
-import pytest
-
-from homeassistant.components.home_connect.const import (
-    ATTR_CONSTRAINTS,
-    ATTR_STEPSIZE,
-    ATTR_UNIT,
-    ATTR_VALUE,
-)
-from homeassistant.components.number import (
-    ATTR_MAX,
-    ATTR_MIN,
-    ATTR_VALUE as SERVICE_ATTR_VALUE,
-    DEFAULT_MIN_VALUE,
-    DOMAIN as NUMBER_DOMAIN,
-    SERVICE_SET_VALUE,
-)
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-
-from .conftest import get_all_appliances
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def platforms() -> list[str]:
-    """Fixture to specify platforms to test."""
-    return [Platform.NUMBER]
-
-
-async def test_number(
-    bypass_throttle: Generator[None],
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: Mock,
-) -> None:
-    """Test number entity."""
-    get_appliances.side_effect = get_all_appliances
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-
-@pytest.mark.parametrize("appliance", ["Refrigerator"], indirect=True)
-@pytest.mark.parametrize(
-    (
-        "entity_id",
-        "setting_key",
-        "min_value",
-        "max_value",
-        "step_size",
-        "unit_of_measurement",
-    ),
-    [
-        (
-            f"{NUMBER_DOMAIN.lower()}.refrigerator_refrigerator_temperature",
-            "Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator",
-            7,
-            15,
-            0.1,
-            "°C",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_number_entity_functionality(
-    appliance: Mock,
-    entity_id: str,
-    setting_key: str,
-    bypass_throttle: Generator[None],
-    min_value: int,
-    max_value: int,
-    step_size: float,
-    unit_of_measurement: str,
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-) -> None:
-    """Test number entity functionality."""
-    appliance.get.side_effect = [
-        {
-            ATTR_CONSTRAINTS: {
-                ATTR_MIN: min_value,
-                ATTR_MAX: max_value,
-                ATTR_STEPSIZE: step_size,
-            },
-            ATTR_UNIT: unit_of_measurement,
-        }
-    ]
-    get_appliances.return_value = [appliance]
-    current_value = min_value
-    appliance.status.update({setting_key: {ATTR_VALUE: current_value}})
-
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state is ConfigEntryState.LOADED
-    assert hass.states.is_state(entity_id, str(current_value))
-    state = hass.states.get(entity_id)
-    assert state.attributes["min"] == min_value
-    assert state.attributes["max"] == max_value
-    assert state.attributes["step"] == step_size
-    assert state.attributes["unit_of_measurement"] == unit_of_measurement
-
-    new_value = random.randint(min_value + 1, max_value)
-    await hass.services.async_call(
-        NUMBER_DOMAIN,
-        SERVICE_SET_VALUE,
-        {
-            ATTR_ENTITY_ID: entity_id,
-            SERVICE_ATTR_VALUE: new_value,
-        },
-        blocking=True,
-    )
-    appliance.set_setting.assert_called_once_with(setting_key, new_value)
-
-
-@pytest.mark.parametrize("problematic_appliance", ["Refrigerator"], indirect=True)
-@pytest.mark.parametrize(
-    ("entity_id", "setting_key", "mock_attr"),
-    [
-        (
-            f"{NUMBER_DOMAIN.lower()}.refrigerator_refrigerator_temperature",
-            "Refrigeration.FridgeFreezer.Setting.SetpointTemperatureRefrigerator",
-            "set_setting",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_number_entity_error(
-    problematic_appliance: Mock,
-    entity_id: str,
-    setting_key: str,
-    mock_attr: str,
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-) -> None:
-    """Test number entity error."""
-    get_appliances.return_value = [problematic_appliance]
-
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
-    problematic_appliance.status.update({setting_key: {}})
-    assert await integration_setup()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
-
-    with pytest.raises(
-        ServiceValidationError, match=r"Error.*assign.*value.*to.*setting.*"
-    ):
-        await hass.services.async_call(
-            NUMBER_DOMAIN,
-            SERVICE_SET_VALUE,
-            {
-                ATTR_ENTITY_ID: entity_id,
-                SERVICE_ATTR_VALUE: DEFAULT_MIN_VALUE,
-            },
-            blocking=True,
-        )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
diff --git a/tests/components/home_connect/test_sensor.py b/tests/components/home_connect/test_sensor.py
index f2ee3b13922..d98311ac5e5 100644
--- a/tests/components/home_connect/test_sensor.py
+++ b/tests/components/home_connect/test_sensor.py
@@ -8,10 +8,6 @@ from homeconnect.api import HomeConnectAPI
 import pytest
 
 from homeassistant.components.home_connect.const import (
-    BSH_DOOR_STATE,
-    BSH_DOOR_STATE_CLOSED,
-    BSH_DOOR_STATE_LOCKED,
-    BSH_DOOR_STATE_OPEN,
     BSH_EVENT_PRESENT_STATE_CONFIRMED,
     BSH_EVENT_PRESENT_STATE_OFF,
     BSH_EVENT_PRESENT_STATE_PRESENT,
@@ -228,27 +224,6 @@ async def test_remaining_prog_time_edge_cases(
 @pytest.mark.parametrize(
     ("entity_id", "status_key", "event_value_update", "expected", "appliance"),
     [
-        (
-            "sensor.dishwasher_door",
-            BSH_DOOR_STATE,
-            BSH_DOOR_STATE_LOCKED,
-            "locked",
-            "Dishwasher",
-        ),
-        (
-            "sensor.dishwasher_door",
-            BSH_DOOR_STATE,
-            BSH_DOOR_STATE_CLOSED,
-            "closed",
-            "Dishwasher",
-        ),
-        (
-            "sensor.dishwasher_door",
-            BSH_DOOR_STATE,
-            BSH_DOOR_STATE_OPEN,
-            "open",
-            "Dishwasher",
-        ),
         (
             "sensor.fridgefreezer_freezer_door_alarm",
             "EVENT_NOT_IN_STATUS_YET_SO_SET_TO_OFF",
diff --git a/tests/components/home_connect/test_switch.py b/tests/components/home_connect/test_switch.py
index 06201ffd58c..1f1da1cd790 100644
--- a/tests/components/home_connect/test_switch.py
+++ b/tests/components/home_connect/test_switch.py
@@ -7,14 +7,11 @@ from homeconnect.api import HomeConnectAppliance, HomeConnectError
 import pytest
 
 from homeassistant.components.home_connect.const import (
-    ATTR_ALLOWED_VALUES,
-    ATTR_CONSTRAINTS,
     BSH_ACTIVE_PROGRAM,
     BSH_CHILD_LOCK_STATE,
     BSH_OPERATION_STATE,
     BSH_POWER_OFF,
     BSH_POWER_ON,
-    BSH_POWER_STANDBY,
     BSH_POWER_STATE,
     REFRIGERATION_SUPERMODEFREEZER,
 )
@@ -29,7 +26,6 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
 
 from .conftest import get_all_appliances
 
@@ -84,6 +80,32 @@ async def test_switches(
             STATE_OFF,
             "Dishwasher",
         ),
+        (
+            "switch.dishwasher_power",
+            {BSH_POWER_STATE: {"value": BSH_POWER_ON}},
+            SERVICE_TURN_ON,
+            STATE_ON,
+            "Dishwasher",
+        ),
+        (
+            "switch.dishwasher_power",
+            {BSH_POWER_STATE: {"value": BSH_POWER_OFF}},
+            SERVICE_TURN_OFF,
+            STATE_OFF,
+            "Dishwasher",
+        ),
+        (
+            "switch.dishwasher_power",
+            {
+                BSH_POWER_STATE: {"value": ""},
+                BSH_OPERATION_STATE: {
+                    "value": "BSH.Common.EnumType.OperationState.Inactive"
+                },
+            },
+            SERVICE_TURN_OFF,
+            STATE_OFF,
+            "Dishwasher",
+        ),
         (
             "switch.dishwasher_child_lock",
             {BSH_CHILD_LOCK_STATE: {"value": True}},
@@ -131,14 +153,7 @@ async def test_switch_functionality(
 
 
 @pytest.mark.parametrize(
-    (
-        "entity_id",
-        "status",
-        "service",
-        "mock_attr",
-        "problematic_appliance",
-        "exception_match",
-    ),
+    ("entity_id", "status", "service", "mock_attr", "problematic_appliance"),
     [
         (
             "switch.dishwasher_program_mix",
@@ -146,7 +161,6 @@ async def test_switch_functionality(
             SERVICE_TURN_ON,
             "start_program",
             "Dishwasher",
-            r"Error.*start.*program.*",
         ),
         (
             "switch.dishwasher_program_mix",
@@ -154,15 +168,6 @@ async def test_switch_functionality(
             SERVICE_TURN_OFF,
             "stop_program",
             "Dishwasher",
-            r"Error.*stop.*program.*",
-        ),
-        (
-            "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_OFF}},
-            SERVICE_TURN_OFF,
-            "set_setting",
-            "Dishwasher",
-            r"Error.*turn.*off.*appliance.*value",
         ),
         (
             "switch.dishwasher_power",
@@ -170,7 +175,13 @@ async def test_switch_functionality(
             SERVICE_TURN_ON,
             "set_setting",
             "Dishwasher",
-            r"Error.*turn.*on.*appliance.*",
+        ),
+        (
+            "switch.dishwasher_power",
+            {BSH_POWER_STATE: {"value": ""}},
+            SERVICE_TURN_OFF,
+            "set_setting",
+            "Dishwasher",
         ),
         (
             "switch.dishwasher_child_lock",
@@ -178,7 +189,6 @@ async def test_switch_functionality(
             SERVICE_TURN_ON,
             "set_setting",
             "Dishwasher",
-            r"Error.*turn.*on.*key.*",
         ),
         (
             "switch.dishwasher_child_lock",
@@ -186,7 +196,6 @@ async def test_switch_functionality(
             SERVICE_TURN_OFF,
             "set_setting",
             "Dishwasher",
-            r"Error.*turn.*off.*key.*",
         ),
     ],
     indirect=["problematic_appliance"],
@@ -196,7 +205,6 @@ async def test_switch_exception_handling(
     status: dict,
     service: str,
     mock_attr: str,
-    exception_match: str,
     bypass_throttle: Generator[None],
     hass: HomeAssistant,
     integration_setup: Callable[[], Awaitable[bool]],
@@ -219,10 +227,9 @@ async def test_switch_exception_handling(
     with pytest.raises(HomeConnectError):
         getattr(problematic_appliance, mock_attr)()
 
-    with pytest.raises(ServiceValidationError, match=exception_match):
-        await hass.services.async_call(
-            SWITCH_DOMAIN, service, {"entity_id": entity_id}, blocking=True
-        )
+    await hass.services.async_call(
+        SWITCH_DOMAIN, service, {"entity_id": entity_id}, blocking=True
+    )
     assert getattr(problematic_appliance, mock_attr).call_count == 2
 
 
@@ -282,14 +289,7 @@ async def test_ent_desc_switch_functionality(
 
 
 @pytest.mark.parametrize(
-    (
-        "entity_id",
-        "status",
-        "service",
-        "mock_attr",
-        "problematic_appliance",
-        "exception_match",
-    ),
+    ("entity_id", "status", "service", "mock_attr", "problematic_appliance"),
     [
         (
             "switch.fridgefreezer_freezer_super_mode",
@@ -297,7 +297,6 @@ async def test_ent_desc_switch_functionality(
             SERVICE_TURN_ON,
             "set_setting",
             "FridgeFreezer",
-            r"Error.*turn.*on.*key.*",
         ),
         (
             "switch.fridgefreezer_freezer_super_mode",
@@ -305,7 +304,6 @@ async def test_ent_desc_switch_functionality(
             SERVICE_TURN_OFF,
             "set_setting",
             "FridgeFreezer",
-            r"Error.*turn.*off.*key.*",
         ),
     ],
     indirect=["problematic_appliance"],
@@ -315,7 +313,6 @@ async def test_ent_desc_switch_exception_handling(
     status: dict,
     service: str,
     mock_attr: str,
-    exception_match: str,
     bypass_throttle: Generator[None],
     hass: HomeAssistant,
     integration_setup: Callable[[], Awaitable[bool]],
@@ -344,165 +341,7 @@ async def test_ent_desc_switch_exception_handling(
         getattr(problematic_appliance, mock_attr)()
 
     problematic_appliance.status.update(status)
-    with pytest.raises(ServiceValidationError, match=exception_match):
-        await hass.services.async_call(
-            SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id}, blocking=True
-        )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "status", "allowed_values", "service", "power_state", "appliance"),
-    [
-        (
-            "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_ON}},
-            [BSH_POWER_ON, BSH_POWER_OFF],
-            SERVICE_TURN_ON,
-            STATE_ON,
-            "Dishwasher",
-        ),
-        (
-            "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_OFF}},
-            [BSH_POWER_ON, BSH_POWER_OFF],
-            SERVICE_TURN_OFF,
-            STATE_OFF,
-            "Dishwasher",
-        ),
-        (
-            "switch.dishwasher_power",
-            {
-                BSH_POWER_STATE: {"value": ""},
-                BSH_OPERATION_STATE: {
-                    "value": "BSH.Common.EnumType.OperationState.Run"
-                },
-            },
-            [BSH_POWER_ON],
-            SERVICE_TURN_ON,
-            STATE_ON,
-            "Dishwasher",
-        ),
-        (
-            "switch.dishwasher_power",
-            {
-                BSH_POWER_STATE: {"value": ""},
-                BSH_OPERATION_STATE: {
-                    "value": "BSH.Common.EnumType.OperationState.Inactive"
-                },
-            },
-            [BSH_POWER_ON],
-            SERVICE_TURN_ON,
-            STATE_OFF,
-            "Dishwasher",
-        ),
-        (
-            "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_ON}},
-            [BSH_POWER_ON, BSH_POWER_STANDBY],
-            SERVICE_TURN_ON,
-            STATE_ON,
-            "Dishwasher",
-        ),
-        (
-            "switch.dishwasher_power",
-            {BSH_POWER_STATE: {"value": BSH_POWER_STANDBY}},
-            [BSH_POWER_ON, BSH_POWER_STANDBY],
-            SERVICE_TURN_OFF,
-            STATE_OFF,
-            "Dishwasher",
-        ),
-    ],
-    indirect=["appliance"],
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_power_swtich(
-    entity_id: str,
-    status: dict,
-    allowed_values: list[str],
-    service: str,
-    power_state: str,
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    appliance: Mock,
-    get_appliances: MagicMock,
-) -> None:
-    """Test power switch functionality."""
-    appliance.get.side_effect = [
-        {
-            ATTR_CONSTRAINTS: {
-                ATTR_ALLOWED_VALUES: allowed_values,
-            },
-        }
-    ]
-    appliance.status.update(SETTINGS_STATUS)
-    appliance.status.update(status)
-    get_appliances.return_value = [appliance]
-
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-
     await hass.services.async_call(
         SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: entity_id}, blocking=True
     )
-    assert hass.states.is_state(entity_id, power_state)
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "allowed_values", "service", "appliance", "exception_match"),
-    [
-        (
-            "switch.dishwasher_power",
-            [BSH_POWER_ON],
-            SERVICE_TURN_OFF,
-            "Dishwasher",
-            r".*not support.*turn.*off.*",
-        ),
-        (
-            "switch.dishwasher_power",
-            None,
-            SERVICE_TURN_OFF,
-            "Dishwasher",
-            r".*Unable.*turn.*off.*support.*not.*determined.*",
-        ),
-    ],
-    indirect=["appliance"],
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_power_switch_service_validation_errors(
-    entity_id: str,
-    allowed_values: list[str],
-    service: str,
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    appliance: Mock,
-    exception_match: str,
-    get_appliances: MagicMock,
-) -> None:
-    """Test power switch functionality validation errors."""
-    if allowed_values:
-        appliance.get.side_effect = [
-            {
-                ATTR_CONSTRAINTS: {
-                    ATTR_ALLOWED_VALUES: allowed_values,
-                },
-            }
-        ]
-    appliance.status.update(SETTINGS_STATUS)
-    get_appliances.return_value = [appliance]
-
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state == ConfigEntryState.LOADED
-
-    appliance.status.update({BSH_POWER_STATE: {"value": BSH_POWER_ON}})
-
-    with pytest.raises(ServiceValidationError, match=exception_match):
-        await hass.services.async_call(
-            SWITCH_DOMAIN, service, {"entity_id": entity_id}, blocking=True
-        )
+    assert getattr(problematic_appliance, mock_attr).call_count == 2
diff --git a/tests/components/home_connect/test_time.py b/tests/components/home_connect/test_time.py
deleted file mode 100644
index 25ce39786a5..00000000000
--- a/tests/components/home_connect/test_time.py
+++ /dev/null
@@ -1,150 +0,0 @@
-"""Tests for home_connect time entities."""
-
-from collections.abc import Awaitable, Callable, Generator
-from datetime import time
-from unittest.mock import MagicMock, Mock
-
-from homeconnect.api import HomeConnectError
-import pytest
-
-from homeassistant.components.home_connect.const import ATTR_VALUE
-from homeassistant.components.time import DOMAIN as TIME_DOMAIN, SERVICE_SET_VALUE
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_TIME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-
-from .conftest import get_all_appliances
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def platforms() -> list[str]:
-    """Fixture to specify platforms to test."""
-    return [Platform.TIME]
-
-
-async def test_time(
-    bypass_throttle: Generator[None],
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: Mock,
-) -> None:
-    """Test time entity."""
-    get_appliances.side_effect = get_all_appliances
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-
-@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
-@pytest.mark.parametrize(
-    ("entity_id", "setting_key", "setting_value", "expected_state"),
-    [
-        (
-            f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
-            {ATTR_VALUE: 59},
-            str(time(second=59)),
-        ),
-        (
-            f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
-            {ATTR_VALUE: None},
-            "unknown",
-        ),
-        (
-            f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
-            None,
-            "unknown",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_time_entity_functionality(
-    appliance: Mock,
-    entity_id: str,
-    setting_key: str,
-    setting_value: dict,
-    expected_state: str,
-    bypass_throttle: Generator[None],
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-) -> None:
-    """Test time entity functionality."""
-    get_appliances.return_value = [appliance]
-    appliance.status.update({setting_key: setting_value})
-
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
-    assert await integration_setup()
-    assert config_entry.state is ConfigEntryState.LOADED
-    assert hass.states.is_state(entity_id, expected_state)
-
-    new_value = 30
-    assert hass.states.get(entity_id).state != new_value
-    await hass.services.async_call(
-        TIME_DOMAIN,
-        SERVICE_SET_VALUE,
-        {
-            ATTR_ENTITY_ID: entity_id,
-            ATTR_TIME: time(second=new_value),
-        },
-        blocking=True,
-    )
-    appliance.set_setting.assert_called_once_with(setting_key, new_value)
-
-
-@pytest.mark.parametrize("problematic_appliance", ["Oven"], indirect=True)
-@pytest.mark.parametrize(
-    ("entity_id", "setting_key", "mock_attr"),
-    [
-        (
-            f"{TIME_DOMAIN}.oven_alarm_clock",
-            "BSH.Common.Setting.AlarmClock",
-            "set_setting",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("bypass_throttle")
-async def test_time_entity_error(
-    problematic_appliance: Mock,
-    entity_id: str,
-    setting_key: str,
-    mock_attr: str,
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    integration_setup: Callable[[], Awaitable[bool]],
-    setup_credentials: None,
-    get_appliances: MagicMock,
-) -> None:
-    """Test time entity error."""
-    get_appliances.return_value = [problematic_appliance]
-
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
-    problematic_appliance.status.update({setting_key: {}})
-    assert await integration_setup()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    with pytest.raises(HomeConnectError):
-        getattr(problematic_appliance, mock_attr)()
-
-    with pytest.raises(
-        ServiceValidationError, match=r"Error.*assign.*value.*to.*setting.*"
-    ):
-        await hass.services.async_call(
-            TIME_DOMAIN,
-            SERVICE_SET_VALUE,
-            {
-                ATTR_ENTITY_ID: entity_id,
-                ATTR_TIME: time(minute=1),
-            },
-            blocking=True,
-        )
-    assert getattr(problematic_appliance, mock_attr).call_count == 2
diff --git a/tests/components/homeassistant/test_init.py b/tests/components/homeassistant/test_init.py
index 33d78cd6c9f..a66d13e5ffe 100644
--- a/tests/components/homeassistant/test_init.py
+++ b/tests/components/homeassistant/test_init.py
@@ -127,7 +127,7 @@ async def test_reload_core_conf(hass: HomeAssistant) -> None:
 
 @patch("homeassistant.config.os.path.isfile", Mock(return_value=True))
 @patch("homeassistant.components.homeassistant._LOGGER.error")
-@patch("homeassistant.core_config.async_process_ha_core_config")
+@patch("homeassistant.config.async_process_ha_core_config")
 async def test_reload_core_with_wrong_conf(
     mock_process, mock_error, hass: HomeAssistant
 ) -> None:
@@ -242,7 +242,7 @@ async def test_setting_location(hass: HomeAssistant) -> None:
     assert elevation != 50
     await hass.services.async_call(
         "homeassistant",
-        SERVICE_SET_LOCATION,
+        "set_location",
         {"latitude": 30, "longitude": 40},
         blocking=True,
     )
@@ -253,24 +253,12 @@ async def test_setting_location(hass: HomeAssistant) -> None:
 
     await hass.services.async_call(
         "homeassistant",
-        SERVICE_SET_LOCATION,
+        "set_location",
         {"latitude": 30, "longitude": 40, "elevation": 50},
         blocking=True,
     )
-    assert hass.config.latitude == 30
-    assert hass.config.longitude == 40
     assert hass.config.elevation == 50
 
-    await hass.services.async_call(
-        "homeassistant",
-        SERVICE_SET_LOCATION,
-        {"latitude": 30, "longitude": 40, "elevation": 0},
-        blocking=True,
-    )
-    assert hass.config.latitude == 30
-    assert hass.config.longitude == 40
-    assert hass.config.elevation == 0
-
 
 async def test_require_admin(
     hass: HomeAssistant, hass_read_only_user: MockUser
diff --git a/tests/components/homeassistant/triggers/test_time.py b/tests/components/homeassistant/triggers/test_time.py
index 8900998a7b8..5455b06d1c0 100644
--- a/tests/components/homeassistant/triggers/test_time.py
+++ b/tests/components/homeassistant/triggers/test_time.py
@@ -159,10 +159,7 @@ async def test_if_fires_using_at_input_datetime(
 @pytest.mark.parametrize(
     ("conf_at", "trigger_deltas"),
     [
-        (
-            ["5:00:00", "6:00:00", "{{ '7:00:00' }}"],
-            [timedelta(0), timedelta(hours=1), timedelta(hours=2)],
-        ),
+        (["5:00:00", "6:00:00"], [timedelta(0), timedelta(hours=1)]),
         (
             [
                 "5:00:05",
@@ -438,14 +435,10 @@ async def test_untrack_time_change(hass: HomeAssistant) -> None:
     assert len(mock_track_time_change.mock_calls) == 3
 
 
-@pytest.mark.parametrize(
-    ("at_sensor"), ["sensor.next_alarm", "{{ 'sensor.next_alarm' }}"]
-)
 async def test_if_fires_using_at_sensor(
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
     service_calls: list[ServiceCall],
-    at_sensor: str,
 ) -> None:
     """Test for firing at sensor time."""
     now = dt_util.now()
@@ -468,7 +461,7 @@ async def test_if_fires_using_at_sensor(
         automation.DOMAIN,
         {
             automation.DOMAIN: {
-                "trigger": {"platform": "time", "at": at_sensor},
+                "trigger": {"platform": "time", "at": "sensor.next_alarm"},
                 "action": {
                     "service": "test.automation",
                     "data_template": {"some": some_data},
@@ -633,9 +626,6 @@ async def test_if_fires_using_at_sensor_with_offset(
         {"platform": "time", "at": "input_datetime.bla"},
         {"platform": "time", "at": "sensor.bla"},
         {"platform": "time", "at": "12:34"},
-        {"platform": "time", "at": "{{ '12:34' }}"},
-        {"platform": "time", "at": "{{ 'input_datetime.bla' }}"},
-        {"platform": "time", "at": "{{ 'sensor.bla' }}"},
         {"platform": "time", "at": {"entity_id": "sensor.bla", "offset": "-00:01"}},
         {
             "platform": "time",
@@ -734,70 +724,3 @@ async def test_datetime_in_past_on_load(
         service_calls[2].data["some"]
         == f"time-{future.day}-{future.hour}-input_datetime.my_trigger"
     )
-
-
-@pytest.mark.parametrize(
-    "trigger",
-    [
-        {"platform": "time", "at": "{{ 'hello world' }}"},
-        {"platform": "time", "at": "{{ 74 }}"},
-        {"platform": "time", "at": "{{ true }}"},
-        {"platform": "time", "at": "{{ 7.5465 }}"},
-    ],
-)
-async def test_if_at_template_renders_bad_value(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    trigger: dict[str, str],
-) -> None:
-    """Test for invalid templates."""
-    assert await async_setup_component(
-        hass,
-        automation.DOMAIN,
-        {
-            automation.DOMAIN: {
-                "trigger": trigger,
-                "action": {
-                    "service": "test.automation",
-                },
-            }
-        },
-    )
-
-    await hass.async_block_till_done()
-
-    assert (
-        "expected HH:MM, HH:MM:SS or Entity ID with domain 'input_datetime' or 'sensor'"
-        in caplog.text
-    )
-
-
-@pytest.mark.parametrize(
-    "trigger",
-    [
-        {"platform": "time", "at": "{{ now().strftime('%H:%M') }}"},
-        {"platform": "time", "at": "{{ states('sensor.blah') | int(0) }}"},
-    ],
-)
-async def test_if_at_template_limited_template(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    trigger: dict[str, str],
-) -> None:
-    """Test for invalid templates."""
-    assert await async_setup_component(
-        hass,
-        automation.DOMAIN,
-        {
-            automation.DOMAIN: {
-                "trigger": trigger,
-                "action": {
-                    "service": "test.automation",
-                },
-            }
-        },
-    )
-
-    await hass.async_block_till_done()
-
-    assert "is not supported in limited templates" in caplog.text
diff --git a/tests/components/homekit/test_type_lights.py b/tests/components/homekit/test_type_lights.py
index a45e4988c36..d365165aca4 100644
--- a/tests/components/homekit/test_type_lights.py
+++ b/tests/components/homekit/test_type_lights.py
@@ -226,24 +226,6 @@ async def test_light_brightness(
     assert len(events) == 3
     assert events[-1].data[ATTR_VALUE] == f"Set state to 0, brightness at 0{PERCENTAGE}"
 
-    hk_driver.set_characteristics(
-        {
-            HAP_REPR_CHARS: [
-                {
-                    HAP_REPR_AID: acc.aid,
-                    HAP_REPR_IID: char_brightness_iid,
-                    HAP_REPR_VALUE: 0,
-                },
-            ]
-        },
-        "mock_addr",
-    )
-    await _wait_for_light_coalesce(hass)
-    assert call_turn_off
-    assert call_turn_off[0].data[ATTR_ENTITY_ID] == entity_id
-    assert len(events) == 4
-    assert events[-1].data[ATTR_VALUE] == f"Set state to 0, brightness at 0{PERCENTAGE}"
-
     # 0 is a special case for homekit, see "Handle Brightness"
     # in update_state
     hass.states.async_set(
diff --git a/tests/components/homekit/test_type_security_systems.py b/tests/components/homekit/test_type_security_systems.py
index 94b0e68e76d..eb662823b4c 100644
--- a/tests/components/homekit/test_type_security_systems.py
+++ b/tests/components/homekit/test_type_security_systems.py
@@ -6,14 +6,19 @@ import pytest
 from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.components.homekit.const import ATTR_VALUE
 from homeassistant.components.homekit.type_security_systems import SecuritySystem
 from homeassistant.const import (
     ATTR_CODE,
     ATTR_ENTITY_ID,
-    STATE_UNAVAILABLE,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
     STATE_UNKNOWN,
 )
 from homeassistant.core import Event, HomeAssistant
@@ -41,27 +46,27 @@ async def test_switch_set_state(
     assert acc.char_current_state.value == 3
     assert acc.char_target_state.value == 3
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_AWAY)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_AWAY)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 1
     assert acc.char_current_state.value == 1
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_HOME)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_HOME)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 0
     assert acc.char_current_state.value == 0
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_NIGHT)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_NIGHT)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 2
     assert acc.char_current_state.value == 2
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.DISARMED)
+    hass.states.async_set(entity_id, STATE_ALARM_DISARMED)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 3
     assert acc.char_current_state.value == 3
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.TRIGGERED)
+    hass.states.async_set(entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 3
     assert acc.char_current_state.value == 4
@@ -156,42 +161,42 @@ async def test_arming(hass: HomeAssistant, hk_driver) -> None:
     acc.run()
     await hass.async_block_till_done()
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_AWAY)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_AWAY)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 1
     assert acc.char_current_state.value == 1
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_HOME)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_HOME)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 0
     assert acc.char_current_state.value == 0
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_VACATION)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_VACATION)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 1
     assert acc.char_current_state.value == 1
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_NIGHT)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_NIGHT)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 2
     assert acc.char_current_state.value == 2
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMING)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMING)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 1
     assert acc.char_current_state.value == 3
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.DISARMED)
+    hass.states.async_set(entity_id, STATE_ALARM_DISARMED)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 3
     assert acc.char_current_state.value == 3
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.ARMED_AWAY)
+    hass.states.async_set(entity_id, STATE_ALARM_ARMED_AWAY)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 1
     assert acc.char_current_state.value == 1
 
-    hass.states.async_set(entity_id, AlarmControlPanelState.TRIGGERED)
+    hass.states.async_set(entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert acc.char_target_state.value == 1
     assert acc.char_current_state.value == 4
@@ -312,33 +317,3 @@ async def test_supported_states(hass: HomeAssistant, hk_driver) -> None:
 
         for val in valid_target_values.values():
             assert val in test_config.get("target_values")
-
-
-@pytest.mark.parametrize(
-    ("state"),
-    [
-        (None),
-        ("None"),
-        (STATE_UNKNOWN),
-        (STATE_UNAVAILABLE),
-    ],
-)
-async def test_handle_non_alarm_states(
-    hass: HomeAssistant, hk_driver, events: list[Event], state: str
-) -> None:
-    """Test we can handle states that should not raise."""
-    code = "1234"
-    config = {ATTR_CODE: code}
-    entity_id = "alarm_control_panel.test"
-
-    hass.states.async_set(entity_id, state)
-    await hass.async_block_till_done()
-    acc = SecuritySystem(hass, hk_driver, "SecuritySystem", entity_id, 2, config)
-    acc.run()
-    await hass.async_block_till_done()
-
-    assert acc.aid == 2
-    assert acc.category == 11  # AlarmSystem
-
-    assert acc.char_current_state.value == 3
-    assert acc.char_target_state.value == 3
diff --git a/tests/components/homekit_controller/fixtures/u_by_moen_ts3304.json b/tests/components/homekit_controller/fixtures/u_by_moen_ts3304.json
deleted file mode 100644
index a3c24eb85c3..00000000000
--- a/tests/components/homekit_controller/fixtures/u_by_moen_ts3304.json
+++ /dev/null
@@ -1,378 +0,0 @@
-[
-  {
-    "aid": 1,
-    "services": [
-      {
-        "iid": 1,
-        "type": "0000003E-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "00000023-0000-1000-8000-0026BB765291",
-            "iid": 2,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "U by Moen-015F44",
-            "description": "Name",
-            "maxLen": 64
-          },
-          {
-            "type": "00000020-0000-1000-8000-0026BB765291",
-            "iid": 3,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "Moen Incorporated",
-            "description": "Manufacturer",
-            "maxLen": 64
-          },
-          {
-            "type": "00000021-0000-1000-8000-0026BB765291",
-            "iid": 4,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "TS3304",
-            "description": "Model",
-            "maxLen": 64
-          },
-          {
-            "type": "00000030-0000-1000-8000-0026BB765291",
-            "iid": 5,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "**REDACTED**",
-            "description": "Serial Number",
-            "maxLen": 64
-          },
-          {
-            "type": "00000014-0000-1000-8000-0026BB765291",
-            "iid": 6,
-            "perms": ["pw"],
-            "format": "bool",
-            "description": "Identify"
-          },
-          {
-            "type": "00000052-0000-1000-8000-0026BB765291",
-            "iid": 7,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "3.3.0",
-            "description": "Firmware Revision",
-            "maxLen": 64
-          }
-        ]
-      },
-      {
-        "iid": 8,
-        "type": "000000D7-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "000000B0-0000-1000-8000-0026BB765291",
-            "iid": 9,
-            "perms": ["pr", "pw", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Active",
-            "minValue": 0,
-            "maxValue": 1,
-            "minStep": 1
-          },
-          {
-            "type": "00000023-0000-1000-8000-0026BB765291",
-            "iid": 10,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "u by moen",
-            "description": "Name",
-            "maxLen": 64
-          }
-        ],
-        "linked": [11, 17, 22, 27, 32]
-      },
-      {
-        "iid": 11,
-        "type": "000000BC-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "000000B0-0000-1000-8000-0026BB765291",
-            "iid": 12,
-            "perms": ["pr", "pw", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Active",
-            "minValue": 0,
-            "maxValue": 1,
-            "minStep": 1
-          },
-          {
-            "type": "00000011-0000-1000-8000-0026BB765291",
-            "iid": 13,
-            "perms": ["pr", "ev"],
-            "format": "float",
-            "value": 21.66666,
-            "description": "Current Temperature",
-            "unit": "celsius",
-            "minValue": 0.0,
-            "maxValue": 100.0,
-            "minStep": 0.1
-          },
-          {
-            "type": "000000B1-0000-1000-8000-0026BB765291",
-            "iid": 14,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Current Heater Cooler State",
-            "minValue": 0,
-            "maxValue": 3,
-            "minStep": 1
-          },
-          {
-            "type": "000000B2-0000-1000-8000-0026BB765291",
-            "iid": 15,
-            "perms": ["pr", "pw", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Target Heater Cooler State",
-            "minValue": 0,
-            "maxValue": 2,
-            "minStep": 1
-          },
-          {
-            "type": "00000012-0000-1000-8000-0026BB765291",
-            "iid": 16,
-            "perms": ["pr", "pw", "ev"],
-            "format": "float",
-            "value": 37.77777,
-            "description": "Heating Threshold Temperature",
-            "unit": "celsius",
-            "minValue": 15.55556,
-            "maxValue": 48.88888,
-            "minStep": 0.1
-          }
-        ]
-      },
-      {
-        "iid": 17,
-        "type": "000000D0-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "000000B0-0000-1000-8000-0026BB765291",
-            "iid": 18,
-            "perms": ["pr", "pw", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Active",
-            "minValue": 0,
-            "maxValue": 1,
-            "minStep": 1
-          },
-          {
-            "type": "000000D2-0000-1000-8000-0026BB765291",
-            "iid": 19,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "In Use"
-          },
-          {
-            "type": "000000D5-0000-1000-8000-0026BB765291",
-            "iid": 20,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 2,
-            "description": "Valve Type"
-          },
-          {
-            "type": "00000023-0000-1000-8000-0026BB765291",
-            "iid": 21,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "Outlet 1",
-            "description": "Name",
-            "maxLen": 64
-          }
-        ]
-      },
-      {
-        "iid": 22,
-        "type": "000000D0-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "000000B0-0000-1000-8000-0026BB765291",
-            "iid": 23,
-            "perms": ["pr", "pw", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Active",
-            "minValue": 0,
-            "maxValue": 1,
-            "minStep": 1
-          },
-          {
-            "type": "000000D2-0000-1000-8000-0026BB765291",
-            "iid": 24,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "In Use"
-          },
-          {
-            "type": "000000D5-0000-1000-8000-0026BB765291",
-            "iid": 25,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 2,
-            "description": "Valve Type"
-          },
-          {
-            "type": "00000023-0000-1000-8000-0026BB765291",
-            "iid": 26,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "Outlet 2",
-            "description": "Name",
-            "maxLen": 64
-          }
-        ]
-      },
-      {
-        "iid": 27,
-        "type": "000000D0-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "000000B0-0000-1000-8000-0026BB765291",
-            "iid": 28,
-            "perms": ["pr", "pw", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Active",
-            "minValue": 0,
-            "maxValue": 1,
-            "minStep": 1
-          },
-          {
-            "type": "000000D2-0000-1000-8000-0026BB765291",
-            "iid": 29,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "In Use"
-          },
-          {
-            "type": "000000D5-0000-1000-8000-0026BB765291",
-            "iid": 30,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 2,
-            "description": "Valve Type"
-          },
-          {
-            "type": "00000023-0000-1000-8000-0026BB765291",
-            "iid": 31,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "Outlet 3",
-            "description": "Name",
-            "maxLen": 64
-          }
-        ]
-      },
-      {
-        "iid": 32,
-        "type": "000000D0-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "000000B0-0000-1000-8000-0026BB765291",
-            "iid": 33,
-            "perms": ["pr", "pw", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "Active",
-            "minValue": 0,
-            "maxValue": 1,
-            "minStep": 1
-          },
-          {
-            "type": "000000D2-0000-1000-8000-0026BB765291",
-            "iid": 34,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 0,
-            "description": "In Use"
-          },
-          {
-            "type": "000000D5-0000-1000-8000-0026BB765291",
-            "iid": 35,
-            "perms": ["pr", "ev"],
-            "format": "uint8",
-            "value": 2,
-            "description": "Valve Type"
-          },
-          {
-            "type": "00000023-0000-1000-8000-0026BB765291",
-            "iid": 36,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "Outlet 4",
-            "description": "Name",
-            "maxLen": 64
-          }
-        ]
-      },
-      {
-        "iid": 37,
-        "type": "00000010-0000-1000-8000-001D4B474349",
-        "characteristics": [
-          {
-            "type": "00000011-0000-1000-8000-001D4B474349",
-            "iid": 38,
-            "perms": ["pr", "ev", "hd"],
-            "format": "uint8",
-            "value": 1
-          },
-          {
-            "type": "00000012-0000-1000-8000-001D4B474349",
-            "iid": 39,
-            "perms": ["pw", "hd"],
-            "format": "uint8"
-          },
-          {
-            "type": "00000013-0000-1000-8000-001D4B474349",
-            "iid": 40,
-            "perms": ["pw", "hd"],
-            "format": "string",
-            "maxLen": 64
-          },
-          {
-            "type": "00000014-0000-1000-8000-001D4B474349",
-            "iid": 41,
-            "perms": ["pw", "hd"],
-            "format": "string",
-            "maxLen": 64
-          },
-          {
-            "type": "00000015-0000-1000-8000-001D4B474349",
-            "iid": 42,
-            "perms": ["pw", "hd"],
-            "format": "string",
-            "maxLen": 64
-          }
-        ]
-      },
-      {
-        "iid": 43,
-        "type": "000000A2-0000-1000-8000-0026BB765291",
-        "characteristics": [
-          {
-            "type": "00000037-0000-1000-8000-0026BB765291",
-            "iid": 44,
-            "perms": ["pr"],
-            "format": "string",
-            "value": "1.1.0",
-            "description": "Version",
-            "maxLen": 64
-          }
-        ]
-      }
-    ]
-  }
-]
diff --git a/tests/components/homekit_controller/snapshots/test_init.ambr b/tests/components/homekit_controller/snapshots/test_init.ambr
index 8304d567916..1030b6bcd9a 100644
--- a/tests/components/homekit_controller/snapshots/test_init.ambr
+++ b/tests/components/homekit_controller/snapshots/test_init.ambr
@@ -17758,397 +17758,6 @@
     }),
   ])
 # ---
-# name: test_snapshots[u_by_moen_ts3304]
-  list([
-    dict({
-      'device': dict({
-        'area_id': None,
-        'config_entries': list([
-          'TestData',
-        ]),
-        'configuration_url': None,
-        'connections': list([
-        ]),
-        'disabled_by': None,
-        'entry_type': None,
-        'hw_version': '',
-        'identifiers': list([
-          list([
-            'homekit_controller:accessory-id',
-            '00:00:00:00:00:00:aid:1',
-          ]),
-        ]),
-        'is_new': False,
-        'labels': list([
-        ]),
-        'manufacturer': 'Moen Incorporated',
-        'model': 'TS3304',
-        'model_id': None,
-        'name': 'U by Moen-015F44',
-        'name_by_user': None,
-        'primary_config_entry': 'TestData',
-        'serial_number': '**REDACTED**',
-        'suggested_area': None,
-        'sw_version': '3.3.0',
-      }),
-      'entities': list([
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'button',
-            'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-            'entity_id': 'button.u_by_moen_015f44_identify',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44 Identify',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': None,
-            'unique_id': '00:00:00:00:00:00_1_1_6',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'device_class': 'identify',
-              'friendly_name': 'U by Moen-015F44 Identify',
-            }),
-            'entity_id': 'button.u_by_moen_015f44_identify',
-            'state': 'unknown',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': dict({
-              'hvac_modes': list([
-                <HVACMode.HEAT_COOL: 'heat_cool'>,
-                <HVACMode.HEAT: 'heat'>,
-                <HVACMode.COOL: 'cool'>,
-                <HVACMode.OFF: 'off'>,
-              ]),
-              'max_temp': 35,
-              'min_temp': 7,
-              'target_temp_step': 1.0,
-            }),
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'climate',
-            'entity_category': None,
-            'entity_id': 'climate.u_by_moen_015f44',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': None,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': <ClimateEntityFeature: 385>,
-            'translation_key': None,
-            'unique_id': '00:00:00:00:00:00_1_11',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'current_temperature': 21.7,
-              'friendly_name': 'U by Moen-015F44',
-              'hvac_action': <HVACAction.OFF: 'off'>,
-              'hvac_modes': list([
-                <HVACMode.HEAT_COOL: 'heat_cool'>,
-                <HVACMode.HEAT: 'heat'>,
-                <HVACMode.COOL: 'cool'>,
-                <HVACMode.OFF: 'off'>,
-              ]),
-              'max_temp': 35,
-              'min_temp': 7,
-              'supported_features': <ClimateEntityFeature: 385>,
-              'target_temp_step': 1.0,
-              'temperature': None,
-            }),
-            'entity_id': 'climate.u_by_moen_015f44',
-            'state': 'off',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': dict({
-              'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-            }),
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'sensor',
-            'entity_category': None,
-            'entity_id': 'sensor.u_by_moen_015f44_current_temperature',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44 Current Temperature',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': None,
-            'unique_id': '00:00:00:00:00:00_1_11_13',
-            'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'device_class': 'temperature',
-              'friendly_name': 'U by Moen-015F44 Current Temperature',
-              'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-              'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-            }),
-            'entity_id': 'sensor.u_by_moen_015f44_current_temperature',
-            'state': '21.66666',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'switch',
-            'entity_category': None,
-            'entity_id': 'switch.u_by_moen_015f44',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': None,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': None,
-            'unique_id': '00:00:00:00:00:00_1_8',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'friendly_name': 'U by Moen-015F44',
-            }),
-            'entity_id': 'switch.u_by_moen_015f44',
-            'state': 'off',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'switch',
-            'entity_category': None,
-            'entity_id': 'switch.u_by_moen_015f44_outlet_1',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': None,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44 Outlet 1',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': 'valve',
-            'unique_id': '00:00:00:00:00:00_1_17',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'friendly_name': 'U by Moen-015F44 Outlet 1',
-              'in_use': False,
-            }),
-            'entity_id': 'switch.u_by_moen_015f44_outlet_1',
-            'state': 'off',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'switch',
-            'entity_category': None,
-            'entity_id': 'switch.u_by_moen_015f44_outlet_2',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': None,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44 Outlet 2',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': 'valve',
-            'unique_id': '00:00:00:00:00:00_1_22',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'friendly_name': 'U by Moen-015F44 Outlet 2',
-              'in_use': False,
-            }),
-            'entity_id': 'switch.u_by_moen_015f44_outlet_2',
-            'state': 'off',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'switch',
-            'entity_category': None,
-            'entity_id': 'switch.u_by_moen_015f44_outlet_3',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': None,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44 Outlet 3',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': 'valve',
-            'unique_id': '00:00:00:00:00:00_1_27',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'friendly_name': 'U by Moen-015F44 Outlet 3',
-              'in_use': False,
-            }),
-            'entity_id': 'switch.u_by_moen_015f44_outlet_3',
-            'state': 'off',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'switch',
-            'entity_category': None,
-            'entity_id': 'switch.u_by_moen_015f44_outlet_4',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': None,
-            'original_icon': None,
-            'original_name': 'U by Moen-015F44 Outlet 4',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': 'valve',
-            'unique_id': '00:00:00:00:00:00_1_32',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'friendly_name': 'U by Moen-015F44 Outlet 4',
-              'in_use': False,
-            }),
-            'entity_id': 'switch.u_by_moen_015f44_outlet_4',
-            'state': 'off',
-          }),
-        }),
-      ]),
-    }),
-  ])
-# ---
 # name: test_snapshots[velux_active_netatmo_co2]
   list([
     dict({
diff --git a/tests/components/homekit_controller/test_climate.py b/tests/components/homekit_controller/test_climate.py
index 62c73af9977..76935d314a5 100644
--- a/tests/components/homekit_controller/test_climate.py
+++ b/tests/components/homekit_controller/test_climate.py
@@ -6,7 +6,6 @@ from aiohomekit.model import Accessory
 from aiohomekit.model.characteristics import (
     ActivationStateValues,
     CharacteristicsTypes,
-    CurrentFanStateValues,
     CurrentHeaterCoolerStateValues,
     SwingModeValues,
     TargetHeaterCoolerStateValues,
@@ -67,9 +66,6 @@ def create_thermostat_service(accessory: Accessory) -> None:
     char = service.add_char(CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT)
     char.value = 0
 
-    char = service.add_char(CharacteristicsTypes.FAN_STATE_CURRENT)
-    char.value = 0
-
 
 def create_thermostat_service_min_max(accessory: Accessory) -> None:
     """Define thermostat characteristics."""
@@ -652,18 +648,6 @@ async def test_hvac_mode_vs_hvac_action(
     assert state.state == "heat"
     assert state.attributes["hvac_action"] == "idle"
 
-    # Simulate the fan running while the heat/cool is idle
-    await helper.async_update(
-        ServicesTypes.THERMOSTAT,
-        {
-            CharacteristicsTypes.FAN_STATE_CURRENT: CurrentFanStateValues.ACTIVE,
-        },
-    )
-
-    state = await helper.poll_and_get_state()
-    assert state.state == "heat"
-    assert state.attributes["hvac_action"] == "fan"
-
     # Simulate that current temperature is below target temp
     # Heating might be on and hvac_action currently 'heat'
     await helper.async_update(
diff --git a/tests/components/homekit_controller/test_switch.py b/tests/components/homekit_controller/test_switch.py
index d841323bd59..a2586f7355e 100644
--- a/tests/components/homekit_controller/test_switch.py
+++ b/tests/components/homekit_controller/test_switch.py
@@ -27,14 +27,6 @@ def create_switch_service(accessory: Accessory) -> None:
     outlet_in_use.value = False
 
 
-def create_faucet_service(accessory: Accessory) -> None:
-    """Define faucet characteristics."""
-    service = accessory.add_service(ServicesTypes.FAUCET)
-
-    active_char = service.add_char(CharacteristicsTypes.ACTIVE)
-    active_char.value = False
-
-
 def create_valve_service(accessory: Accessory) -> None:
     """Define valve characteristics."""
     service = accessory.add_service(ServicesTypes.VALVE)
@@ -123,58 +115,6 @@ async def test_switch_read_outlet_state(
     assert switch_1.attributes["outlet_in_use"] is True
 
 
-async def test_faucet_change_active_state(
-    hass: HomeAssistant, get_next_aid: Callable[[], int]
-) -> None:
-    """Test that we can turn a HomeKit outlet on and off again."""
-    helper = await setup_test_component(hass, get_next_aid(), create_faucet_service)
-
-    await hass.services.async_call(
-        "switch", "turn_on", {"entity_id": "switch.testdevice"}, blocking=True
-    )
-    helper.async_assert_service_values(
-        ServicesTypes.FAUCET,
-        {
-            CharacteristicsTypes.ACTIVE: 1,
-        },
-    )
-
-    await hass.services.async_call(
-        "switch", "turn_off", {"entity_id": "switch.testdevice"}, blocking=True
-    )
-    helper.async_assert_service_values(
-        ServicesTypes.FAUCET,
-        {
-            CharacteristicsTypes.ACTIVE: 0,
-        },
-    )
-
-
-async def test_faucet_read_active_state(
-    hass: HomeAssistant, get_next_aid: Callable[[], int]
-) -> None:
-    """Test that we can read the state of a HomeKit outlet accessory."""
-    helper = await setup_test_component(hass, get_next_aid(), create_faucet_service)
-
-    # Initial state is that the switch is off and the outlet isn't in use
-    switch_1 = await helper.poll_and_get_state()
-    assert switch_1.state == "off"
-
-    # Simulate that someone switched on the device in the real world not via HA
-    switch_1 = await helper.async_update(
-        ServicesTypes.FAUCET,
-        {CharacteristicsTypes.ACTIVE: True},
-    )
-    assert switch_1.state == "on"
-
-    # Simulate that device switched off in the real world not via HA
-    switch_1 = await helper.async_update(
-        ServicesTypes.FAUCET,
-        {CharacteristicsTypes.ACTIVE: False},
-    )
-    assert switch_1.state == "off"
-
-
 async def test_valve_change_active_state(
     hass: HomeAssistant, get_next_aid: Callable[[], int]
 ) -> None:
diff --git a/tests/components/homematicip_cloud/test_alarm_control_panel.py b/tests/components/homematicip_cloud/test_alarm_control_panel.py
index 094308862f6..cf27aed7a84 100644
--- a/tests/components/homematicip_cloud/test_alarm_control_panel.py
+++ b/tests/components/homematicip_cloud/test_alarm_control_panel.py
@@ -4,9 +4,14 @@ from homematicip.aio.home import AsyncHome
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
-    AlarmControlPanelState,
 )
 from homeassistant.components.homematicip_cloud import DOMAIN as HMIPC_DOMAIN
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -78,7 +83,7 @@ async def test_hmip_alarm_control_panel(
     await _async_manipulate_security_zones(
         hass, home, internal_active=True, external_active=True
     )
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state is STATE_ALARM_ARMED_AWAY
 
     await hass.services.async_call(
         "alarm_control_panel", "alarm_arm_home", {"entity_id": entity_id}, blocking=True
@@ -86,7 +91,7 @@ async def test_hmip_alarm_control_panel(
     assert home.mock_calls[-1][0] == "set_security_zones_activation"
     assert home.mock_calls[-1][1] == (False, True)
     await _async_manipulate_security_zones(hass, home, external_active=True)
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_HOME
+    assert hass.states.get(entity_id).state is STATE_ALARM_ARMED_HOME
 
     await hass.services.async_call(
         "alarm_control_panel", "alarm_disarm", {"entity_id": entity_id}, blocking=True
@@ -94,7 +99,7 @@ async def test_hmip_alarm_control_panel(
     assert home.mock_calls[-1][0] == "set_security_zones_activation"
     assert home.mock_calls[-1][1] == (False, False)
     await _async_manipulate_security_zones(hass, home)
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state is STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         "alarm_control_panel", "alarm_arm_away", {"entity_id": entity_id}, blocking=True
@@ -104,7 +109,7 @@ async def test_hmip_alarm_control_panel(
     await _async_manipulate_security_zones(
         hass, home, internal_active=True, external_active=True, alarm_triggered=True
     )
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state is STATE_ALARM_TRIGGERED
 
     await hass.services.async_call(
         "alarm_control_panel", "alarm_arm_home", {"entity_id": entity_id}, blocking=True
@@ -114,4 +119,4 @@ async def test_hmip_alarm_control_panel(
     await _async_manipulate_security_zones(
         hass, home, external_active=True, alarm_triggered=True
     )
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state is STATE_ALARM_TRIGGERED
diff --git a/tests/components/homematicip_cloud/test_sensor.py b/tests/components/homematicip_cloud/test_sensor.py
index 2dda3116032..bdd0b6194ed 100644
--- a/tests/components/homematicip_cloud/test_sensor.py
+++ b/tests/components/homematicip_cloud/test_sensor.py
@@ -23,11 +23,7 @@ from homeassistant.components.homematicip_cloud.sensor import (
     ATTR_WIND_DIRECTION,
     ATTR_WIND_DIRECTION_VARIATION,
 )
-from homeassistant.components.sensor import (
-    ATTR_STATE_CLASS,
-    DOMAIN as SENSOR_DOMAIN,
-    SensorStateClass,
-)
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     LIGHT_LUX,
@@ -366,7 +362,6 @@ async def test_hmip_windspeed_sensor(
     assert (
         ha_state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfSpeed.KILOMETERS_PER_HOUR
     )
-    assert ha_state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
     await async_manipulate_test_data(hass, hmip_device, "windSpeed", 9.4)
     ha_state = hass.states.get(entity_id)
     assert ha_state.state == "9.4"
@@ -416,7 +411,6 @@ async def test_hmip_today_rain_sensor(
 
     assert ha_state.state == "3.9"
     assert ha_state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfLength.MILLIMETERS
-    assert ha_state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
     await async_manipulate_test_data(hass, hmip_device, "todayRainCounter", 14.2)
     ha_state = hass.states.get(entity_id)
     assert ha_state.state == "14.2"
diff --git a/tests/components/homeworks/test_config_flow.py b/tests/components/homeworks/test_config_flow.py
index e8c4ab15b3d..cca09c10e70 100644
--- a/tests/components/homeworks/test_config_flow.py
+++ b/tests/components/homeworks/test_config_flow.py
@@ -235,6 +235,10 @@ async def test_user_flow_cannot_connect(
     assert result["step_id"] == "user"
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.homeworks.config.abort.reconfigure_successful"],
+)
 async def test_reconfigure_flow(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_homeworks: MagicMock
 ) -> None:
@@ -322,6 +326,10 @@ async def test_reconfigure_flow_flow_duplicate(
     assert result["errors"] == {"base": "duplicated_host_port"}
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.homeworks.config.abort.reconfigure_successful"],
+)
 async def test_reconfigure_flow_flow_no_change(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_homeworks: MagicMock
 ) -> None:
diff --git a/tests/components/honeywell/test_climate.py b/tests/components/honeywell/test_climate.py
index 73c5ff33dbc..9485f2f4302 100644
--- a/tests/components/honeywell/test_climate.py
+++ b/tests/components/honeywell/test_climate.py
@@ -5,7 +5,6 @@ from unittest.mock import MagicMock
 
 from aiohttp import ClientConnectionError
 import aiosomecomfort
-from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
 from syrupy.filters import props
@@ -30,8 +29,6 @@ from homeassistant.components.climate import (
 )
 from homeassistant.components.honeywell.climate import (
     DOMAIN,
-    MODE_PERMANENT_HOLD,
-    MODE_TEMPORARY_HOLD,
     PRESET_HOLD,
     RETRY,
     SCAN_INTERVAL,
@@ -1210,59 +1207,3 @@ async def test_unique_id(
     await init_integration(hass, config_entry)
     entity_entry = entity_registry.async_get(f"climate.{device.name}")
     assert entity_entry.unique_id == str(device.deviceid)
-
-
-async def test_preset_mode(
-    hass: HomeAssistant,
-    device: MagicMock,
-    config_entry: er.EntityRegistry,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test mode settings properly reflected."""
-    await init_integration(hass, config_entry)
-    entity_id = f"climate.{device.name}"
-
-    device.raw_ui_data["StatusHeat"] = 3
-    device.raw_ui_data["StatusCool"] = 3
-
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    state = hass.states.get(entity_id)
-    assert state.attributes[ATTR_PRESET_MODE] == PRESET_NONE
-
-    device.raw_ui_data["StatusHeat"] = MODE_TEMPORARY_HOLD
-    device.raw_ui_data["StatusCool"] = MODE_TEMPORARY_HOLD
-
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    state = hass.states.get(entity_id)
-    assert state.attributes[ATTR_PRESET_MODE] == PRESET_HOLD
-
-    device.raw_ui_data["StatusHeat"] = MODE_PERMANENT_HOLD
-    device.raw_ui_data["StatusCool"] = MODE_PERMANENT_HOLD
-
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    state = hass.states.get(entity_id)
-    assert state.attributes[ATTR_PRESET_MODE] == PRESET_HOLD
-
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_PRESET_MODE,
-        {ATTR_ENTITY_ID: entity_id, ATTR_PRESET_MODE: PRESET_AWAY},
-        blocking=True,
-    )
-
-    state = hass.states.get(entity_id)
-    assert state.attributes[ATTR_PRESET_MODE] == PRESET_AWAY
-
-    device.raw_ui_data["StatusHeat"] = 3
-    device.raw_ui_data["StatusCool"] = 3
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    state = hass.states.get(entity_id)
-    assert state.attributes[ATTR_PRESET_MODE] == PRESET_NONE
diff --git a/tests/components/honeywell/test_config_flow.py b/tests/components/honeywell/test_config_flow.py
index ed9c86f5e10..b1c0b28f537 100644
--- a/tests/components/honeywell/test_config_flow.py
+++ b/tests/components/honeywell/test_config_flow.py
@@ -120,6 +120,10 @@ async def test_create_option_entry(
     }
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.honeywell.config.abort.reauth_successful"],
+)
 async def test_reauth_flow(hass: HomeAssistant) -> None:
     """Test a successful reauth flow."""
 
diff --git a/tests/components/http/test_ban.py b/tests/components/http/test_ban.py
index 59011de0cfd..41f36dad2df 100644
--- a/tests/components/http/test_ban.py
+++ b/tests/components/http/test_ban.py
@@ -3,7 +3,7 @@
 from http import HTTPStatus
 from ipaddress import ip_address
 import os
-from unittest.mock import AsyncMock, Mock, mock_open, patch
+from unittest.mock import Mock, mock_open, patch
 
 from aiohttp import web
 from aiohttp.web_exceptions import HTTPUnauthorized
@@ -34,10 +34,14 @@ BANNED_IPS_WITH_SUPERVISOR = [*BANNED_IPS, SUPERVISOR_IP]
 
 
 @pytest.fixture(name="hassio_env")
-def hassio_env_fixture(supervisor_is_connected: AsyncMock):
+def hassio_env_fixture():
     """Fixture to inject hassio env."""
     with (
         patch.dict(os.environ, {"SUPERVISOR": "127.0.0.1"}),
+        patch(
+            "homeassistant.components.hassio.HassIO.is_connected",
+            return_value={"result": "ok", "data": {}},
+        ),
         patch.dict(os.environ, {"SUPERVISOR_TOKEN": "123456"}),
     ):
         yield
@@ -197,7 +201,6 @@ async def test_access_from_supervisor_ip(
     hass: HomeAssistant,
     aiohttp_client: ClientSessionGenerator,
     hassio_env,
-    resolution_info: AsyncMock,
 ) -> None:
     """Test accessing to server from supervisor IP."""
     app = web.Application()
@@ -219,7 +222,17 @@ async def test_access_from_supervisor_ip(
 
     manager = app[KEY_BAN_MANAGER]
 
-    assert await async_setup_component(hass, "hassio", {"hassio": {}})
+    with patch(
+        "homeassistant.components.hassio.HassIO.get_resolution_info",
+        return_value={
+            "unsupported": [],
+            "unhealthy": [],
+            "suggestions": [],
+            "issues": [],
+            "checks": [],
+        },
+    ):
+        assert await async_setup_component(hass, "hassio", {"hassio": {}})
 
     m_open = mock_open()
 
diff --git a/tests/components/hunterdouglas_powerview/conftest.py b/tests/components/hunterdouglas_powerview/conftest.py
index ea40ba4ecc6..d4433f93dcb 100644
--- a/tests/components/hunterdouglas_powerview/conftest.py
+++ b/tests/components/hunterdouglas_powerview/conftest.py
@@ -33,15 +33,15 @@ def mock_hunterdouglas_hub(
     """Return a mocked Powerview Hub with all data populated."""
     with (
         patch(
-            "homeassistant.components.hunterdouglas_powerview.util.Hub.request_raw_data",
+            "homeassistant.components.hunterdouglas_powerview.Hub.request_raw_data",
             return_value=load_json_object_fixture(device_json, DOMAIN),
         ),
         patch(
-            "homeassistant.components.hunterdouglas_powerview.util.Hub.request_home_data",
+            "homeassistant.components.hunterdouglas_powerview.Hub.request_home_data",
             return_value=load_json_object_fixture(home_json, DOMAIN),
         ),
         patch(
-            "homeassistant.components.hunterdouglas_powerview.util.Hub.request_raw_firmware",
+            "homeassistant.components.hunterdouglas_powerview.Hub.request_raw_firmware",
             return_value=load_json_object_fixture(firmware_json, DOMAIN),
         ),
         patch(
@@ -111,7 +111,7 @@ def firmware_json(api_version: int) -> str:
 def rooms_json(api_version: int) -> str:
     """Return the get_resources fixture for a specific device."""
     if api_version == 1:
-        return "gen1/rooms.json"
+        return "gen2/rooms.json"
     if api_version == 2:
         return "gen2/rooms.json"
     if api_version == 3:
@@ -124,7 +124,7 @@ def rooms_json(api_version: int) -> str:
 def scenes_json(api_version: int) -> str:
     """Return the get_resources fixture for a specific device."""
     if api_version == 1:
-        return "gen1/scenes.json"
+        return "gen2/scenes.json"
     if api_version == 2:
         return "gen2/scenes.json"
     if api_version == 3:
@@ -137,7 +137,7 @@ def scenes_json(api_version: int) -> str:
 def shades_json(api_version: int) -> str:
     """Return the get_resources fixture for a specific device."""
     if api_version == 1:
-        return "gen1/shades.json"
+        return "gen2/shades.json"
     if api_version == 2:
         return "gen2/shades.json"
     if api_version == 3:
diff --git a/tests/components/hunterdouglas_powerview/const.py b/tests/components/hunterdouglas_powerview/const.py
index 65b03fd5ec2..db8adc57e5a 100644
--- a/tests/components/hunterdouglas_powerview/const.py
+++ b/tests/components/hunterdouglas_powerview/const.py
@@ -6,7 +6,6 @@ from homeassistant import config_entries
 from homeassistant.components import dhcp, zeroconf
 
 MOCK_MAC = "AA::BB::CC::DD::EE::FF"
-MOCK_SERIAL = "A1B2C3D4E5G6H7"
 
 HOMEKIT_DISCOVERY_GEN2 = zeroconf.ZeroconfServiceInfo(
     ip_address="1.2.3.4",
diff --git a/tests/components/hunterdouglas_powerview/fixtures/gen1/rooms.json b/tests/components/hunterdouglas_powerview/fixtures/gen1/rooms.json
deleted file mode 100644
index 4ddcccd466e..00000000000
--- a/tests/components/hunterdouglas_powerview/fixtures/gen1/rooms.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "roomIds": [4896],
-  "roomData": [
-    {
-      "id": 4896,
-      "name": "U3BpbmRsZQ==",
-      "order": 0,
-      "colorId": 11,
-      "iconId": 77,
-      "name_unicode": "Spindle"
-    }
-  ]
-}
diff --git a/tests/components/hunterdouglas_powerview/fixtures/gen1/scenes.json b/tests/components/hunterdouglas_powerview/fixtures/gen1/scenes.json
deleted file mode 100644
index 4b6b7fb9cc3..00000000000
--- a/tests/components/hunterdouglas_powerview/fixtures/gen1/scenes.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-  "sceneIds": [
-    19831, 4068, 55363, 43508, 59372, 48243, 54636, 20625, 4034, 59103, 61648,
-    24626, 64679, 22498, 28856, 25458, 51159, 959
-  ],
-  "sceneData": [
-    {
-      "id": 19831,
-      "networkNumber": 0,
-      "name": "Q2xvc2UgTG91bmdlIFJvb20=",
-      "roomId": 4896,
-      "order": 0,
-      "colorId": 7,
-      "iconId": 171,
-      "name_unicode": "Close Lounge Room"
-    },
-    {
-      "id": 4068,
-      "networkNumber": 1,
-      "name": "Q2xvc2UgQmVkIDQ=",
-      "roomId": 4896,
-      "order": 1,
-      "colorId": 7,
-      "iconId": 10,
-      "name_unicode": "Close Bed 4"
-    },
-    {
-      "id": 55363,
-      "networkNumber": 2,
-      "name": "Q2xvc2UgQmVkIDI=",
-      "roomId": 4896,
-      "order": 2,
-      "colorId": 11,
-      "iconId": 171,
-      "name_unicode": "Close Bed 2"
-    },
-    {
-      "id": 43508,
-      "networkNumber": 3,
-      "name": "Q2xvc2UgTWFzdGVyIEJlZA==",
-      "roomId": 4896,
-      "order": 3,
-      "colorId": 11,
-      "iconId": 10,
-      "name_unicode": "Close Master Bed"
-    },
-    {
-      "id": 59372,
-      "networkNumber": 4,
-      "name": "Q2xvc2UgRmFtaWx5",
-      "roomId": 4896,
-      "order": 4,
-      "colorId": 0,
-      "iconId": 171,
-      "name_unicode": "Close Family"
-    },
-    {
-      "id": 48243,
-      "networkNumber": 5,
-      "name": "T3BlbiBCZWQgNA==",
-      "roomId": 4896,
-      "order": 5,
-      "colorId": 0,
-      "iconId": 10,
-      "name_unicode": "Open Bed 4"
-    },
-    {
-      "id": 54636,
-      "networkNumber": 6,
-      "name": "T3BlbiBNYXN0ZXIgQmVk",
-      "roomId": 4896,
-      "order": 6,
-      "colorId": 0,
-      "iconId": 26,
-      "name_unicode": "Open Master Bed"
-    },
-    {
-      "id": 20625,
-      "networkNumber": 7,
-      "name": "T3BlbiBCZWQgMw==",
-      "roomId": 4896,
-      "order": 7,
-      "colorId": 7,
-      "iconId": 26,
-      "name_unicode": "Open Bed 3"
-    },
-    {
-      "id": 4034,
-      "networkNumber": 8,
-      "name": "T3BlbiBGYW1pbHk=",
-      "roomId": 4896,
-      "order": 8,
-      "colorId": 11,
-      "iconId": 26,
-      "name_unicode": "Open Family"
-    },
-    {
-      "id": 59103,
-      "networkNumber": 9,
-      "name": "Q2xvc2UgU3R1ZHk=",
-      "roomId": 4896,
-      "order": 9,
-      "colorId": 0,
-      "iconId": 171,
-      "name_unicode": "Close Study"
-    },
-    {
-      "id": 61648,
-      "networkNumber": 10,
-      "name": "T3BlbiBBbGw=",
-      "roomId": 4896,
-      "order": 10,
-      "colorId": 11,
-      "iconId": 26,
-      "name_unicode": "Open All"
-    },
-    {
-      "id": 24626,
-      "networkNumber": 11,
-      "name": "Q2xvc2UgQWxs",
-      "roomId": 4896,
-      "order": 11,
-      "colorId": 0,
-      "iconId": 171,
-      "name_unicode": "Close All"
-    },
-    {
-      "id": 64679,
-      "networkNumber": 12,
-      "name": "T3BlbiBLaXRjaGVu",
-      "roomId": 4896,
-      "order": 12,
-      "colorId": 7,
-      "iconId": 26,
-      "name_unicode": "Open Kitchen"
-    },
-    {
-      "id": 22498,
-      "networkNumber": 13,
-      "name": "T3BlbiBMb3VuZ2UgUm9vbQ==",
-      "roomId": 4896,
-      "order": 13,
-      "colorId": 7,
-      "iconId": 26,
-      "name_unicode": "Open Lounge Room"
-    },
-    {
-      "id": 25458,
-      "networkNumber": 14,
-      "name": "T3BlbiBCZWQgMg==",
-      "roomId": 4896,
-      "order": 14,
-      "colorId": 0,
-      "iconId": 26,
-      "name_unicode": "Open Bed 2"
-    },
-    {
-      "id": 46225,
-      "networkNumber": 15,
-      "name": "Q2xvc2UgQmVkIDM=",
-      "roomId": 4896,
-      "order": 15,
-      "colorId": 0,
-      "iconId": 26,
-      "name_unicode": "Close Bed 3"
-    },
-    {
-      "id": 51159,
-      "networkNumber": 16,
-      "name": "Q2xvc2UgS2l0Y2hlbg==",
-      "roomId": 4896,
-      "order": 16,
-      "colorId": 0,
-      "iconId": 26,
-      "name_unicode": "Close Kitchen"
-    },
-    {
-      "id": 959,
-      "networkNumber": 17,
-      "name": "T3BlbiBTdHVkeQ==",
-      "roomId": 4896,
-      "order": 17,
-      "colorId": 0,
-      "iconId": 26,
-      "name_unicode": "Open Study"
-    }
-  ]
-}
diff --git a/tests/components/hunterdouglas_powerview/fixtures/gen1/shades.json b/tests/components/hunterdouglas_powerview/fixtures/gen1/shades.json
deleted file mode 100644
index 6e43c1d788d..00000000000
--- a/tests/components/hunterdouglas_powerview/fixtures/gen1/shades.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "shadeIds": [36492, 65111, 7003, 53627],
-  "shadeData": [
-    {
-      "id": 36492,
-      "name": "S2l0Y2hlbiBOb3J0aA==",
-      "roomId": 4896,
-      "groupId": 35661,
-      "order": 0,
-      "type": 40,
-      "batteryStrength": 116,
-      "batteryStatus": 3,
-      "positions": { "position1": 65535, "posKind1": 1 },
-      "name_unicode": "Kitchen North"
-    },
-    {
-      "id": 65111,
-      "name": "S2l0Y2hlbiBXZXN0",
-      "roomId": 4896,
-      "groupId": 35661,
-      "order": 1,
-      "type": 40,
-      "batteryStrength": 124,
-      "batteryStatus": 3,
-      "positions": { "position1": 65535, "posKind1": 3 },
-      "name_unicode": "Kitchen West"
-    },
-    {
-      "id": 7003,
-      "name": "QmF0aCBFYXN0",
-      "roomId": 4896,
-      "groupId": 35661,
-      "order": 2,
-      "type": 40,
-      "batteryStrength": 94,
-      "batteryStatus": 1,
-      "positions": { "position1": 65535, "posKind1": 1 },
-      "name_unicode": "Bath East"
-    },
-    {
-      "id": 53627,
-      "name": "QmF0aCBTb3V0aA==",
-      "roomId": 4896,
-      "groupId": 35661,
-      "order": 3,
-      "type": 40,
-      "batteryStrength": 127,
-      "batteryStatus": 3,
-      "positions": { "position1": 65535, "posKind1": 3 },
-      "name_unicode": "Bath South"
-    }
-  ]
-}
diff --git a/tests/components/hunterdouglas_powerview/fixtures/gen1/userdata.json b/tests/components/hunterdouglas_powerview/fixtures/gen1/userdata.json
index 90b64ee4686..132e2721b05 100644
--- a/tests/components/hunterdouglas_powerview/fixtures/gen1/userdata.json
+++ b/tests/components/hunterdouglas_powerview/fixtures/gen1/userdata.json
@@ -1,34 +1,34 @@
 {
   "userData": {
-    "serialNumber": "A1B2C3D4E5G6H7",
-    "rfID": "0x8B2A",
-    "rfIDInt": 35626,
-    "rfStatus": 0,
-    "hubName": "UG93ZXJ2aWV3IEdlbmVyYXRpb24gMQ==",
-    "macAddress": "AA:BB:CC:DD:EE:FF",
-    "roomCount": 1,
-    "shadeCount": 4,
-    "groupCount": 5,
-    "sceneCount": 9,
-    "sceneMemberCount": 24,
-    "multiSceneCount": 0,
-    "multiSceneMemberCount": 0,
-    "scheduledEventCount": 4,
-    "sceneControllerCount": 0,
-    "sceneControllerMemberCount": 0,
-    "accessPointCount": 0,
-    "localTimeDataSet": true,
     "enableScheduledEvents": true,
-    "remoteConnectEnabled": true,
-    "editingEnabled": true,
-    "setupCompleted": false,
-    "gateway": "192.168.0.1",
-    "mask": "255.255.255.0",
-    "ip": "192.168.0.20",
-    "dns": "192.168.0.1",
     "staticIp": false,
-    "addressKind": "newPrimary",
+    "sceneControllerCount": 0,
+    "accessPointCount": 0,
+    "shadeCount": 5,
+    "ip": "192.168.0.20",
+    "groupCount": 9,
+    "scheduledEventCount": 0,
+    "editingEnabled": true,
+    "roomCount": 5,
+    "setupCompleted": false,
+    "sceneCount": 18,
+    "sceneControllerMemberCount": 0,
+    "mask": "255.255.255.0",
+    "hubName": "UG93ZXJ2aWV3IEdlbmVyYXRpb24gMQ==",
+    "rfID": "0x8B2A",
+    "remoteConnectEnabled": false,
+    "multiSceneMemberCount": 0,
+    "rfStatus": 0,
+    "serialNumber": "A1B2C3D4E5G6H7",
+    "undefinedShadeCount": 0,
+    "sceneMemberCount": 18,
     "unassignedShadeCount": 0,
-    "undefinedShadeCount": 0
+    "multiSceneCount": 0,
+    "addressKind": "newPrimary",
+    "gateway": "192.168.0.1",
+    "localTimeDataSet": true,
+    "dns": "192.168.0.1",
+    "macAddress": "AA:BB:CC:DD:EE:FF",
+    "rfIDInt": 35626
   }
 }
diff --git a/tests/components/hunterdouglas_powerview/test_config_flow.py b/tests/components/hunterdouglas_powerview/test_config_flow.py
index 42589bb10e0..b9721f4adb1 100644
--- a/tests/components/hunterdouglas_powerview/test_config_flow.py
+++ b/tests/components/hunterdouglas_powerview/test_config_flow.py
@@ -10,9 +10,8 @@ from homeassistant.components.hunterdouglas_powerview.const import DOMAIN
 from homeassistant.const import CONF_API_VERSION, CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-import homeassistant.helpers.entity_registry as er
 
-from .const import DHCP_DATA, DISCOVERY_DATA, HOMEKIT_DATA, MOCK_SERIAL
+from .const import DHCP_DATA, DISCOVERY_DATA, HOMEKIT_DATA
 
 from tests.common import MockConfigEntry, load_json_object_fixture
 
@@ -41,7 +40,7 @@ async def test_user_form(
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == f"Powerview Generation {api_version}"
     assert result2["data"] == {CONF_HOST: "1.2.3.4", CONF_API_VERSION: api_version}
-    assert result2["result"].unique_id == MOCK_SERIAL
+    assert result2["result"].unique_id == "A1B2C3D4E5G6H7"
 
     assert len(mock_setup_entry.mock_calls) == 1
 
@@ -76,7 +75,7 @@ async def test_form_homekit_and_dhcp_cannot_connect(
     ignored_config_entry.add_to_hass(hass)
 
     with patch(
-        "homeassistant.components.hunterdouglas_powerview.util.Hub.query_firmware",
+        "homeassistant.components.hunterdouglas_powerview.Hub.query_firmware",
         side_effect=TimeoutError,
     ):
         result = await hass.config_entries.flow.async_init(
@@ -101,7 +100,7 @@ async def test_form_homekit_and_dhcp_cannot_connect(
     assert result3["type"] is FlowResultType.CREATE_ENTRY
     assert result3["title"] == f"Powerview Generation {api_version}"
     assert result3["data"] == {CONF_HOST: "1.2.3.4", CONF_API_VERSION: api_version}
-    assert result3["result"].unique_id == MOCK_SERIAL
+    assert result3["result"].unique_id == "A1B2C3D4E5G6H7"
 
     assert len(mock_setup_entry.mock_calls) == 1
 
@@ -143,7 +142,7 @@ async def test_form_homekit_and_dhcp(
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == f"Powerview Generation {api_version}"
     assert result2["data"] == {CONF_HOST: "1.2.3.4", CONF_API_VERSION: api_version}
-    assert result2["result"].unique_id == MOCK_SERIAL
+    assert result2["result"].unique_id == "A1B2C3D4E5G6H7"
 
     assert len(mock_setup_entry.mock_calls) == 1
 
@@ -206,7 +205,7 @@ async def test_form_cannot_connect(
 
     # Simulate a timeout error
     with patch(
-        "homeassistant.components.hunterdouglas_powerview.util.Hub.query_firmware",
+        "homeassistant.components.hunterdouglas_powerview.Hub.query_firmware",
         side_effect=TimeoutError,
     ):
         result2 = await hass.config_entries.flow.async_configure(
@@ -226,7 +225,7 @@ async def test_form_cannot_connect(
     assert result3["type"] is FlowResultType.CREATE_ENTRY
     assert result3["title"] == f"Powerview Generation {api_version}"
     assert result3["data"] == {CONF_HOST: "1.2.3.4", CONF_API_VERSION: api_version}
-    assert result3["result"].unique_id == MOCK_SERIAL
+    assert result3["result"].unique_id == "A1B2C3D4E5G6H7"
 
     assert len(mock_setup_entry.mock_calls) == 1
 
@@ -245,11 +244,11 @@ async def test_form_no_data(
 
     with (
         patch(
-            "homeassistant.components.hunterdouglas_powerview.util.Hub.request_raw_data",
+            "homeassistant.components.hunterdouglas_powerview.Hub.request_raw_data",
             return_value={},
         ),
         patch(
-            "homeassistant.components.hunterdouglas_powerview.util.Hub.request_home_data",
+            "homeassistant.components.hunterdouglas_powerview.Hub.request_home_data",
             return_value={},
         ),
     ):
@@ -270,7 +269,7 @@ async def test_form_no_data(
     assert result3["type"] is FlowResultType.CREATE_ENTRY
     assert result3["title"] == f"Powerview Generation {api_version}"
     assert result3["data"] == {CONF_HOST: "1.2.3.4", CONF_API_VERSION: api_version}
-    assert result3["result"].unique_id == MOCK_SERIAL
+    assert result3["result"].unique_id == "A1B2C3D4E5G6H7"
 
     assert len(mock_setup_entry.mock_calls) == 1
 
@@ -289,7 +288,7 @@ async def test_form_unknown_exception(
 
     # Simulate a transient error
     with patch(
-        "homeassistant.components.hunterdouglas_powerview.util.Hub.query_firmware",
+        "homeassistant.components.hunterdouglas_powerview.config_flow.Hub.query_firmware",
         side_effect=SyntaxError,
     ):
         result2 = await hass.config_entries.flow.async_configure(
@@ -309,7 +308,7 @@ async def test_form_unknown_exception(
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == f"Powerview Generation {api_version}"
     assert result2["data"] == {CONF_HOST: "1.2.3.4", CONF_API_VERSION: api_version}
-    assert result2["result"].unique_id == MOCK_SERIAL
+    assert result2["result"].unique_id == "A1B2C3D4E5G6H7"
 
     assert len(mock_setup_entry.mock_calls) == 1
 
@@ -328,7 +327,7 @@ async def test_form_unsupported_device(
 
     # Simulate a gen 3 secondary hub
     with patch(
-        "homeassistant.components.hunterdouglas_powerview.util.Hub.request_raw_data",
+        "homeassistant.components.hunterdouglas_powerview.Hub.request_raw_data",
         return_value=load_json_object_fixture("gen3/gateway/secondary.json", DOMAIN),
     ):
         result2 = await hass.config_entries.flow.async_configure(
@@ -348,57 +347,6 @@ async def test_form_unsupported_device(
     assert result3["type"] is FlowResultType.CREATE_ENTRY
     assert result3["title"] == f"Powerview Generation {api_version}"
     assert result3["data"] == {CONF_HOST: "1.2.3.4", CONF_API_VERSION: api_version}
-    assert result3["result"].unique_id == MOCK_SERIAL
+    assert result3["result"].unique_id == "A1B2C3D4E5G6H7"
 
     assert len(mock_setup_entry.mock_calls) == 1
-
-
-@pytest.mark.usefixtures("mock_hunterdouglas_hub")
-@pytest.mark.parametrize("api_version", [1, 2, 3])
-async def test_migrate_entry(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    api_version: int,
-) -> None:
-    """Test migrate to newest version."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={"host": "1.2.3.4"},
-        unique_id=MOCK_SERIAL,
-        version=1,
-        minor_version=1,
-    )
-
-    # Add entries with int unique_id
-    entity_registry.async_get_or_create(
-        domain="cover",
-        platform="hunterdouglas_powerview",
-        unique_id=123,
-        config_entry=entry,
-    )
-    # Add entries with a str unique_id not starting with entry.unique_id
-    entity_registry.async_get_or_create(
-        domain="cover",
-        platform="hunterdouglas_powerview",
-        unique_id="old_unique_id",
-        config_entry=entry,
-    )
-
-    assert entry.version == 1
-    assert entry.minor_version == 1
-
-    entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert entry.version == 1
-    assert entry.minor_version == 2
-
-    # Reload the registry entries
-    registry_entries = er.async_entries_for_config_entry(
-        entity_registry, entry.entry_id
-    )
-
-    # Ensure the IDs have been migrated
-    for reg_entry in registry_entries:
-        assert reg_entry.unique_id.startswith(f"{entry.unique_id}_")
diff --git a/tests/components/husqvarna_automower/conftest.py b/tests/components/husqvarna_automower/conftest.py
index 0202cec05b9..dbb8f3b4c72 100644
--- a/tests/components/husqvarna_automower/conftest.py
+++ b/tests/components/husqvarna_automower/conftest.py
@@ -1,11 +1,9 @@
 """Test helpers for Husqvarna Automower."""
 
-import asyncio
 from collections.abc import Generator
 import time
 from unittest.mock import AsyncMock, patch
 
-from aioautomower.model import MowerAttributes
 from aioautomower.session import AutomowerSession, _MowerCommands
 from aioautomower.utils import mower_list_to_dictionary_dataclass
 from aiohttp import ClientWebSocketResponse
@@ -18,7 +16,6 @@ from homeassistant.components.application_credentials import (
 from homeassistant.components.husqvarna_automower.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt as dt_util
 
 from .const import CLIENT_ID, CLIENT_SECRET, USER_ID
 
@@ -43,21 +40,6 @@ def mock_scope() -> str:
     return "iam:read amc:api"
 
 
-@pytest.fixture(name="mower_time_zone")
-async def mock_time_zone(hass: HomeAssistant) -> dict[str, MowerAttributes]:
-    """Fixture to set correct scope for the token."""
-    return await dt_util.async_get_time_zone("Europe/Berlin")
-
-
-@pytest.fixture(name="values")
-def mock_values(mower_time_zone) -> dict[str, MowerAttributes]:
-    """Fixture to set correct scope for the token."""
-    return mower_list_to_dictionary_dataclass(
-        load_json_value_fixture("mower.json", DOMAIN),
-        mower_time_zone,
-    )
-
-
 @pytest.fixture
 def mock_config_entry(jwt: str, expires_at: int, scope: str) -> MockConfigEntry:
     """Return the default mocked config entry."""
@@ -99,20 +81,17 @@ async def setup_credentials(hass: HomeAssistant) -> None:
 
 
 @pytest.fixture
-def mock_automower_client(values) -> Generator[AsyncMock]:
+def mock_automower_client() -> Generator[AsyncMock]:
     """Mock a Husqvarna Automower client."""
 
-    async def listen() -> None:
-        """Mock listen."""
-        listen_block = asyncio.Event()
-        await listen_block.wait()
-        pytest.fail("Listen was not cancelled!")
+    mower_dict = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
 
     mock = AsyncMock(spec=AutomowerSession)
     mock.auth = AsyncMock(side_effect=ClientWebSocketResponse)
     mock.commands = AsyncMock(spec_set=_MowerCommands)
-    mock.get_status.return_value = values
-    mock.start_listening = AsyncMock(side_effect=listen)
+    mock.get_status.return_value = mower_dict
 
     with patch(
         "homeassistant.components.husqvarna_automower.AutomowerSession",
diff --git a/tests/components/husqvarna_automower/snapshots/test_calendar.ambr b/tests/components/husqvarna_automower/snapshots/test_calendar.ambr
index 7cd8c68b624..1924b9ad42e 100644
--- a/tests/components/husqvarna_automower/snapshots/test_calendar.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_calendar.ambr
@@ -68,11 +68,6 @@
           'start': '2023-06-10T01:00:00+02:00',
           'summary': 'Back lawn schedule 2',
         }),
-        dict({
-          'end': '2023-06-12T09:00:00+02:00',
-          'start': '2023-06-12T01:00:00+02:00',
-          'summary': 'Back lawn schedule 2',
-        }),
       ]),
     }),
     'calendar.test_mower_2': dict({
diff --git a/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr b/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr
index ee9b7510770..ab9e81985c9 100644
--- a/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_diagnostics.ambr
@@ -68,33 +68,31 @@
       'status_dateteime': '2023-06-05T00:00:00+00:00',
     }),
     'mower': dict({
-      'activity': 'parked_in_cs',
+      'activity': 'PARKED_IN_CS',
       'error_code': 0,
-      'error_datetime': None,
       'error_datetime_naive': None,
       'error_key': None,
       'error_timestamp': 0,
-      'inactive_reason': 'none',
+      'inactive_reason': 'NONE',
       'is_error_confirmable': False,
-      'mode': 'main_area',
-      'state': 'restricted',
+      'mode': 'MAIN_AREA',
+      'state': 'RESTRICTED',
       'work_area_id': 123456,
       'work_area_name': 'Front lawn',
     }),
     'planner': dict({
       'next_start': 1685991600000,
-      'next_start_datetime': '2023-06-05T19:00:00+02:00',
       'next_start_datetime_naive': '2023-06-05T19:00:00',
       'override': dict({
-        'action': 'not_active',
+        'action': 'NOT_ACTIVE',
       }),
-      'restricted_reason': 'week_schedule',
+      'restricted_reason': 'WEEK_SCHEDULE',
     }),
     'positions': '**REDACTED**',
     'settings': dict({
       'cutting_height': 4,
       'headlight': dict({
-        'mode': 'evening_only',
+        'mode': 'EVENING_ONLY',
       }),
     }),
     'statistics': dict({
@@ -140,7 +138,6 @@
       '0': dict({
         'cutting_height': 50,
         'enabled': False,
-        'last_time_completed': '2024-08-12T05:07:49+02:00',
         'last_time_completed_naive': '2024-08-12T05:07:49',
         'name': 'my_lawn',
         'progress': 20,
@@ -148,7 +145,6 @@
       '123456': dict({
         'cutting_height': 50,
         'enabled': True,
-        'last_time_completed': '2024-08-12T07:54:29+02:00',
         'last_time_completed_naive': '2024-08-12T07:54:29',
         'name': 'Front lawn',
         'progress': 40,
@@ -156,7 +152,6 @@
       '654321': dict({
         'cutting_height': 25,
         'enabled': True,
-        'last_time_completed': None,
         'last_time_completed_naive': None,
         'name': 'Back lawn',
         'progress': None,
@@ -170,7 +165,7 @@
       'auth_implementation': 'husqvarna_automower',
       'token': dict({
         'access_token': '**REDACTED**',
-        'expires_at': 1685919600.0,
+        'expires_at': 1685926800.0,
         'expires_in': 86399,
         'provider': 'husqvarna',
         'refresh_token': '**REDACTED**',
diff --git a/tests/components/husqvarna_automower/snapshots/test_sensor.ambr b/tests/components/husqvarna_automower/snapshots/test_sensor.ambr
index d57a829a997..dfc1d41775f 100644
--- a/tests/components/husqvarna_automower/snapshots/test_sensor.ambr
+++ b/tests/components/husqvarna_automower/snapshots/test_sensor.ambr
@@ -552,11 +552,11 @@
     'area_id': None,
     'capabilities': dict({
       'options': list([
-        <MowerModes.MAIN_AREA: 'main_area'>,
-        <MowerModes.DEMO: 'demo'>,
-        <MowerModes.SECONDARY_AREA: 'secondary_area'>,
-        <MowerModes.HOME: 'home'>,
-        <MowerModes.UNKNOWN: 'unknown'>,
+        'main_area',
+        'demo',
+        'secondary_area',
+        'home',
+        'unknown',
       ]),
     }),
     'config_entry_id': <ANY>,
@@ -592,11 +592,11 @@
       'device_class': 'enum',
       'friendly_name': 'Test Mower 1 Mode',
       'options': list([
-        <MowerModes.MAIN_AREA: 'main_area'>,
-        <MowerModes.DEMO: 'demo'>,
-        <MowerModes.SECONDARY_AREA: 'secondary_area'>,
-        <MowerModes.HOME: 'home'>,
-        <MowerModes.UNKNOWN: 'unknown'>,
+        'main_area',
+        'demo',
+        'secondary_area',
+        'home',
+        'unknown',
       ]),
     }),
     'context': <ANY>,
@@ -856,16 +856,16 @@
     'area_id': None,
     'capabilities': dict({
       'options': list([
-        <RestrictedReasons.ALL_WORK_AREAS_COMPLETED: 'all_work_areas_completed'>,
-        <RestrictedReasons.DAILY_LIMIT: 'daily_limit'>,
-        <RestrictedReasons.EXTERNAL: 'external'>,
-        <RestrictedReasons.FOTA: 'fota'>,
-        <RestrictedReasons.FROST: 'frost'>,
-        <RestrictedReasons.NONE: 'none'>,
-        <RestrictedReasons.NOT_APPLICABLE: 'not_applicable'>,
-        <RestrictedReasons.PARK_OVERRIDE: 'park_override'>,
-        <RestrictedReasons.SENSOR: 'sensor'>,
-        <RestrictedReasons.WEEK_SCHEDULE: 'week_schedule'>,
+        'all_work_areas_completed',
+        'daily_limit',
+        'external',
+        'fota',
+        'frost',
+        'none',
+        'not_applicable',
+        'park_override',
+        'sensor',
+        'week_schedule',
       ]),
     }),
     'config_entry_id': <ANY>,
@@ -901,16 +901,16 @@
       'device_class': 'enum',
       'friendly_name': 'Test Mower 1 Restricted reason',
       'options': list([
-        <RestrictedReasons.ALL_WORK_AREAS_COMPLETED: 'all_work_areas_completed'>,
-        <RestrictedReasons.DAILY_LIMIT: 'daily_limit'>,
-        <RestrictedReasons.EXTERNAL: 'external'>,
-        <RestrictedReasons.FOTA: 'fota'>,
-        <RestrictedReasons.FROST: 'frost'>,
-        <RestrictedReasons.NONE: 'none'>,
-        <RestrictedReasons.NOT_APPLICABLE: 'not_applicable'>,
-        <RestrictedReasons.PARK_OVERRIDE: 'park_override'>,
-        <RestrictedReasons.SENSOR: 'sensor'>,
-        <RestrictedReasons.WEEK_SCHEDULE: 'week_schedule'>,
+        'all_work_areas_completed',
+        'daily_limit',
+        'external',
+        'fota',
+        'frost',
+        'none',
+        'not_applicable',
+        'park_override',
+        'sensor',
+        'week_schedule',
       ]),
     }),
     'context': <ANY>,
@@ -1658,11 +1658,11 @@
     'area_id': None,
     'capabilities': dict({
       'options': list([
-        <MowerModes.MAIN_AREA: 'main_area'>,
-        <MowerModes.DEMO: 'demo'>,
-        <MowerModes.SECONDARY_AREA: 'secondary_area'>,
-        <MowerModes.HOME: 'home'>,
-        <MowerModes.UNKNOWN: 'unknown'>,
+        'main_area',
+        'demo',
+        'secondary_area',
+        'home',
+        'unknown',
       ]),
     }),
     'config_entry_id': <ANY>,
@@ -1698,11 +1698,11 @@
       'device_class': 'enum',
       'friendly_name': 'Test Mower 2 Mode',
       'options': list([
-        <MowerModes.MAIN_AREA: 'main_area'>,
-        <MowerModes.DEMO: 'demo'>,
-        <MowerModes.SECONDARY_AREA: 'secondary_area'>,
-        <MowerModes.HOME: 'home'>,
-        <MowerModes.UNKNOWN: 'unknown'>,
+        'main_area',
+        'demo',
+        'secondary_area',
+        'home',
+        'unknown',
       ]),
     }),
     'context': <ANY>,
@@ -1767,16 +1767,16 @@
     'area_id': None,
     'capabilities': dict({
       'options': list([
-        <RestrictedReasons.ALL_WORK_AREAS_COMPLETED: 'all_work_areas_completed'>,
-        <RestrictedReasons.DAILY_LIMIT: 'daily_limit'>,
-        <RestrictedReasons.EXTERNAL: 'external'>,
-        <RestrictedReasons.FOTA: 'fota'>,
-        <RestrictedReasons.FROST: 'frost'>,
-        <RestrictedReasons.NONE: 'none'>,
-        <RestrictedReasons.NOT_APPLICABLE: 'not_applicable'>,
-        <RestrictedReasons.PARK_OVERRIDE: 'park_override'>,
-        <RestrictedReasons.SENSOR: 'sensor'>,
-        <RestrictedReasons.WEEK_SCHEDULE: 'week_schedule'>,
+        'all_work_areas_completed',
+        'daily_limit',
+        'external',
+        'fota',
+        'frost',
+        'none',
+        'not_applicable',
+        'park_override',
+        'sensor',
+        'week_schedule',
       ]),
     }),
     'config_entry_id': <ANY>,
@@ -1812,16 +1812,16 @@
       'device_class': 'enum',
       'friendly_name': 'Test Mower 2 Restricted reason',
       'options': list([
-        <RestrictedReasons.ALL_WORK_AREAS_COMPLETED: 'all_work_areas_completed'>,
-        <RestrictedReasons.DAILY_LIMIT: 'daily_limit'>,
-        <RestrictedReasons.EXTERNAL: 'external'>,
-        <RestrictedReasons.FOTA: 'fota'>,
-        <RestrictedReasons.FROST: 'frost'>,
-        <RestrictedReasons.NONE: 'none'>,
-        <RestrictedReasons.NOT_APPLICABLE: 'not_applicable'>,
-        <RestrictedReasons.PARK_OVERRIDE: 'park_override'>,
-        <RestrictedReasons.SENSOR: 'sensor'>,
-        <RestrictedReasons.WEEK_SCHEDULE: 'week_schedule'>,
+        'all_work_areas_completed',
+        'daily_limit',
+        'external',
+        'fota',
+        'frost',
+        'none',
+        'not_applicable',
+        'park_override',
+        'sensor',
+        'week_schedule',
       ]),
     }),
     'context': <ANY>,
diff --git a/tests/components/husqvarna_automower/test_binary_sensor.py b/tests/components/husqvarna_automower/test_binary_sensor.py
index 858dc03b93f..fceaeee2321 100644
--- a/tests/components/husqvarna_automower/test_binary_sensor.py
+++ b/tests/components/husqvarna_automower/test_binary_sensor.py
@@ -2,10 +2,12 @@
 
 from unittest.mock import AsyncMock, patch
 
-from aioautomower.model import MowerActivities, MowerAttributes
+from aioautomower.model import MowerActivities
+from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 from syrupy import SnapshotAssertion
 
+from homeassistant.components.husqvarna_automower.const import DOMAIN
 from homeassistant.components.husqvarna_automower.coordinator import SCAN_INTERVAL
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
@@ -14,7 +16,12 @@ from homeassistant.helpers import entity_registry as er
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_value_fixture,
+    snapshot_platform,
+)
 
 
 async def test_binary_sensor_states(
@@ -22,9 +29,11 @@ async def test_binary_sensor_states(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test binary sensor states."""
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
     state = hass.states.get("binary_sensor.test_mower_1_charging")
     assert state is not None
diff --git a/tests/components/husqvarna_automower/test_button.py b/tests/components/husqvarna_automower/test_button.py
index 25fa64b531f..bf76fcbb598 100644
--- a/tests/components/husqvarna_automower/test_button.py
+++ b/tests/components/husqvarna_automower/test_button.py
@@ -2,14 +2,16 @@
 
 import datetime
 from unittest.mock import AsyncMock, patch
+import zoneinfo
 
 from aioautomower.exceptions import ApiException
-from aioautomower.model import MowerAttributes
+from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.husqvarna_automower.const import DOMAIN
 from homeassistant.components.husqvarna_automower.coordinator import SCAN_INTERVAL
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -24,7 +26,12 @@ from homeassistant.helpers import entity_registry as er
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_value_fixture,
+    snapshot_platform,
+)
 
 
 @pytest.mark.freeze_time(datetime.datetime(2023, 6, 5, tzinfo=datetime.UTC))
@@ -33,7 +40,6 @@ async def test_button_states_and_commands(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test error confirm button command."""
     entity_id = "button.test_mower_1_confirm_error"
@@ -42,6 +48,9 @@ async def test_button_states_and_commands(
     assert state.name == "Test Mower 1 Confirm error"
     assert state.state == STATE_UNAVAILABLE
 
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     values[TEST_MOWER_ID].mower.is_error_confirmable = None
     mock_automower_client.get_status.return_value = values
     freezer.tick(SCAN_INTERVAL)
@@ -90,7 +99,6 @@ async def test_sync_clock(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test sync clock button command."""
     entity_id = "button.test_mower_1_sync_clock"
@@ -98,6 +106,9 @@ async def test_sync_clock(
     state = hass.states.get(entity_id)
     assert state.name == "Test Mower 1 Sync clock"
 
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     mock_automower_client.get_status.return_value = values
 
     await hass.services.async_call(
@@ -107,7 +118,12 @@ async def test_sync_clock(
         blocking=True,
     )
     mocked_method = mock_automower_client.commands.set_datetime
-    mocked_method.assert_called_once_with(TEST_MOWER_ID)
+    # datetime(2024, 2, 29, 11, tzinfo=datetime.UTC) is in local time of the tests
+    # datetime(2024, 2, 29, 12, tzinfo=zoneinfo.ZoneInfo(key='Europe/Berlin'))
+    mocked_method.assert_called_once_with(
+        TEST_MOWER_ID,
+        datetime.datetime(2024, 2, 29, 12, tzinfo=zoneinfo.ZoneInfo("Europe/Berlin")),
+    )
     await hass.async_block_till_done()
     state = hass.states.get(entity_id)
     assert state.state == "2024-02-29T11:00:00+00:00"
diff --git a/tests/components/husqvarna_automower/test_calendar.py b/tests/components/husqvarna_automower/test_calendar.py
index 8138b8c139b..0e914e272fb 100644
--- a/tests/components/husqvarna_automower/test_calendar.py
+++ b/tests/components/husqvarna_automower/test_calendar.py
@@ -6,7 +6,6 @@ from http import HTTPStatus
 from typing import Any
 from unittest.mock import AsyncMock
 import urllib
-import zoneinfo
 
 from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
@@ -94,16 +93,12 @@ async def test_empty_calendar(
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
     get_events: GetEventsFn,
-    mower_time_zone: zoneinfo.ZoneInfo,
 ) -> None:
     """State if there is no schedule set."""
     await setup_integration(hass, mock_config_entry)
     json_values = load_json_value_fixture("mower.json", DOMAIN)
     json_values["data"][0]["attributes"]["calendar"]["tasks"] = []
-    values = mower_list_to_dictionary_dataclass(
-        json_values,
-        mower_time_zone,
-    )
+    values = mower_list_to_dictionary_dataclass(json_values)
     mock_automower_client.get_status.return_value = values
     freezer.tick(SCAN_INTERVAL)
     async_fire_time_changed(hass)
diff --git a/tests/components/husqvarna_automower/test_diagnostics.py b/tests/components/husqvarna_automower/test_diagnostics.py
index 2b47bff25a4..f8dc89af6f0 100644
--- a/tests/components/husqvarna_automower/test_diagnostics.py
+++ b/tests/components/husqvarna_automower/test_diagnostics.py
@@ -2,7 +2,6 @@
 
 import datetime
 from unittest.mock import AsyncMock
-import zoneinfo
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
@@ -22,9 +21,7 @@ from tests.components.diagnostics import (
 from tests.typing import ClientSessionGenerator
 
 
-@pytest.mark.freeze_time(
-    datetime.datetime(2023, 6, 5, tzinfo=zoneinfo.ZoneInfo("Europe/Berlin"))
-)
+@pytest.mark.freeze_time(datetime.datetime(2023, 6, 5, tzinfo=datetime.UTC))
 async def test_entry_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
@@ -43,9 +40,7 @@ async def test_entry_diagnostics(
     assert result == snapshot(exclude=props("created_at", "modified_at"))
 
 
-@pytest.mark.freeze_time(
-    datetime.datetime(2023, 6, 5, tzinfo=zoneinfo.ZoneInfo("Europe/Berlin"))
-)
+@pytest.mark.freeze_time(datetime.datetime(2023, 6, 5, tzinfo=datetime.UTC))
 async def test_device_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
diff --git a/tests/components/husqvarna_automower/test_init.py b/tests/components/husqvarna_automower/test_init.py
index ae688571d2c..b7cc6f883f4 100644
--- a/tests/components/husqvarna_automower/test_init.py
+++ b/tests/components/husqvarna_automower/test_init.py
@@ -1,39 +1,35 @@
 """Tests for init module."""
 
-from asyncio import Event
-from datetime import datetime
+from datetime import timedelta
 import http
 import time
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
 
 from aioautomower.exceptions import (
     ApiException,
     AuthException,
     HusqvarnaWSServerHandshakeError,
-    TimeoutException,
 )
-from aioautomower.model import MowerAttributes, WorkArea
+from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.husqvarna_automower.const import DOMAIN, OAUTH2_TOKEN
-from homeassistant.components.husqvarna_automower.coordinator import SCAN_INTERVAL
 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.util import dt as dt_util
 
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_value_fixture,
+)
 from tests.test_util.aiohttp import AiohttpClientMocker
 
-ADDITIONAL_NUMBER_ENTITIES = 1
-ADDITIONAL_SENSOR_ENTITIES = 2
-ADDITIONAL_SWITCH_ENTITIES = 1
-
 
 async def test_load_unload_entry(
     hass: HomeAssistant,
@@ -129,77 +125,28 @@ async def test_update_failed(
     assert entry.state is entry_state
 
 
-@patch(
-    "homeassistant.components.husqvarna_automower.coordinator.DEFAULT_RECONNECT_TIME", 0
-)
-@pytest.mark.parametrize(
-    ("method_path", "exception", "error_msg"),
-    [
-        (
-            ["auth", "websocket_connect"],
-            HusqvarnaWSServerHandshakeError,
-            "Failed to connect to websocket.",
-        ),
-        (
-            ["start_listening"],
-            TimeoutException,
-            "Failed to listen to websocket.",
-        ),
-    ],
-)
 async def test_websocket_not_available(
     hass: HomeAssistant,
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     caplog: pytest.LogCaptureFixture,
     freezer: FrozenDateTimeFactory,
-    method_path: list[str],
-    exception: type[Exception],
-    error_msg: str,
 ) -> None:
-    """Test trying to reload the websocket."""
-    calls = []
-    mock_called = Event()
-    mock_stall = Event()
-
-    async def mock_function():
-        mock_called.set()
-        await mock_stall.wait()
-        # Raise the first time the method is awaited
-        if not calls:
-            calls.append(None)
-            raise exception("Boom")
-        if mock_side_effect:
-            await mock_side_effect()
-
-    # Find the method to mock
-    mock = mock_automower_client
-    for itm in method_path:
-        mock = getattr(mock, itm)
-    mock_side_effect = mock.side_effect
-    mock.side_effect = mock_function
-
-    # Setup integration and verify log error message
+    """Test trying reload the websocket."""
+    mock_automower_client.start_listening.side_effect = HusqvarnaWSServerHandshakeError(
+        "Boom"
+    )
     await setup_integration(hass, mock_config_entry)
-    await mock_called.wait()
-    mock_called.clear()
-    # Allow the exception to be raised
-    mock_stall.set()
-    assert mock.call_count == 1
+    assert "Failed to connect to websocket. Trying to reconnect: Boom" in caplog.text
+    assert mock_automower_client.auth.websocket_connect.call_count == 1
+    assert mock_automower_client.start_listening.call_count == 1
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    freezer.tick(timedelta(seconds=2))
+    async_fire_time_changed(hass)
     await hass.async_block_till_done()
-    assert f"{error_msg} Trying to reconnect: Boom" in caplog.text
-
-    # Simulate a successful connection
-    caplog.clear()
-    await mock_called.wait()
-    mock_called.clear()
-    await hass.async_block_till_done()
-    assert mock.call_count == 2
-    assert "Trying to reconnect: Boom" not in caplog.text
-
-    # Simulate hass shutting down
-    await hass.async_stop()
-    assert mock.call_count == 2
+    assert mock_automower_client.auth.websocket_connect.call_count == 2
+    assert mock_automower_client.start_listening.call_count == 2
+    assert mock_config_entry.state is ConfigEntryState.LOADED
 
 
 async def test_device_info(
@@ -220,13 +167,37 @@ async def test_device_info(
     assert reg_device == snapshot
 
 
+async def test_workarea_deleted(
+    hass: HomeAssistant,
+    mock_automower_client: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test if work area is deleted after removed."""
+
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
+    await setup_integration(hass, mock_config_entry)
+    current_entries = len(
+        er.async_entries_for_config_entry(entity_registry, mock_config_entry.entry_id)
+    )
+
+    del values[TEST_MOWER_ID].work_areas[123456]
+    mock_automower_client.get_status.return_value = values
+    await hass.config_entries.async_reload(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert len(
+        er.async_entries_for_config_entry(entity_registry, mock_config_entry.entry_id)
+    ) == (current_entries - 2)
+
+
 async def test_coordinator_automatic_registry_cleanup(
     hass: HomeAssistant,
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test automatic registry cleanup."""
     await setup_integration(hass, mock_config_entry)
@@ -240,6 +211,9 @@ async def test_coordinator_automatic_registry_cleanup(
         dr.async_entries_for_config_entry(device_registry, entry.entry_id)
     )
 
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     values.pop(TEST_MOWER_ID)
     mock_automower_client.get_status.return_value = values
     await hass.config_entries.async_reload(mock_config_entry.entry_id)
@@ -253,71 +227,3 @@ async def test_coordinator_automatic_registry_cleanup(
         len(dr.async_entries_for_config_entry(device_registry, entry.entry_id))
         == current_devices - 1
     )
-
-
-async def test_add_and_remove_work_area(
-    hass: HomeAssistant,
-    mock_automower_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    entity_registry: er.EntityRegistry,
-    values: dict[str, MowerAttributes],
-) -> None:
-    """Test adding a work area in runtime."""
-    await setup_integration(hass, mock_config_entry)
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    current_entites_start = len(
-        er.async_entries_for_config_entry(entity_registry, entry.entry_id)
-    )
-    values[TEST_MOWER_ID].work_area_names.append("new work area")
-    values[TEST_MOWER_ID].work_area_dict.update({1: "new work area"})
-    values[TEST_MOWER_ID].work_areas.update(
-        {
-            1: WorkArea(
-                name="new work area",
-                cutting_height=12,
-                enabled=True,
-                progress=12,
-                last_time_completed=datetime(
-                    2024, 10, 1, 11, 11, 0, tzinfo=dt_util.get_default_time_zone()
-                ),
-            )
-        }
-    )
-    mock_automower_client.get_status.return_value = values
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    current_entites_after_addition = len(
-        er.async_entries_for_config_entry(entity_registry, entry.entry_id)
-    )
-    assert (
-        current_entites_after_addition
-        == current_entites_start
-        + ADDITIONAL_NUMBER_ENTITIES
-        + ADDITIONAL_SENSOR_ENTITIES
-        + ADDITIONAL_SWITCH_ENTITIES
-    )
-
-    values[TEST_MOWER_ID].work_area_names.remove("new work area")
-    del values[TEST_MOWER_ID].work_area_dict[1]
-    del values[TEST_MOWER_ID].work_areas[1]
-    values[TEST_MOWER_ID].work_area_names.remove("Front lawn")
-    del values[TEST_MOWER_ID].work_area_dict[123456]
-    del values[TEST_MOWER_ID].work_areas[123456]
-    del values[TEST_MOWER_ID].calendar.tasks[:2]
-    values[TEST_MOWER_ID].mower.work_area_id = 654321
-    mock_automower_client.get_status.return_value = values
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    current_entites_after_deletion = len(
-        er.async_entries_for_config_entry(entity_registry, entry.entry_id)
-    )
-    assert (
-        current_entites_after_deletion
-        == current_entites_start
-        - ADDITIONAL_SWITCH_ENTITIES
-        - ADDITIONAL_NUMBER_ENTITIES
-        - ADDITIONAL_SENSOR_ENTITIES
-    )
diff --git a/tests/components/husqvarna_automower/test_lawn_mower.py b/tests/components/husqvarna_automower/test_lawn_mower.py
index 3aca509e865..552a3a6a9cf 100644
--- a/tests/components/husqvarna_automower/test_lawn_mower.py
+++ b/tests/components/husqvarna_automower/test_lawn_mower.py
@@ -4,7 +4,7 @@ from datetime import timedelta
 from unittest.mock import AsyncMock
 
 from aioautomower.exceptions import ApiException
-from aioautomower.model import MowerActivities, MowerAttributes, MowerStates
+from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from voluptuous.error import MultipleInvalid
@@ -18,7 +18,11 @@ from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_value_fixture,
+)
 
 
 async def test_lawn_mower_states(
@@ -26,23 +30,21 @@ async def test_lawn_mower_states(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test lawn_mower state."""
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
     state = hass.states.get("lawn_mower.test_mower_1")
     assert state is not None
     assert state.state == LawnMowerActivity.DOCKED
 
     for activity, state, expected_state in (
-        (MowerActivities.UNKNOWN, MowerStates.PAUSED, LawnMowerActivity.PAUSED),
-        (MowerActivities.MOWING, MowerStates.NOT_APPLICABLE, LawnMowerActivity.MOWING),
-        (MowerActivities.NOT_APPLICABLE, MowerStates.ERROR, LawnMowerActivity.ERROR),
-        (
-            MowerActivities.GOING_HOME,
-            MowerStates.IN_OPERATION,
-            LawnMowerActivity.RETURNING,
-        ),
+        ("UNKNOWN", "PAUSED", LawnMowerActivity.PAUSED),
+        ("MOWING", "NOT_APPLICABLE", LawnMowerActivity.MOWING),
+        ("NOT_APPLICABLE", "ERROR", LawnMowerActivity.ERROR),
+        ("GOING_HOME", "IN_OPERATION", LawnMowerActivity.RETURNING),
     ):
         values[TEST_MOWER_ID].mower.activity = activity
         values[TEST_MOWER_ID].mower.state = state
@@ -251,10 +253,12 @@ async def test_lawn_mower_wrong_service_commands(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test lawn_mower commands."""
     await setup_integration(hass, mock_config_entry)
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     values[TEST_MOWER_ID].capabilities.work_areas = mower_support_wa
     mock_automower_client.get_status.return_value = values
     freezer.tick(SCAN_INTERVAL)
diff --git a/tests/components/husqvarna_automower/test_number.py b/tests/components/husqvarna_automower/test_number.py
index e1f232e7b5c..b7ff84e14e6 100644
--- a/tests/components/husqvarna_automower/test_number.py
+++ b/tests/components/husqvarna_automower/test_number.py
@@ -4,12 +4,15 @@ from datetime import timedelta
 from unittest.mock import AsyncMock, patch
 
 from aioautomower.exceptions import ApiException
-from aioautomower.model import MowerAttributes
+from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
 
-from homeassistant.components.husqvarna_automower.const import EXECUTION_TIME_DELAY
+from homeassistant.components.husqvarna_automower.const import (
+    DOMAIN,
+    EXECUTION_TIME_DELAY,
+)
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -18,7 +21,12 @@ from homeassistant.helpers import entity_registry as er
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_value_fixture,
+    snapshot_platform,
+)
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -60,11 +68,13 @@ async def test_number_workarea_commands(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test number commands."""
     entity_id = "number.test_mower_1_front_lawn_cutting_height"
     await setup_integration(hass, mock_config_entry)
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     values[TEST_MOWER_ID].work_areas[123456].cutting_height = 75
     mock_automower_client.get_status.return_value = values
     mocked_method = AsyncMock()
diff --git a/tests/components/husqvarna_automower/test_select.py b/tests/components/husqvarna_automower/test_select.py
index 18d1b0ed21f..e885a4d3487 100644
--- a/tests/components/husqvarna_automower/test_select.py
+++ b/tests/components/husqvarna_automower/test_select.py
@@ -3,10 +3,12 @@
 from unittest.mock import AsyncMock
 
 from aioautomower.exceptions import ApiException
-from aioautomower.model import HeadlightModes, MowerAttributes
+from aioautomower.model import HeadlightModes
+from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 
+from homeassistant.components.husqvarna_automower.const import DOMAIN
 from homeassistant.components.husqvarna_automower.coordinator import SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -14,7 +16,11 @@ from homeassistant.exceptions import HomeAssistantError
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_value_fixture,
+)
 
 
 async def test_select_states(
@@ -22,9 +28,11 @@ async def test_select_states(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test states of headlight mode select."""
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
     state = hass.states.get("select.test_mower_1_headlight_mode")
     assert state is not None
diff --git a/tests/components/husqvarna_automower/test_sensor.py b/tests/components/husqvarna_automower/test_sensor.py
index 06fcc30e40c..39bff398da6 100644
--- a/tests/components/husqvarna_automower/test_sensor.py
+++ b/tests/components/husqvarna_automower/test_sensor.py
@@ -1,14 +1,14 @@
 """Tests for sensor platform."""
 
-import datetime
 from unittest.mock import AsyncMock, patch
-import zoneinfo
 
-from aioautomower.model import MowerAttributes, MowerModes, MowerStates
+from aioautomower.model import MowerModes, MowerStates
+from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy import SnapshotAssertion
 
+from homeassistant.components.husqvarna_automower.const import DOMAIN
 from homeassistant.components.husqvarna_automower.coordinator import SCAN_INTERVAL
 from homeassistant.const import STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
@@ -17,7 +17,12 @@ from homeassistant.helpers import entity_registry as er
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    load_json_value_fixture,
+    snapshot_platform,
+)
 
 
 async def test_sensor_unknown_states(
@@ -25,9 +30,11 @@ async def test_sensor_unknown_states(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test a sensor which returns unknown."""
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
     state = hass.states.get("sensor.test_mower_1_mode")
     assert state is not None
@@ -56,15 +63,11 @@ async def test_cutting_blade_usage_time_sensor(
     assert state.state == "0.034"
 
 
-@pytest.mark.freeze_time(
-    datetime.datetime(2023, 6, 5, tzinfo=zoneinfo.ZoneInfo("Europe/Berlin"))
-)
 async def test_next_start_sensor(
     hass: HomeAssistant,
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test if this sensor is only added, if data is available."""
     await setup_integration(hass, mock_config_entry)
@@ -72,7 +75,10 @@ async def test_next_start_sensor(
     assert state is not None
     assert state.state == "2023-06-05T17:00:00+00:00"
 
-    values[TEST_MOWER_ID].planner.next_start_datetime = None
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
+    values[TEST_MOWER_ID].planner.next_start_datetime_naive = None
     mock_automower_client.get_status.return_value = values
     freezer.tick(SCAN_INTERVAL)
     async_fire_time_changed(hass)
@@ -86,7 +92,6 @@ async def test_work_area_sensor(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test the work area sensor."""
     await setup_integration(hass, mock_config_entry)
@@ -94,6 +99,9 @@ async def test_work_area_sensor(
     assert state is not None
     assert state.state == "Front lawn"
 
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     values[TEST_MOWER_ID].mower.work_area_id = None
     mock_automower_client.get_status.return_value = values
     freezer.tick(SCAN_INTERVAL)
@@ -129,10 +137,13 @@ async def test_statistics_not_available(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     sensor_to_test: str,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test if this sensor is only added, if data is available."""
 
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
+
     delattr(values[TEST_MOWER_ID].statistics, sensor_to_test)
     mock_automower_client.get_status.return_value = values
     await setup_integration(hass, mock_config_entry)
@@ -145,9 +156,11 @@ async def test_error_sensor(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test error sensor."""
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
 
     for state, error_key, expected_state in (
diff --git a/tests/components/husqvarna_automower/test_switch.py b/tests/components/husqvarna_automower/test_switch.py
index 100fd9fe3a4..8c62ff89154 100644
--- a/tests/components/husqvarna_automower/test_switch.py
+++ b/tests/components/husqvarna_automower/test_switch.py
@@ -2,10 +2,9 @@
 
 from datetime import timedelta
 from unittest.mock import AsyncMock, patch
-import zoneinfo
 
 from aioautomower.exceptions import ApiException
-from aioautomower.model import MowerAttributes, MowerModes, Zone
+from aioautomower.model import MowerModes
 from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -38,9 +37,8 @@ from tests.common import (
     snapshot_platform,
 )
 
-TEST_AREA_ID = 0
-TEST_VARIABLE_ZONE_ID = "203F6359-AB56-4D57-A6DC-703095BB695D"
 TEST_ZONE_ID = "AAAAAAAA-BBBB-CCCC-DDDD-123456789101"
+TEST_AREA_ID = 0
 
 
 async def test_switch_states(
@@ -48,9 +46,11 @@ async def test_switch_states(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test switch state."""
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
 
     for mode, expected_state in (
@@ -122,14 +122,12 @@ async def test_stay_out_zone_switch_commands(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    mower_time_zone: zoneinfo.ZoneInfo,
 ) -> None:
     """Test switch commands."""
     entity_id = "switch.test_mower_1_avoid_danger_zone"
     await setup_integration(hass, mock_config_entry)
     values = mower_list_to_dictionary_dataclass(
-        load_json_value_fixture("mower.json", DOMAIN),
-        mower_time_zone,
+        load_json_value_fixture("mower.json", DOMAIN)
     )
     values[TEST_MOWER_ID].stay_out_zones.zones[TEST_ZONE_ID].enabled = boolean
     mock_automower_client.get_status.return_value = values
@@ -179,15 +177,12 @@ async def test_work_area_switch_commands(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     freezer: FrozenDateTimeFactory,
-    mower_time_zone: zoneinfo.ZoneInfo,
-    values: dict[str, MowerAttributes],
 ) -> None:
     """Test switch commands."""
     entity_id = "switch.test_mower_1_my_lawn"
     await setup_integration(hass, mock_config_entry)
     values = mower_list_to_dictionary_dataclass(
-        load_json_value_fixture("mower.json", DOMAIN),
-        mower_time_zone,
+        load_json_value_fixture("mower.json", DOMAIN)
     )
     values[TEST_MOWER_ID].work_areas[TEST_AREA_ID].enabled = boolean
     mock_automower_client.get_status.return_value = values
@@ -221,46 +216,29 @@ async def test_work_area_switch_commands(
     assert len(mocked_method.mock_calls) == 2
 
 
-async def test_add_stay_out_zone(
+async def test_zones_deleted(
     hass: HomeAssistant,
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
     entity_registry: er.EntityRegistry,
-    values: dict[str, MowerAttributes],
 ) -> None:
-    """Test adding a stay out zone in runtime."""
+    """Test if stay-out-zone is deleted after removed."""
+
+    values = mower_list_to_dictionary_dataclass(
+        load_json_value_fixture("mower.json", DOMAIN)
+    )
     await setup_integration(hass, mock_config_entry)
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    current_entites = len(
-        er.async_entries_for_config_entry(entity_registry, entry.entry_id)
-    )
-    values[TEST_MOWER_ID].stay_out_zones.zones.update(
-        {
-            TEST_VARIABLE_ZONE_ID: Zone(
-                name="future_zone",
-                enabled=True,
-            )
-        }
+    current_entries = len(
+        er.async_entries_for_config_entry(entity_registry, mock_config_entry.entry_id)
     )
+
+    del values[TEST_MOWER_ID].stay_out_zones.zones[TEST_ZONE_ID]
     mock_automower_client.get_status.return_value = values
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
+    await hass.config_entries.async_reload(mock_config_entry.entry_id)
     await hass.async_block_till_done()
-    current_entites_after_addition = len(
-        er.async_entries_for_config_entry(entity_registry, entry.entry_id)
-    )
-    assert current_entites_after_addition == current_entites + 1
-    values[TEST_MOWER_ID].stay_out_zones.zones.pop(TEST_VARIABLE_ZONE_ID)
-    values[TEST_MOWER_ID].stay_out_zones.zones.pop(TEST_ZONE_ID)
-    mock_automower_client.get_status.return_value = values
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-    current_entites_after_deletion = len(
-        er.async_entries_for_config_entry(entity_registry, entry.entry_id)
-    )
-    assert current_entites_after_deletion == current_entites - 1
+    assert len(
+        er.async_entries_for_config_entry(entity_registry, mock_config_entry.entry_id)
+    ) == (current_entries - 1)
 
 
 async def test_switch_snapshot(
diff --git a/tests/components/husqvarna_automower_ble/__init__.py b/tests/components/husqvarna_automower_ble/__init__.py
deleted file mode 100644
index 7ca5aea121d..00000000000
--- a/tests/components/husqvarna_automower_ble/__init__.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Tests for the Husqvarna Automower Bluetooth integration."""
-
-from unittest.mock import patch
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.service_info.bluetooth import BluetoothServiceInfo
-
-from tests.common import MockConfigEntry
-from tests.components.bluetooth import inject_bluetooth_service_info
-
-AUTOMOWER_SERVICE_INFO = BluetoothServiceInfo(
-    name="305",
-    address="00000000-0000-0000-0000-000000000003",
-    rssi=-63,
-    service_data={},
-    manufacturer_data={1062: b"\x05\x04\xbf\xcf\xbb\r"},
-    service_uuids=[
-        "98bd0001-0b0e-421a-84e5-ddbf75dc6de4",
-        "00001800-0000-1000-8000-00805f9b34fb",
-    ],
-    source="local",
-)
-
-AUTOMOWER_UNNAMED_SERVICE_INFO = BluetoothServiceInfo(
-    name=None,
-    address="00000000-0000-0000-0000-000000000004",
-    rssi=-63,
-    service_data={},
-    manufacturer_data={1062: b"\x05\x04\xbf\xcf\xbb\r"},
-    service_uuids=[
-        "98bd0001-0b0e-421a-84e5-ddbf75dc6de4",
-        "00001800-0000-1000-8000-00805f9b34fb",
-    ],
-    source="local",
-)
-
-AUTOMOWER_MISSING_MANUFACTURER_DATA_SERVICE_INFO = BluetoothServiceInfo(
-    name="Missing Manufacturer Data",
-    address="00000000-0000-0000-0002-000000000001",
-    rssi=-63,
-    service_data={},
-    manufacturer_data={},
-    service_uuids=[
-        "98bd0001-0b0e-421a-84e5-ddbf75dc6de4",
-        "00001800-0000-1000-8000-00805f9b34fb",
-    ],
-    source="local",
-)
-
-AUTOMOWER_UNSUPPORTED_GROUP_SERVICE_INFO = BluetoothServiceInfo(
-    name="Unsupported Group",
-    address="00000000-0000-0000-0002-000000000002",
-    rssi=-63,
-    service_data={},
-    manufacturer_data={1062: b"\x05\x04\xbf\xcf\xbb\r"},
-    service_uuids=[
-        "98bd0001-0b0e-421a-84e5-ddbf75dc6de4",
-    ],
-    source="local",
-)
-
-
-async def setup_entry(
-    hass: HomeAssistant, mock_entry: MockConfigEntry, platforms: list[Platform]
-) -> None:
-    """Make sure the device is available."""
-
-    inject_bluetooth_service_info(hass, AUTOMOWER_SERVICE_INFO)
-
-    with patch("homeassistant.components.husqvarna_automower_ble.PLATFORMS", platforms):
-        mock_entry.add_to_hass(hass)
-        await hass.config_entries.async_setup(mock_entry.entry_id)
-        await hass.async_block_till_done()
diff --git a/tests/components/husqvarna_automower_ble/conftest.py b/tests/components/husqvarna_automower_ble/conftest.py
deleted file mode 100644
index 3a8e881aba0..00000000000
--- a/tests/components/husqvarna_automower_ble/conftest.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""Common fixtures for the Husqvarna Automower Bluetooth tests."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
-
-import pytest
-
-from homeassistant.components.husqvarna_automower_ble.const import DOMAIN
-from homeassistant.const import CONF_ADDRESS, CONF_CLIENT_ID
-
-from . import AUTOMOWER_SERVICE_INFO
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.husqvarna_automower_ble.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture(autouse=True)
-def mock_automower_client(enable_bluetooth: None) -> Generator[AsyncMock]:
-    """Mock a BleakClient client."""
-    with (
-        patch(
-            "homeassistant.components.husqvarna_automower_ble.Mower",
-            autospec=True,
-        ) as mock_client,
-        patch(
-            "homeassistant.components.husqvarna_automower_ble.config_flow.Mower",
-            new=mock_client,
-        ),
-    ):
-        client = mock_client.return_value
-        client.connect.return_value = True
-        client.is_connected.return_value = True
-        client.get_model.return_value = "305"
-        client.battery_level.return_value = 100
-        client.mower_state.return_value = "pendingStart"
-        client.mower_activity.return_value = "charging"
-        client.probe_gatts.return_value = ("Husqvarna", "Automower", "305")
-
-        yield client
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Mock a config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        title="Husqvarna AutoMower",
-        data={
-            CONF_ADDRESS: AUTOMOWER_SERVICE_INFO.address,
-            CONF_CLIENT_ID: 1197489078,
-        },
-        unique_id=AUTOMOWER_SERVICE_INFO.address,
-    )
diff --git a/tests/components/husqvarna_automower_ble/snapshots/test_init.ambr b/tests/components/husqvarna_automower_ble/snapshots/test_init.ambr
deleted file mode 100644
index 1cc54020195..00000000000
--- a/tests/components/husqvarna_automower_ble/snapshots/test_init.ambr
+++ /dev/null
@@ -1,33 +0,0 @@
-# serializer version: 1
-# name: test_setup
-  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(
-        'husqvarna_automower_ble',
-        '00000000-0000-0000-0000-000000000003_1197489078',
-      ),
-    }),
-    'is_new': False,
-    'labels': set({
-    }),
-    'manufacturer': 'Husqvarna',
-    'model': None,
-    'model_id': '305',
-    'name': 'Husqvarna AutoMower',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': None,
-    'suggested_area': None,
-    'sw_version': None,
-    'via_device_id': None,
-  })
-# ---
diff --git a/tests/components/husqvarna_automower_ble/test_config_flow.py b/tests/components/husqvarna_automower_ble/test_config_flow.py
deleted file mode 100644
index e053a28b7dd..00000000000
--- a/tests/components/husqvarna_automower_ble/test_config_flow.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""Test the Husqvarna Bluetooth config flow."""
-
-from unittest.mock import Mock, patch
-
-from bleak import BleakError
-import pytest
-
-from homeassistant.components.husqvarna_automower_ble.const import DOMAIN
-from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_USER
-from homeassistant.const import CONF_ADDRESS, CONF_CLIENT_ID
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from . import (
-    AUTOMOWER_SERVICE_INFO,
-    AUTOMOWER_UNNAMED_SERVICE_INFO,
-    AUTOMOWER_UNSUPPORTED_GROUP_SERVICE_INFO,
-)
-
-from tests.common import MockConfigEntry
-from tests.components.bluetooth import inject_bluetooth_service_info
-
-pytestmark = pytest.mark.usefixtures("mock_setup_entry")
-
-
-@pytest.fixture(autouse=True)
-def mock_random() -> Mock:
-    """Mock random to generate predictable client id."""
-    with patch(
-        "homeassistant.components.husqvarna_automower_ble.config_flow.random"
-    ) as mock_random:
-        mock_random.randint.return_value = 1197489078
-        yield mock_random
-
-
-async def test_user_selection(hass: HomeAssistant) -> None:
-    """Test we can select a device."""
-
-    inject_bluetooth_service_info(hass, AUTOMOWER_SERVICE_INFO)
-    inject_bluetooth_service_info(hass, AUTOMOWER_UNNAMED_SERVICE_INFO)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={CONF_ADDRESS: "00000000-0000-0000-0000-000000000001"},
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "confirm"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Husqvarna Automower"
-    assert result["result"].unique_id == "00000000-0000-0000-0000-000000000001"
-
-    assert result["data"] == {
-        CONF_ADDRESS: "00000000-0000-0000-0000-000000000001",
-        CONF_CLIENT_ID: 1197489078,
-    }
-
-
-async def test_bluetooth(hass: HomeAssistant) -> None:
-    """Test bluetooth device discovery."""
-
-    inject_bluetooth_service_info(hass, AUTOMOWER_SERVICE_INFO)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    result = hass.config_entries.flow.async_progress_by_handler(DOMAIN)[0]
-    assert result["step_id"] == "confirm"
-    assert result["context"]["unique_id"] == "00000000-0000-0000-0000-000000000003"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Husqvarna Automower"
-    assert result["result"].unique_id == "00000000-0000-0000-0000-000000000003"
-
-    assert result["data"] == {
-        CONF_ADDRESS: "00000000-0000-0000-0000-000000000003",
-        CONF_CLIENT_ID: 1197489078,
-    }
-
-
-async def test_bluetooth_invalid(hass: HomeAssistant) -> None:
-    """Test bluetooth device discovery with invalid data."""
-
-    inject_bluetooth_service_info(hass, AUTOMOWER_UNSUPPORTED_GROUP_SERVICE_INFO)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_BLUETOOTH},
-        data=AUTOMOWER_UNSUPPORTED_GROUP_SERVICE_INFO,
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "no_devices_found"
-
-
-async def test_failed_connect(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-) -> None:
-    """Test we can select a device."""
-
-    inject_bluetooth_service_info(hass, AUTOMOWER_SERVICE_INFO)
-    inject_bluetooth_service_info(hass, AUTOMOWER_UNNAMED_SERVICE_INFO)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    mock_automower_client.connect.side_effect = False
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={CONF_ADDRESS: "00000000-0000-0000-0000-000000000001"},
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "confirm"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Husqvarna Automower"
-    assert result["result"].unique_id == "00000000-0000-0000-0000-000000000001"
-
-    assert result["data"] == {
-        CONF_ADDRESS: "00000000-0000-0000-0000-000000000001",
-        CONF_CLIENT_ID: 1197489078,
-    }
-
-
-async def test_duplicate_entry(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test we can select a device."""
-
-    mock_config_entry.add_to_hass(hass)
-
-    inject_bluetooth_service_info(hass, AUTOMOWER_SERVICE_INFO)
-
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    # Test we should not discover the already configured device
-    assert len(hass.config_entries.flow.async_progress_by_handler(DOMAIN)) == 0
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={CONF_ADDRESS: "00000000-0000-0000-0000-000000000003"},
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_exception_connect(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-) -> None:
-    """Test we can select a device."""
-
-    inject_bluetooth_service_info(hass, AUTOMOWER_SERVICE_INFO)
-    inject_bluetooth_service_info(hass, AUTOMOWER_UNNAMED_SERVICE_INFO)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    mock_automower_client.probe_gatts.side_effect = BleakError
-
-    result = hass.config_entries.flow.async_progress_by_handler(DOMAIN)[0]
-    assert result["step_id"] == "confirm"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={},
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "cannot_connect"
diff --git a/tests/components/husqvarna_automower_ble/test_init.py b/tests/components/husqvarna_automower_ble/test_init.py
deleted file mode 100644
index 3cb4338eca4..00000000000
--- a/tests/components/husqvarna_automower_ble/test_init.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""Test the Husqvarna Automower Bluetooth setup."""
-
-from unittest.mock import Mock
-
-from bleak import BleakError
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.husqvarna_automower_ble.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from . import AUTOMOWER_SERVICE_INFO
-
-from tests.common import MockConfigEntry
-
-pytestmark = pytest.mark.usefixtures("mock_automower_client")
-
-
-async def test_setup(
-    hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    mock_config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test setup creates expected devices."""
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    device_entry = device_registry.async_get_device(
-        identifiers={(DOMAIN, f"{AUTOMOWER_SERVICE_INFO.address}_1197489078")}
-    )
-
-    assert device_entry == snapshot
-
-
-async def test_setup_retry_connect(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test setup creates expected devices."""
-
-    mock_automower_client.connect.return_value = False
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
-
-
-async def test_setup_failed_connect(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test setup creates expected devices."""
-
-    mock_automower_client.connect.side_effect = BleakError
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/husqvarna_automower_ble/test_lawn_mower.py b/tests/components/husqvarna_automower_ble/test_lawn_mower.py
deleted file mode 100644
index 3f00d3dbff0..00000000000
--- a/tests/components/husqvarna_automower_ble/test_lawn_mower.py
+++ /dev/null
@@ -1,126 +0,0 @@
-"""Test the Husqvarna Automower Bluetooth setup."""
-
-from datetime import timedelta
-from unittest.mock import Mock
-
-from bleak import BleakError
-from freezegun.api import FrozenDateTimeFactory
-import pytest
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_UNAVAILABLE
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry, async_fire_time_changed
-
-pytestmark = pytest.mark.usefixtures("mock_automower_client")
-
-
-@pytest.mark.parametrize(
-    (
-        "is_connected_side_effect",
-        "is_connected_return_value",
-        "connect_side_effect",
-        "connect_return_value",
-    ),
-    [
-        (None, False, None, False),
-        (None, False, BleakError, False),
-        (None, False, None, True),
-        (BleakError, False, None, True),
-    ],
-)
-async def test_setup_disconnect(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-    mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    is_connected_side_effect: Exception,
-    is_connected_return_value: bool,
-    connect_side_effect: Exception,
-    connect_return_value: bool,
-) -> None:
-    """Test disconnected device."""
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    assert hass.states.get("lawn_mower.husqvarna_automower").state != STATE_UNAVAILABLE
-
-    mock_automower_client.is_connected.side_effect = is_connected_side_effect
-    mock_automower_client.is_connected.return_value = is_connected_return_value
-    mock_automower_client.connect.side_effect = connect_side_effect
-    mock_automower_client.connect.return_value = connect_return_value
-
-    freezer.tick(timedelta(seconds=60))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("lawn_mower.husqvarna_automower").state == STATE_UNAVAILABLE
-
-
-@pytest.mark.parametrize(
-    ("attribute"),
-    [
-        "mower_activity",
-        "mower_state",
-        "battery_level",
-    ],
-)
-async def test_invalid_data_received(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-    mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    attribute: str,
-) -> None:
-    """Test invalid data received."""
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    getattr(mock_automower_client, attribute).return_value = None
-
-    freezer.tick(timedelta(seconds=60))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("lawn_mower.husqvarna_automower").state == STATE_UNAVAILABLE
-
-
-@pytest.mark.parametrize(
-    ("attribute"),
-    [
-        "mower_activity",
-        "mower_state",
-        "battery_level",
-    ],
-)
-async def test_bleak_error_data_update(
-    hass: HomeAssistant,
-    mock_automower_client: Mock,
-    mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    attribute: str,
-) -> None:
-    """Test BleakError during data update."""
-
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    getattr(mock_automower_client, attribute).side_effect = BleakError
-
-    freezer.tick(timedelta(seconds=60))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("lawn_mower.husqvarna_automower").state == STATE_UNAVAILABLE
diff --git a/tests/components/hydrawise/test_config_flow.py b/tests/components/hydrawise/test_config_flow.py
index e85b1b9b249..e2eaaa51dc2 100644
--- a/tests/components/hydrawise/test_config_flow.py
+++ b/tests/components/hydrawise/test_config_flow.py
@@ -93,6 +93,10 @@ async def test_form_connect_timeout(
     assert result2["type"] is FlowResultType.CREATE_ENTRY
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.hydrawise.config.error.invalid_auth"],
+)
 async def test_form_not_authorized_error(
     hass: HomeAssistant, mock_pydrawise: AsyncMock, user: User
 ) -> None:
diff --git a/tests/components/ifttt/test_init.py b/tests/components/ifttt/test_init.py
index c6d24421a8a..44896dc0f2c 100644
--- a/tests/components/ifttt/test_init.py
+++ b/tests/components/ifttt/test_init.py
@@ -2,8 +2,8 @@
 
 from homeassistant import config_entries
 from homeassistant.components import ifttt
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 
 from tests.typing import ClientSessionGenerator
diff --git a/tests/components/image/conftest.py b/tests/components/image/conftest.py
index 06ef7db9f49..e5e7649bee8 100644
--- a/tests/components/image/conftest.py
+++ b/tests/components/image/conftest.py
@@ -88,16 +88,6 @@ class MockImageNoStateEntity(image.ImageEntity):
         return b"Test"
 
 
-class MockImageNoDataEntity(image.ImageEntity):
-    """Mock image entity."""
-
-    _attr_name = "Test"
-
-    async def async_image(self) -> bytes | None:
-        """Return bytes of image."""
-        return None
-
-
 class MockImageSyncEntity(image.ImageEntity):
     """Mock image entity."""
 
diff --git a/tests/components/image/test_init.py b/tests/components/image/test_init.py
index 3bcf0df52e3..90b750976ce 100644
--- a/tests/components/image/test_init.py
+++ b/tests/components/image/test_init.py
@@ -3,7 +3,7 @@
 from datetime import datetime
 from http import HTTPStatus
 import ssl
-from unittest.mock import MagicMock, mock_open, patch
+from unittest.mock import MagicMock, patch
 
 from aiohttp import hdrs
 from freezegun.api import FrozenDateTimeFactory
@@ -13,16 +13,13 @@ import respx
 
 from homeassistant.components import image
 from homeassistant.config_entries import ConfigEntry
-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 .conftest import (
     MockImageEntity,
     MockImageEntityCapitalContentType,
     MockImageEntityInvalidContentType,
-    MockImageNoDataEntity,
     MockImageNoStateEntity,
     MockImagePlatform,
     MockImageSyncEntity,
@@ -384,112 +381,3 @@ async def test_image_stream(
             await hass.async_block_till_done()
 
     await close_future
-
-
-async def test_snapshot_service(hass: HomeAssistant) -> None:
-    """Test snapshot service."""
-    mopen = mock_open()
-    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()
-
-    with (
-        patch("homeassistant.components.image.open", mopen, create=True),
-        patch("homeassistant.components.image.os.makedirs"),
-        patch.object(hass.config, "is_allowed_path", return_value=True),
-    ):
-        await hass.services.async_call(
-            image.DOMAIN,
-            image.SERVICE_SNAPSHOT,
-            {
-                ATTR_ENTITY_ID: "image.test",
-                image.ATTR_FILENAME: "/test/snapshot.jpg",
-            },
-            blocking=True,
-        )
-
-        mock_write = mopen().write
-
-        assert len(mock_write.mock_calls) == 1
-        assert mock_write.mock_calls[0][1][0] == b"Test"
-
-
-async def test_snapshot_service_no_image(hass: HomeAssistant) -> None:
-    """Test snapshot service with no image."""
-    mopen = mock_open()
-    mock_integration(hass, MockModule(domain="test"))
-    mock_platform(hass, "test.image", MockImagePlatform([MockImageNoDataEntity(hass)]))
-    assert await async_setup_component(
-        hass, image.DOMAIN, {"image": {"platform": "test"}}
-    )
-    await hass.async_block_till_done()
-
-    with (
-        patch("homeassistant.components.image.open", mopen, create=True),
-        patch(
-            "homeassistant.components.image.os.makedirs",
-        ),
-        patch.object(hass.config, "is_allowed_path", return_value=True),
-    ):
-        await hass.services.async_call(
-            image.DOMAIN,
-            image.SERVICE_SNAPSHOT,
-            {
-                ATTR_ENTITY_ID: "image.test",
-                image.ATTR_FILENAME: "/test/snapshot.jpg",
-            },
-            blocking=True,
-        )
-
-        mock_write = mopen().write
-
-        assert len(mock_write.mock_calls) == 0
-
-
-async def test_snapshot_service_not_allowed_path(hass: HomeAssistant) -> None:
-    """Test snapshot service with a not allowed path."""
-    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()
-
-    with pytest.raises(HomeAssistantError, match="/test/snapshot.jpg"):
-        await hass.services.async_call(
-            image.DOMAIN,
-            image.SERVICE_SNAPSHOT,
-            {
-                ATTR_ENTITY_ID: "image.test",
-                image.ATTR_FILENAME: "/test/snapshot.jpg",
-            },
-            blocking=True,
-        )
-
-
-async def test_snapshot_service_os_error(hass: HomeAssistant) -> None:
-    """Test snapshot service with os error."""
-    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()
-
-    with (
-        patch.object(hass.config, "is_allowed_path", return_value=True),
-        patch("os.makedirs", side_effect=OSError),
-        pytest.raises(HomeAssistantError),
-    ):
-        await hass.services.async_call(
-            image.DOMAIN,
-            image.SERVICE_SNAPSHOT,
-            {
-                ATTR_ENTITY_ID: "image.test",
-                image.ATTR_FILENAME: "/test/snapshot.jpg",
-            },
-            blocking=True,
-        )
diff --git a/tests/components/imap/test_config_flow.py b/tests/components/imap/test_config_flow.py
index 2270030ad4f..fb97bf0505d 100644
--- a/tests/components/imap/test_config_flow.py
+++ b/tests/components/imap/test_config_flow.py
@@ -15,7 +15,7 @@ from homeassistant.components.imap.const import (
     DOMAIN,
 )
 from homeassistant.components.imap.errors import InvalidAuth, InvalidFolder
-from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -218,10 +218,7 @@ async def test_reauth_success(hass: HomeAssistant, mock_setup_entry: AsyncMock)
     result = await entry.start_reauth_flow(hass)
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
-    assert result["description_placeholders"] == {
-        CONF_USERNAME: "email@email.com",
-        CONF_NAME: "Mock Title",
-    }
+    assert result["description_placeholders"] == {CONF_USERNAME: "email@email.com"}
 
     with patch(
         "homeassistant.components.imap.config_flow.connect_to_server"
diff --git a/tests/components/improv_ble/__init__.py b/tests/components/improv_ble/__init__.py
index 521d0881443..41ea98cda7b 100644
--- a/tests/components/improv_ble/__init__.py
+++ b/tests/components/improv_ble/__init__.py
@@ -25,25 +25,6 @@ IMPROV_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
 )
 
 
-BAD_IMPROV_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
-    name="00123456",
-    address="AA:BB:CC:DD:EE:F0",
-    rssi=-60,
-    manufacturer_data={},
-    service_uuids=[SERVICE_UUID],
-    service_data={SERVICE_DATA_UUID: b"\x00\x00\x00\x00\x00\x00"},
-    source="local",
-    device=generate_ble_device(address="AA:BB:CC:DD:EE:F0", name="00123456"),
-    advertisement=generate_advertisement_data(
-        service_uuids=[SERVICE_UUID],
-        service_data={SERVICE_DATA_UUID: b"\x00\x00\x00\x00\x00\x00"},
-    ),
-    time=0,
-    connectable=True,
-    tx_power=-127,
-)
-
-
 PROVISIONED_IMPROV_BLE_DISCOVERY_INFO = BluetoothServiceInfoBleak(
     name="00123456",
     address="AA:BB:CC:DD:EE:F0",
diff --git a/tests/components/improv_ble/test_config_flow.py b/tests/components/improv_ble/test_config_flow.py
index 2df4be2ba7d..640a931bee5 100644
--- a/tests/components/improv_ble/test_config_flow.py
+++ b/tests/components/improv_ble/test_config_flow.py
@@ -15,7 +15,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult, FlowResultType
 
 from . import (
-    BAD_IMPROV_BLE_DISCOVERY_INFO,
     IMPROV_BLE_DISCOVERY_INFO,
     NOT_IMPROV_BLE_DISCOVERY_INFO,
     PROVISIONED_IMPROV_BLE_DISCOVERY_INFO,
@@ -650,20 +649,3 @@ async def test_provision_retry(hass: HomeAssistant, exc, error) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "provision"
     assert result["errors"] == {"base": error}
-
-
-async def test_provision_fails_invalid_data(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test bluetooth flow with error due to invalid data."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_BLUETOOTH},
-        data=BAD_IMPROV_BLE_DISCOVERY_INFO,
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "invalid_improv_data"
-    assert (
-        "Aborting improv flow, device AA:BB:CC:DD:EE:F0 sent invalid improv data: '000000000000'"
-        in caplog.text
-    )
diff --git a/tests/components/incomfort/test_water_heater.py b/tests/components/incomfort/test_water_heater.py
index 082aecf6d49..5b7aebc50a8 100644
--- a/tests/components/incomfort/test_water_heater.py
+++ b/tests/components/incomfort/test_water_heater.py
@@ -2,7 +2,6 @@
 
 from unittest.mock import MagicMock, patch
 
-import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.config_entries import ConfigEntry
@@ -10,8 +9,6 @@ from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from .conftest import MOCK_HEATER_STATUS
-
 from tests.common import snapshot_platform
 
 
@@ -26,44 +23,3 @@ async def test_setup_platform(
     """Test the incomfort entities are set up correctly."""
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
-    ("mock_heater_status", "current_temperature"),
-    [
-        (MOCK_HEATER_STATUS, 35.3),
-        (MOCK_HEATER_STATUS | {"is_tapping": True}, 30.2),
-        (MOCK_HEATER_STATUS | {"is_pumping": True}, 35.3),
-        (MOCK_HEATER_STATUS | {"heater_temp": None}, 30.2),
-        (MOCK_HEATER_STATUS | {"tap_temp": None}, 35.3),
-        (MOCK_HEATER_STATUS | {"heater_temp": None, "tap_temp": None}, None),
-    ],
-    ids=[
-        "both_temps_available_choose_highest",
-        "is_tapping_choose_tapping_temp",
-        "is_pumping_choose_heater_temp",
-        "heater_temp_not_available_choose_tapping_temp",
-        "tapping_temp_not_available_choose_heater_temp",
-        "tapping_and_heater_temp_not_available_unknown",
-    ],
-)
-@patch("homeassistant.components.incomfort.PLATFORMS", [Platform.WATER_HEATER])
-async def test_current_temperature_cases(
-    hass: HomeAssistant,
-    mock_incomfort: MagicMock,
-    entity_registry: er.EntityRegistry,
-    mock_config_entry: ConfigEntry,
-    current_temperature: float | None,
-) -> None:
-    """Test incomfort entities with alternate current temperature calculation.
-
-    The boilers current temperature is calculated from the testdata:
-    heater_temp: 35.34
-    tap_temp: 30.21
-
-    It is based on the operating mode as the boiler can heat tap water or
-    the house.
-    """
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    assert (state := hass.states.get("water_heater.boiler")) is not None
-    assert state.attributes.get("current_temperature") == current_temperature
diff --git a/tests/components/intellifire/snapshots/test_binary_sensor.ambr b/tests/components/intellifire/snapshots/test_binary_sensor.ambr
index 1b85db51d68..34d5836a025 100644
--- a/tests/components/intellifire/snapshots/test_binary_sensor.ambr
+++ b/tests/components/intellifire/snapshots/test_binary_sensor.ambr
@@ -47,54 +47,6 @@
     'state': 'off',
   })
 # ---
-# name: test_all_binary_sensor_entities[binary_sensor.intellifire_cloud_connectivity-entry]
-  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.intellifire_cloud_connectivity',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.CONNECTIVITY: 'connectivity'>,
-    'original_icon': None,
-    'original_name': 'Cloud connectivity',
-    'platform': 'intellifire',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'cloud_connectivity',
-    'unique_id': 'cloud_connectivity_mock_serial',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_binary_sensor_entities[binary_sensor.intellifire_cloud_connectivity-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by unpublished Intellifire API',
-      'device_class': 'connectivity',
-      'friendly_name': 'IntelliFire Cloud connectivity',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.intellifire_cloud_connectivity',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
 # name: test_all_binary_sensor_entities[binary_sensor.intellifire_disabled_error-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -430,54 +382,6 @@
     'state': 'off',
   })
 # ---
-# name: test_all_binary_sensor_entities[binary_sensor.intellifire_local_connectivity-entry]
-  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.intellifire_local_connectivity',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.CONNECTIVITY: 'connectivity'>,
-    'original_icon': None,
-    'original_name': 'Local connectivity',
-    'platform': 'intellifire',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'local_connectivity',
-    'unique_id': 'local_connectivity_mock_serial',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_binary_sensor_entities[binary_sensor.intellifire_local_connectivity-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by unpublished Intellifire API',
-      'device_class': 'connectivity',
-      'friendly_name': 'IntelliFire Local connectivity',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.intellifire_local_connectivity',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
 # name: test_all_binary_sensor_entities[binary_sensor.intellifire_maintenance_error-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/intent/test_init.py b/tests/components/intent/test_init.py
index 20c0f9d8d44..659ca16c0bb 100644
--- a/tests/components/intent/test_init.py
+++ b/tests/components/intent/test_init.py
@@ -455,14 +455,3 @@ async def test_set_position_intent_unsupported_domain(hass: HomeAssistant) -> No
             "HassSetPosition",
             {"name": {"value": "test light"}, "position": {"value": 100}},
         )
-
-
-async def test_intents_with_no_responses(hass: HomeAssistant) -> None:
-    """Test intents that should not return a response during handling."""
-    assert await async_setup_component(hass, "homeassistant", {})
-    assert await async_setup_component(hass, "intent", {})
-
-    # The "respond" intent gets its response text from home-assistant-intents
-    for intent_name in (intent.INTENT_NEVERMIND, intent.INTENT_RESPOND):
-        response = await intent.async_handle(hass, "test", intent_name, {})
-        assert not response.speech
diff --git a/tests/components/iron_os/snapshots/test_update.ambr b/tests/components/iron_os/snapshots/test_update.ambr
index e0872d032ec..fbfc490e121 100644
--- a/tests/components/iron_os/snapshots/test_update.ambr
+++ b/tests/components/iron_os/snapshots/test_update.ambr
@@ -40,7 +40,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/iron_os/icon.png',
       'friendly_name': 'Pinecil Firmware',
       'in_progress': False,
diff --git a/tests/components/iron_os/test_update.py b/tests/components/iron_os/test_update.py
index 7a2650ba7a3..70336e69620 100644
--- a/tests/components/iron_os/test_update.py
+++ b/tests/components/iron_os/test_update.py
@@ -8,7 +8,7 @@ import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_UNAVAILABLE, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
@@ -57,12 +57,12 @@ async def test_update(
 
 
 @pytest.mark.usefixtures("ble_device", "mock_pynecil")
-async def test_update_unavailable(
+async def test_config_entry_not_ready(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
     mock_githubapi: AsyncMock,
 ) -> None:
-    """Test update entity unavailable on error."""
+    """Test config entry not ready."""
 
     mock_githubapi.repos.releases.latest.side_effect = GitHubException
 
@@ -70,8 +70,4 @@ async def test_update_unavailable(
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    state = hass.states.get("update.pinecil_firmware")
-    assert state is not None
-    assert state.state == STATE_UNAVAILABLE
+    assert config_entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/isy994/test_config_flow.py b/tests/components/isy994/test_config_flow.py
index 2bc1fff222f..34e267fe904 100644
--- a/tests/components/isy994/test_config_flow.py
+++ b/tests/components/isy994/test_config_flow.py
@@ -698,16 +698,3 @@ async def test_reauth(hass: HomeAssistant) -> None:
     assert mock_setup_entry.called
     assert result4["type"] is FlowResultType.ABORT
     assert result4["reason"] == "reauth_successful"
-
-
-async def test_options_flow(hass: HomeAssistant) -> None:
-    """Test option flow."""
-    entry = MockConfigEntry(domain=DOMAIN)
-    entry.add_to_hass(hass)
-
-    result = await hass.config_entries.options.async_init(entry.entry_id)
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "init"
-
-    # This should be improved at a later stage to increase test coverage
-    hass.config_entries.options.async_abort(result["flow_id"])
diff --git a/tests/components/jewish_calendar/test_config_flow.py b/tests/components/jewish_calendar/test_config_flow.py
index e00fe41749f..23b0e9898f3 100644
--- a/tests/components/jewish_calendar/test_config_flow.py
+++ b/tests/components/jewish_calendar/test_config_flow.py
@@ -2,6 +2,8 @@
 
 from unittest.mock import AsyncMock
 
+import pytest
+
 from homeassistant import config_entries, setup
 from homeassistant.components.jewish_calendar.const import (
     CONF_CANDLE_LIGHT_MINUTES,
@@ -18,10 +20,12 @@ from homeassistant.const import (
     CONF_LANGUAGE,
     CONF_LATITUDE,
     CONF_LONGITUDE,
+    CONF_NAME,
     CONF_TIME_ZONE,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
 
@@ -55,6 +59,49 @@ async def test_step_user(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
     assert entries[0].data[CONF_TIME_ZONE] == hass.config.time_zone
 
 
+@pytest.mark.parametrize("diaspora", [True, False])
+@pytest.mark.parametrize("language", ["hebrew", "english"])
+async def test_import_no_options(hass: HomeAssistant, language, diaspora) -> None:
+    """Test that the import step works."""
+    conf = {
+        DOMAIN: {CONF_NAME: "test", CONF_LANGUAGE: language, CONF_DIASPORA: diaspora}
+    }
+
+    assert await async_setup_component(hass, DOMAIN, conf.copy())
+    await hass.async_block_till_done()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    for entry_key, entry_val in entries[0].data.items():
+        assert entry_val == conf[DOMAIN][entry_key]
+
+
+async def test_import_with_options(hass: HomeAssistant) -> None:
+    """Test that the import step works."""
+    conf = {
+        DOMAIN: {
+            CONF_NAME: "test",
+            CONF_DIASPORA: DEFAULT_DIASPORA,
+            CONF_LANGUAGE: DEFAULT_LANGUAGE,
+            CONF_CANDLE_LIGHT_MINUTES: 20,
+            CONF_HAVDALAH_OFFSET_MINUTES: 50,
+            CONF_LATITUDE: 31.76,
+            CONF_LONGITUDE: 35.235,
+        }
+    }
+
+    # Simulate HomeAssistant setting up the component
+    assert await async_setup_component(hass, DOMAIN, conf.copy())
+    await hass.async_block_till_done()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    for entry_key, entry_val in entries[0].data.items():
+        assert entry_val == conf[DOMAIN][entry_key]
+    for entry_key, entry_val in entries[0].options.items():
+        assert entry_val == conf[DOMAIN][entry_key]
+
+
 async def test_single_instance_allowed(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -119,6 +166,10 @@ async def test_options_reconfigure(
     )
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.jewish_calendar.config.abort.reconfigure_successful"],
+)
 async def test_reconfigure(
     hass: HomeAssistant, mock_config_entry: MockConfigEntry
 ) -> None:
diff --git a/tests/components/jewish_calendar/test_init.py b/tests/components/jewish_calendar/test_init.py
index cb982afec0f..b8454b41a60 100644
--- a/tests/components/jewish_calendar/test_init.py
+++ b/tests/components/jewish_calendar/test_init.py
@@ -1 +1,76 @@
 """Tests for the Jewish Calendar component's init."""
+
+from hdate import Location
+
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSORS
+from homeassistant.components.jewish_calendar import get_unique_prefix
+from homeassistant.components.jewish_calendar.const import (
+    CONF_CANDLE_LIGHT_MINUTES,
+    CONF_DIASPORA,
+    CONF_HAVDALAH_OFFSET_MINUTES,
+    DEFAULT_DIASPORA,
+    DEFAULT_LANGUAGE,
+    DOMAIN,
+)
+from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
+from homeassistant.core import HomeAssistant
+import homeassistant.helpers.entity_registry as er
+from homeassistant.setup import async_setup_component
+
+
+async def test_import_unique_id_migration(hass: HomeAssistant) -> None:
+    """Test unique_id migration."""
+    yaml_conf = {
+        DOMAIN: {
+            CONF_NAME: "test",
+            CONF_DIASPORA: DEFAULT_DIASPORA,
+            CONF_LANGUAGE: DEFAULT_LANGUAGE,
+            CONF_CANDLE_LIGHT_MINUTES: 20,
+            CONF_HAVDALAH_OFFSET_MINUTES: 50,
+            CONF_LATITUDE: 31.76,
+            CONF_LONGITUDE: 35.235,
+        }
+    }
+
+    # Create an entry in the entity registry with the data from conf
+    ent_reg = er.async_get(hass)
+    location = Location(
+        latitude=yaml_conf[DOMAIN][CONF_LATITUDE],
+        longitude=yaml_conf[DOMAIN][CONF_LONGITUDE],
+        timezone=hass.config.time_zone,
+        diaspora=DEFAULT_DIASPORA,
+    )
+    old_prefix = get_unique_prefix(location, DEFAULT_LANGUAGE, 20, 50)
+    sample_entity = ent_reg.async_get_or_create(
+        BINARY_SENSORS,
+        DOMAIN,
+        unique_id=f"{old_prefix}_erev_shabbat_hag",
+        suggested_object_id=f"{DOMAIN}_erev_shabbat_hag",
+    )
+    # Save the existing unique_id, DEFAULT_LANGUAGE should be part of it
+    old_unique_id = sample_entity.unique_id
+    assert DEFAULT_LANGUAGE in old_unique_id
+
+    # Simulate HomeAssistant setting up the component
+    assert await async_setup_component(hass, DOMAIN, yaml_conf.copy())
+    await hass.async_block_till_done()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    for entry_key, entry_val in entries[0].data.items():
+        assert entry_val == yaml_conf[DOMAIN][entry_key]
+    for entry_key, entry_val in entries[0].options.items():
+        assert entry_val == yaml_conf[DOMAIN][entry_key]
+
+    # Assert that the unique_id was updated
+    new_unique_id = ent_reg.async_get(sample_entity.entity_id).unique_id
+    assert new_unique_id != old_unique_id
+    assert DEFAULT_LANGUAGE not in new_unique_id
+
+    # Confirm that when the component is reloaded, the unique_id is not changed
+    assert ent_reg.async_get(sample_entity.entity_id).unique_id == new_unique_id
+
+    # Confirm that all the unique_ids are prefixed correctly
+    await hass.config_entries.async_reload(entries[0].entry_id)
+    er_entries = er.async_entries_for_config_entry(ent_reg, entries[0].entry_id)
+    assert all(entry.unique_id.startswith(entries[0].entry_id) for entry in er_entries)
diff --git a/tests/components/konnected/test_init.py b/tests/components/konnected/test_init.py
index 6fc6b10ff20..1a2da88624d 100644
--- a/tests/components/konnected/test_init.py
+++ b/tests/components/konnected/test_init.py
@@ -7,8 +7,8 @@ import pytest
 
 from homeassistant.components import konnected
 from homeassistant.components.konnected import config_flow
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/lamarzocco/__init__.py b/tests/components/lamarzocco/__init__.py
index f6ca0fe40df..4d274d10baa 100644
--- a/tests/components/lamarzocco/__init__.py
+++ b/tests/components/lamarzocco/__init__.py
@@ -1,6 +1,6 @@
 """Mock inputs for tests."""
 
-from pylamarzocco.const import MachineModel
+from lmcloud.const import MachineModel
 
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
@@ -19,10 +19,10 @@ PASSWORD_SELECTION = {
 USER_INPUT = PASSWORD_SELECTION | {CONF_USERNAME: "username"}
 
 SERIAL_DICT = {
-    MachineModel.GS3_AV: "GS012345",
-    MachineModel.GS3_MP: "GS012345",
-    MachineModel.LINEA_MICRA: "MR012345",
-    MachineModel.LINEA_MINI: "LM012345",
+    MachineModel.GS3_AV: "GS01234",
+    MachineModel.GS3_MP: "GS01234",
+    MachineModel.LINEA_MICRA: "MR01234",
+    MachineModel.LINEA_MINI: "LM01234",
 }
 
 WAKE_UP_SLEEP_ENTRY_IDS = ["Os2OswX", "aXFz5bJ"]
diff --git a/tests/components/lamarzocco/conftest.py b/tests/components/lamarzocco/conftest.py
index 210dd9406cc..2520433e86a 100644
--- a/tests/components/lamarzocco/conftest.py
+++ b/tests/components/lamarzocco/conftest.py
@@ -5,9 +5,9 @@ import json
 from unittest.mock import MagicMock, patch
 
 from bleak.backends.device import BLEDevice
-from pylamarzocco.const import FirmwareType, MachineModel, SteamLevel
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoDeviceInfo
+from lmcloud.const import FirmwareType, MachineModel, SteamLevel
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoDeviceInfo
 import pytest
 
 from homeassistant.components.lamarzocco.const import DOMAIN
@@ -75,11 +75,11 @@ def device_fixture() -> MachineModel:
 
 
 @pytest.fixture
-def mock_device_info(device_fixture: MachineModel) -> LaMarzoccoDeviceInfo:
+def mock_device_info() -> LaMarzoccoDeviceInfo:
     """Return a mocked La Marzocco device info."""
     return LaMarzoccoDeviceInfo(
-        model=device_fixture,
-        serial_number=SERIAL_DICT[device_fixture],
+        model=MachineModel.GS3_AV,
+        serial_number="GS01234",
         name="GS3",
         communication_key="token",
     )
@@ -157,5 +157,5 @@ def mock_bluetooth(enable_bluetooth: None) -> None:
 def mock_ble_device() -> BLEDevice:
     """Return a mock BLE device."""
     return BLEDevice(
-        "00:00:00:00:00:00", "GS_GS012345", details={"path": "path"}, rssi=50
+        "00:00:00:00:00:00", "GS_GS01234", details={"path": "path"}, rssi=50
     )
diff --git a/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr b/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
index cda285a7106..df47ac002e6 100644
--- a/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
+++ b/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
@@ -1,19 +1,19 @@
 # serializer version: 1
-# name: test_binary_sensors[GS012345_backflush_active-binary_sensor]
+# name: test_binary_sensors[GS01234_backflush_active-binary_sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'running',
-      'friendly_name': 'GS012345 Backflush active',
+      'friendly_name': 'GS01234 Backflush active',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.gs012345_backflush_active',
+    'entity_id': 'binary_sensor.gs01234_backflush_active',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_binary_sensors[GS012345_backflush_active-entry]
+# name: test_binary_sensors[GS01234_backflush_active-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -25,7 +25,7 @@
     'disabled_by': None,
     'domain': 'binary_sensor',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'binary_sensor.gs012345_backflush_active',
+    'entity_id': 'binary_sensor.gs01234_backflush_active',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -42,25 +42,25 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'backflush_enabled',
-    'unique_id': 'GS012345_backflush_enabled',
+    'unique_id': 'GS01234_backflush_enabled',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_binary_sensors[GS012345_brewing_active-binary_sensor]
+# name: test_binary_sensors[GS01234_brewing_active-binary_sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'running',
-      'friendly_name': 'GS012345 Brewing active',
+      'friendly_name': 'GS01234 Brewing active',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.gs012345_brewing_active',
+    'entity_id': 'binary_sensor.gs01234_brewing_active',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_binary_sensors[GS012345_brewing_active-entry]
+# name: test_binary_sensors[GS01234_brewing_active-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -72,7 +72,7 @@
     'disabled_by': None,
     'domain': 'binary_sensor',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'binary_sensor.gs012345_brewing_active',
+    'entity_id': 'binary_sensor.gs01234_brewing_active',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -89,25 +89,25 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'brew_active',
-    'unique_id': 'GS012345_brew_active',
+    'unique_id': 'GS01234_brew_active',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_binary_sensors[GS012345_water_tank_empty-binary_sensor]
+# name: test_binary_sensors[GS01234_water_tank_empty-binary_sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'problem',
-      'friendly_name': 'GS012345 Water tank empty',
+      'friendly_name': 'GS01234 Water tank empty',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.gs012345_water_tank_empty',
+    'entity_id': 'binary_sensor.gs01234_water_tank_empty',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_binary_sensors[GS012345_water_tank_empty-entry]
+# name: test_binary_sensors[GS01234_water_tank_empty-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -119,7 +119,7 @@
     'disabled_by': None,
     'domain': 'binary_sensor',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'binary_sensor.gs012345_water_tank_empty',
+    'entity_id': 'binary_sensor.gs01234_water_tank_empty',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -136,7 +136,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'water_tank',
-    'unique_id': 'GS012345_water_tank',
+    'unique_id': 'GS01234_water_tank',
     'unit_of_measurement': None,
   })
 # ---
diff --git a/tests/components/lamarzocco/snapshots/test_button.ambr b/tests/components/lamarzocco/snapshots/test_button.ambr
index 64d47a11072..023039cc6f7 100644
--- a/tests/components/lamarzocco/snapshots/test_button.ambr
+++ b/tests/components/lamarzocco/snapshots/test_button.ambr
@@ -2,10 +2,10 @@
 # name: test_start_backflush
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Start backflush',
+      'friendly_name': 'GS01234 Start backflush',
     }),
     'context': <ANY>,
-    'entity_id': 'button.gs012345_start_backflush',
+    'entity_id': 'button.gs01234_start_backflush',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -24,7 +24,7 @@
     'disabled_by': None,
     'domain': 'button',
     'entity_category': None,
-    'entity_id': 'button.gs012345_start_backflush',
+    'entity_id': 'button.gs01234_start_backflush',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -41,7 +41,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'start_backflush',
-    'unique_id': 'GS012345_start_backflush',
+    'unique_id': 'GS01234_start_backflush',
     'unit_of_measurement': None,
   })
 # ---
diff --git a/tests/components/lamarzocco/snapshots/test_calendar.ambr b/tests/components/lamarzocco/snapshots/test_calendar.ambr
index 729eed5879a..2fd5dab846a 100644
--- a/tests/components/lamarzocco/snapshots/test_calendar.ambr
+++ b/tests/components/lamarzocco/snapshots/test_calendar.ambr
@@ -1,7 +1,7 @@
 # serializer version: 1
 # name: test_calendar_edge_cases[start_date0-end_date0]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+    'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
       'events': list([
         dict({
           'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -15,7 +15,7 @@
 # ---
 # name: test_calendar_edge_cases[start_date1-end_date1]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+    'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
       'events': list([
         dict({
           'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -29,7 +29,7 @@
 # ---
 # name: test_calendar_edge_cases[start_date2-end_date2]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+    'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
       'events': list([
         dict({
           'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -43,7 +43,7 @@
 # ---
 # name: test_calendar_edge_cases[start_date3-end_date3]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+    'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
       'events': list([
         dict({
           'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -57,7 +57,7 @@
 # ---
 # name: test_calendar_edge_cases[start_date4-end_date4]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+    'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
       'events': list([
       ]),
     }),
@@ -65,7 +65,7 @@
 # ---
 # name: test_calendar_edge_cases[start_date5-end_date5]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+    'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
       'events': list([
         dict({
           'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -83,7 +83,7 @@
     }),
   })
 # ---
-# name: test_calendar_events[entry.GS012345_auto_on_off_schedule_axfz5bj]
+# name: test_calendar_events[entry.GS01234_auto_on_off_schedule_axfz5bj]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -95,7 +95,7 @@
     'disabled_by': None,
     'domain': 'calendar',
     'entity_category': None,
-    'entity_id': 'calendar.gs012345_auto_on_off_schedule_axfz5bj',
+    'entity_id': 'calendar.gs01234_auto_on_off_schedule_axfz5bj',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -112,11 +112,11 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'auto_on_off_schedule',
-    'unique_id': 'GS012345_auto_on_off_schedule_aXFz5bJ',
+    'unique_id': 'GS01234_auto_on_off_schedule_aXFz5bJ',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_calendar_events[entry.GS012345_auto_on_off_schedule_os2oswx]
+# name: test_calendar_events[entry.GS01234_auto_on_off_schedule_os2oswx]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -128,7 +128,7 @@
     'disabled_by': None,
     'domain': 'calendar',
     'entity_category': None,
-    'entity_id': 'calendar.gs012345_auto_on_off_schedule_os2oswx',
+    'entity_id': 'calendar.gs01234_auto_on_off_schedule_os2oswx',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -145,13 +145,13 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'auto_on_off_schedule',
-    'unique_id': 'GS012345_auto_on_off_schedule_Os2OswX',
+    'unique_id': 'GS01234_auto_on_off_schedule_Os2OswX',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_calendar_events[events.GS012345_auto_on_off_schedule_axfz5bj]
+# name: test_calendar_events[events.GS01234_auto_on_off_schedule_axfz5bj]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+    'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
       'events': list([
         dict({
           'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -181,9 +181,9 @@
     }),
   })
 # ---
-# name: test_calendar_events[events.GS012345_auto_on_off_schedule_os2oswx]
+# name: test_calendar_events[events.GS01234_auto_on_off_schedule_os2oswx]
   dict({
-    'calendar.gs012345_auto_on_off_schedule_os2oswx': dict({
+    'calendar.gs01234_auto_on_off_schedule_os2oswx': dict({
       'events': list([
         dict({
           'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -327,38 +327,38 @@
     }),
   })
 # ---
-# name: test_calendar_events[state.GS012345_auto_on_off_schedule_axfz5bj]
+# name: test_calendar_events[state.GS01234_auto_on_off_schedule_axfz5bj]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'all_day': False,
       'description': 'Machine is scheduled to turn on at the start time and off at the end time',
       'end_time': '2024-01-14 07:30:00',
-      'friendly_name': 'GS012345 Auto on/off schedule (aXFz5bJ)',
+      'friendly_name': 'GS01234 Auto on/off schedule (aXFz5bJ)',
       'location': '',
       'message': 'Machine My LaMarzocco on',
       'start_time': '2024-01-14 07:00:00',
     }),
     'context': <ANY>,
-    'entity_id': 'calendar.gs012345_auto_on_off_schedule_axfz5bj',
+    'entity_id': 'calendar.gs01234_auto_on_off_schedule_axfz5bj',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_calendar_events[state.GS012345_auto_on_off_schedule_os2oswx]
+# name: test_calendar_events[state.GS01234_auto_on_off_schedule_os2oswx]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'all_day': False,
       'description': 'Machine is scheduled to turn on at the start time and off at the end time',
       'end_time': '2024-01-13 00:00:00',
-      'friendly_name': 'GS012345 Auto on/off schedule (Os2OswX)',
+      'friendly_name': 'GS01234 Auto on/off schedule (Os2OswX)',
       'location': '',
       'message': 'Machine My LaMarzocco on',
       'start_time': '2024-01-12 22:00:00',
     }),
     'context': <ANY>,
-    'entity_id': 'calendar.gs012345_auto_on_off_schedule_os2oswx',
+    'entity_id': 'calendar.gs01234_auto_on_off_schedule_os2oswx',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -367,7 +367,7 @@
 # ---
 # name: test_no_calendar_events_global_disable
   dict({
-    'calendar.gs012345_auto_on_off_schedule_os2oswx': dict({
+    'calendar.gs01234_auto_on_off_schedule_os2oswx': dict({
       'events': list([
       ]),
     }),
diff --git a/tests/components/lamarzocco/snapshots/test_number.ambr b/tests/components/lamarzocco/snapshots/test_number.ambr
index b7e42bb425f..8265e7d7646 100644
--- a/tests/components/lamarzocco/snapshots/test_number.ambr
+++ b/tests/components/lamarzocco/snapshots/test_number.ambr
@@ -1,9 +1,9 @@
 # serializer version: 1
-# name: test_general_numbers[coffee_target_temperature-94-set_temp-kwargs0]
+# name: test_coffee_boiler
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'GS012345 Coffee target temperature',
+      'friendly_name': 'GS01234 Coffee target temperature',
       'max': 104,
       'min': 85,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -11,14 +11,14 @@
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_coffee_target_temperature',
+    'entity_id': 'number.gs01234_coffee_target_temperature',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '95',
   })
 # ---
-# name: test_general_numbers[coffee_target_temperature-94-set_temp-kwargs0].1
+# name: test_coffee_boiler.1
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -35,7 +35,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': None,
-    'entity_id': 'number.gs012345_coffee_target_temperature',
+    'entity_id': 'number.gs01234_coffee_target_temperature',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -52,72 +52,15 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'coffee_temp',
-    'unique_id': 'GS012345_coffee_temp',
+    'unique_id': 'GS01234_coffee_temp',
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
-# name: test_general_numbers[smart_standby_time-23-set_smart_standby-kwargs1]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'duration',
-      'friendly_name': 'GS012345 Smart standby time',
-      'max': 240,
-      'min': 10,
-      'mode': <NumberMode.AUTO: 'auto'>,
-      'step': 10,
-      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'number.gs012345_smart_standby_time',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '10',
-  })
-# ---
-# name: test_general_numbers[smart_standby_time-23-set_smart_standby-kwargs1].1
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'max': 240,
-      'min': 10,
-      'mode': <NumberMode.AUTO: 'auto'>,
-      'step': 10,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'number',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.gs012345_smart_standby_time',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <NumberDeviceClass.DURATION: 'duration'>,
-    'original_icon': None,
-    'original_name': 'Smart standby time',
-    'platform': 'lamarzocco',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'smart_standby_time',
-    'unique_id': 'GS012345_smart_standby_time',
-    'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
-  })
-# ---
 # name: test_gs3_exclusive[steam_target_temperature-131-set_temp-kwargs0-GS3 AV]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'GS012345 Steam target temperature',
+      'friendly_name': 'GS01234 Steam target temperature',
       'max': 131,
       'min': 126,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -125,7 +68,7 @@
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_steam_target_temperature',
+    'entity_id': 'number.gs01234_steam_target_temperature',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -149,7 +92,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': None,
-    'entity_id': 'number.gs012345_steam_target_temperature',
+    'entity_id': 'number.gs01234_steam_target_temperature',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -166,7 +109,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'steam_temp',
-    'unique_id': 'GS012345_steam_temp',
+    'unique_id': 'GS01234_steam_temp',
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
@@ -174,7 +117,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'GS012345 Steam target temperature',
+      'friendly_name': 'GS01234 Steam target temperature',
       'max': 131,
       'min': 126,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -182,7 +125,7 @@
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_steam_target_temperature',
+    'entity_id': 'number.gs01234_steam_target_temperature',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -206,7 +149,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': None,
-    'entity_id': 'number.gs012345_steam_target_temperature',
+    'entity_id': 'number.gs01234_steam_target_temperature',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -223,7 +166,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'steam_temp',
-    'unique_id': 'GS012345_steam_temp',
+    'unique_id': 'GS01234_steam_temp',
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
@@ -231,7 +174,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Tea water duration',
+      'friendly_name': 'GS01234 Tea water duration',
       'max': 30,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -239,7 +182,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_tea_water_duration',
+    'entity_id': 'number.gs01234_tea_water_duration',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -263,7 +206,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': None,
-    'entity_id': 'number.gs012345_tea_water_duration',
+    'entity_id': 'number.gs01234_tea_water_duration',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -280,7 +223,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'tea_water_duration',
-    'unique_id': 'GS012345_tea_water_duration',
+    'unique_id': 'GS01234_tea_water_duration',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
@@ -288,7 +231,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Tea water duration',
+      'friendly_name': 'GS01234 Tea water duration',
       'max': 30,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -296,7 +239,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_tea_water_duration',
+    'entity_id': 'number.gs01234_tea_water_duration',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -320,7 +263,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': None,
-    'entity_id': 'number.gs012345_tea_water_duration',
+    'entity_id': 'number.gs01234_tea_water_duration',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -337,14 +280,14 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'tea_water_duration',
-    'unique_id': 'GS012345_tea_water_duration',
+    'unique_id': 'GS01234_tea_water_duration',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS012345_dose_key_1-state]
+# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS01234_dose_key_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Dose Key 1',
+      'friendly_name': 'GS01234 Dose Key 1',
       'max': 999,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -352,17 +295,17 @@
       'unit_of_measurement': 'ticks',
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_dose_key_1',
+    'entity_id': 'number.gs01234_dose_key_1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '135',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS012345_dose_key_2-state]
+# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS01234_dose_key_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Dose Key 2',
+      'friendly_name': 'GS01234 Dose Key 2',
       'max': 999,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -370,17 +313,17 @@
       'unit_of_measurement': 'ticks',
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_dose_key_2',
+    'entity_id': 'number.gs01234_dose_key_2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '97',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS012345_dose_key_3-state]
+# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS01234_dose_key_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Dose Key 3',
+      'friendly_name': 'GS01234 Dose Key 3',
       'max': 999,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -388,17 +331,17 @@
       'unit_of_measurement': 'ticks',
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_dose_key_3',
+    'entity_id': 'number.gs01234_dose_key_3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '108',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS012345_dose_key_4-state]
+# name: test_pre_brew_infusion_key_numbers[dose-6-Disabled-set_dose-kwargs3-GS3 AV][GS01234_dose_key_4-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Dose Key 4',
+      'friendly_name': 'GS01234 Dose Key 4',
       'max': 999,
       'min': 0,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -406,18 +349,18 @@
       'unit_of_measurement': 'ticks',
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_dose_key_4',
+    'entity_id': 'number.gs01234_dose_key_4',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '121',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_1-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS01234_prebrew_off_time_key_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew off time Key 1',
+      'friendly_name': 'GS01234 Prebrew off time Key 1',
       'max': 10,
       'min': 1,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -425,18 +368,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_off_time_key_1',
+    'entity_id': 'number.gs01234_prebrew_off_time_key_1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_2-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS01234_prebrew_off_time_key_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew off time Key 2',
+      'friendly_name': 'GS01234 Prebrew off time Key 2',
       'max': 10,
       'min': 1,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -444,18 +387,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_off_time_key_2',
+    'entity_id': 'number.gs01234_prebrew_off_time_key_2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_3-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS01234_prebrew_off_time_key_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew off time Key 3',
+      'friendly_name': 'GS01234 Prebrew off time Key 3',
       'max': 10,
       'min': 1,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -463,18 +406,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_off_time_key_3',
+    'entity_id': 'number.gs01234_prebrew_off_time_key_3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '3.29999995231628',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS012345_prebrew_off_time_key_4-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_off_time-6-Enabled-set_prebrew_time-kwargs0-GS3 AV][GS01234_prebrew_off_time_key_4-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew off time Key 4',
+      'friendly_name': 'GS01234 Prebrew off time Key 4',
       'max': 10,
       'min': 1,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -482,18 +425,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_off_time_key_4',
+    'entity_id': 'number.gs01234_prebrew_off_time_key_4',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '2',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_1-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS01234_prebrew_on_time_key_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew on time Key 1',
+      'friendly_name': 'GS01234 Prebrew on time Key 1',
       'max': 10,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -501,18 +444,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_on_time_key_1',
+    'entity_id': 'number.gs01234_prebrew_on_time_key_1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_2-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS01234_prebrew_on_time_key_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew on time Key 2',
+      'friendly_name': 'GS01234 Prebrew on time Key 2',
       'max': 10,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -520,18 +463,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_on_time_key_2',
+    'entity_id': 'number.gs01234_prebrew_on_time_key_2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_3-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS01234_prebrew_on_time_key_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew on time Key 3',
+      'friendly_name': 'GS01234 Prebrew on time Key 3',
       'max': 10,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -539,18 +482,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_on_time_key_3',
+    'entity_id': 'number.gs01234_prebrew_on_time_key_3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '3.29999995231628',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS012345_prebrew_on_time_key_4-state]
+# name: test_pre_brew_infusion_key_numbers[prebrew_on_time-6-Enabled-set_prebrew_time-kwargs1-GS3 AV][GS01234_prebrew_on_time_key_4-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Prebrew on time Key 4',
+      'friendly_name': 'GS01234 Prebrew on time Key 4',
       'max': 10,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -558,18 +501,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_prebrew_on_time_key_4',
+    'entity_id': 'number.gs01234_prebrew_on_time_key_4',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '2',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS012345_preinfusion_time_key_1-state]
+# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS01234_preinfusion_time_key_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Preinfusion time Key 1',
+      'friendly_name': 'GS01234 Preinfusion time Key 1',
       'max': 29,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -577,18 +520,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_preinfusion_time_key_1',
+    'entity_id': 'number.gs01234_preinfusion_time_key_1',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS012345_preinfusion_time_key_2-state]
+# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS01234_preinfusion_time_key_2-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Preinfusion time Key 2',
+      'friendly_name': 'GS01234 Preinfusion time Key 2',
       'max': 29,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -596,18 +539,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_preinfusion_time_key_2',
+    'entity_id': 'number.gs01234_preinfusion_time_key_2',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS012345_preinfusion_time_key_3-state]
+# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS01234_preinfusion_time_key_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Preinfusion time Key 3',
+      'friendly_name': 'GS01234 Preinfusion time Key 3',
       'max': 29,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -615,18 +558,18 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_preinfusion_time_key_3',
+    'entity_id': 'number.gs01234_preinfusion_time_key_3',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '3.29999995231628',
   })
 # ---
-# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS012345_preinfusion_time_key_4-state]
+# name: test_pre_brew_infusion_key_numbers[preinfusion_time-7-TypeB-set_preinfusion_time-kwargs2-GS3 AV][GS01234_preinfusion_time_key_4-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Preinfusion time Key 4',
+      'friendly_name': 'GS01234 Preinfusion time Key 4',
       'max': 29,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -634,7 +577,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.gs012345_preinfusion_time_key_4',
+    'entity_id': 'number.gs01234_preinfusion_time_key_4',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -645,7 +588,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'LM012345 Prebrew off time',
+      'friendly_name': 'LM01234 Prebrew off time',
       'max': 10,
       'min': 1,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -653,7 +596,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.lm012345_prebrew_off_time',
+    'entity_id': 'number.lm01234_prebrew_off_time',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -677,7 +620,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.lm012345_prebrew_off_time',
+    'entity_id': 'number.lm01234_prebrew_off_time',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -694,7 +637,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'prebrew_off',
-    'unique_id': 'LM012345_prebrew_off',
+    'unique_id': 'LM01234_prebrew_off',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
@@ -702,7 +645,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'MR012345 Prebrew off time',
+      'friendly_name': 'MR01234 Prebrew off time',
       'max': 10,
       'min': 1,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -710,7 +653,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.mr012345_prebrew_off_time',
+    'entity_id': 'number.mr01234_prebrew_off_time',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -734,7 +677,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.mr012345_prebrew_off_time',
+    'entity_id': 'number.mr01234_prebrew_off_time',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -751,7 +694,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'prebrew_off',
-    'unique_id': 'MR012345_prebrew_off',
+    'unique_id': 'MR01234_prebrew_off',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
@@ -759,7 +702,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'LM012345 Prebrew on time',
+      'friendly_name': 'LM01234 Prebrew on time',
       'max': 10,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -767,7 +710,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.lm012345_prebrew_on_time',
+    'entity_id': 'number.lm01234_prebrew_on_time',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -791,7 +734,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.lm012345_prebrew_on_time',
+    'entity_id': 'number.lm01234_prebrew_on_time',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -808,7 +751,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'prebrew_on',
-    'unique_id': 'LM012345_prebrew_on',
+    'unique_id': 'LM01234_prebrew_on',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
@@ -816,7 +759,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'MR012345 Prebrew on time',
+      'friendly_name': 'MR01234 Prebrew on time',
       'max': 10,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -824,7 +767,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.mr012345_prebrew_on_time',
+    'entity_id': 'number.mr01234_prebrew_on_time',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -848,7 +791,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.mr012345_prebrew_on_time',
+    'entity_id': 'number.mr01234_prebrew_on_time',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -865,7 +808,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'prebrew_on',
-    'unique_id': 'MR012345_prebrew_on',
+    'unique_id': 'MR01234_prebrew_on',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
@@ -873,7 +816,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'LM012345 Preinfusion time',
+      'friendly_name': 'LM01234 Preinfusion time',
       'max': 29,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -881,7 +824,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.lm012345_preinfusion_time',
+    'entity_id': 'number.lm01234_preinfusion_time',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -905,7 +848,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.lm012345_preinfusion_time',
+    'entity_id': 'number.lm01234_preinfusion_time',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -922,7 +865,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'preinfusion_off',
-    'unique_id': 'LM012345_preinfusion_off',
+    'unique_id': 'LM01234_preinfusion_off',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
@@ -930,7 +873,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'MR012345 Preinfusion time',
+      'friendly_name': 'MR01234 Preinfusion time',
       'max': 29,
       'min': 2,
       'mode': <NumberMode.AUTO: 'auto'>,
@@ -938,7 +881,7 @@
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'number.mr012345_preinfusion_time',
+    'entity_id': 'number.mr01234_preinfusion_time',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -962,7 +905,7 @@
     'disabled_by': None,
     'domain': 'number',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'number.mr012345_preinfusion_time',
+    'entity_id': 'number.mr01234_preinfusion_time',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -979,7 +922,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'preinfusion_off',
-    'unique_id': 'MR012345_preinfusion_off',
+    'unique_id': 'MR01234_preinfusion_off',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
diff --git a/tests/components/lamarzocco/snapshots/test_select.ambr b/tests/components/lamarzocco/snapshots/test_select.ambr
index 46fa55eff13..be56af2b092 100644
--- a/tests/components/lamarzocco/snapshots/test_select.ambr
+++ b/tests/components/lamarzocco/snapshots/test_select.ambr
@@ -2,7 +2,7 @@
 # name: test_pre_brew_infusion_select[GS3 AV]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Prebrew/-infusion mode',
+      'friendly_name': 'GS01234 Prebrew/-infusion mode',
       'options': list([
         'disabled',
         'prebrew',
@@ -10,7 +10,7 @@
       ]),
     }),
     'context': <ANY>,
-    'entity_id': 'select.gs012345_prebrew_infusion_mode',
+    'entity_id': 'select.gs01234_prebrew_infusion_mode',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -35,7 +35,7 @@
     'disabled_by': None,
     'domain': 'select',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'select.gs012345_prebrew_infusion_mode',
+    'entity_id': 'select.gs01234_prebrew_infusion_mode',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -52,14 +52,14 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'prebrew_infusion_select',
-    'unique_id': 'GS012345_prebrew_infusion_select',
+    'unique_id': 'GS01234_prebrew_infusion_select',
     'unit_of_measurement': None,
   })
 # ---
 # name: test_pre_brew_infusion_select[Linea Mini]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'LM012345 Prebrew/-infusion mode',
+      'friendly_name': 'LM01234 Prebrew/-infusion mode',
       'options': list([
         'disabled',
         'prebrew',
@@ -67,7 +67,7 @@
       ]),
     }),
     'context': <ANY>,
-    'entity_id': 'select.lm012345_prebrew_infusion_mode',
+    'entity_id': 'select.lm01234_prebrew_infusion_mode',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -92,7 +92,7 @@
     'disabled_by': None,
     'domain': 'select',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'select.lm012345_prebrew_infusion_mode',
+    'entity_id': 'select.lm01234_prebrew_infusion_mode',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -109,14 +109,14 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'prebrew_infusion_select',
-    'unique_id': 'LM012345_prebrew_infusion_select',
+    'unique_id': 'LM01234_prebrew_infusion_select',
     'unit_of_measurement': None,
   })
 # ---
 # name: test_pre_brew_infusion_select[Micra]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'MR012345 Prebrew/-infusion mode',
+      'friendly_name': 'MR01234 Prebrew/-infusion mode',
       'options': list([
         'disabled',
         'prebrew',
@@ -124,7 +124,7 @@
       ]),
     }),
     'context': <ANY>,
-    'entity_id': 'select.mr012345_prebrew_infusion_mode',
+    'entity_id': 'select.mr01234_prebrew_infusion_mode',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -149,7 +149,7 @@
     'disabled_by': None,
     'domain': 'select',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'select.mr012345_prebrew_infusion_mode',
+    'entity_id': 'select.mr01234_prebrew_infusion_mode',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -166,69 +166,14 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'prebrew_infusion_select',
-    'unique_id': 'MR012345_prebrew_infusion_select',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_smart_standby_mode
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Smart standby mode',
-      'options': list([
-        'power_on',
-        'last_brewing',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'select.gs012345_smart_standby_mode',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'last_brewing',
-  })
-# ---
-# name: test_smart_standby_mode.1
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        'power_on',
-        'last_brewing',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'select',
-    'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'select.gs012345_smart_standby_mode',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Smart standby mode',
-    'platform': 'lamarzocco',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'smart_standby_mode',
-    'unique_id': 'GS012345_smart_standby_mode',
+    'unique_id': 'MR01234_prebrew_infusion_select',
     'unit_of_measurement': None,
   })
 # ---
 # name: test_steam_boiler_level[Micra]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'MR012345 Steam level',
+      'friendly_name': 'MR01234 Steam level',
       'options': list([
         '1',
         '2',
@@ -236,7 +181,7 @@
       ]),
     }),
     'context': <ANY>,
-    'entity_id': 'select.mr012345_steam_level',
+    'entity_id': 'select.mr01234_steam_level',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -261,7 +206,7 @@
     'disabled_by': None,
     'domain': 'select',
     'entity_category': None,
-    'entity_id': 'select.mr012345_steam_level',
+    'entity_id': 'select.mr01234_steam_level',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -278,7 +223,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'steam_temp_select',
-    'unique_id': 'MR012345_steam_temp_select',
+    'unique_id': 'MR01234_steam_temp_select',
     'unit_of_measurement': None,
   })
 # ---
diff --git a/tests/components/lamarzocco/snapshots/test_sensor.ambr b/tests/components/lamarzocco/snapshots/test_sensor.ambr
index da1efbf1eaa..2237a8416e1 100644
--- a/tests/components/lamarzocco/snapshots/test_sensor.ambr
+++ b/tests/components/lamarzocco/snapshots/test_sensor.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_sensors[GS012345_current_coffee_temperature-entry]
+# name: test_sensors[GS01234_current_coffee_temperature-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -13,7 +13,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.gs012345_current_coffee_temperature',
+    'entity_id': 'sensor.gs01234_current_coffee_temperature',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -33,27 +33,27 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'current_temp_coffee',
-    'unique_id': 'GS012345_current_temp_coffee',
+    'unique_id': 'GS01234_current_temp_coffee',
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
-# name: test_sensors[GS012345_current_coffee_temperature-sensor]
+# name: test_sensors[GS01234_current_coffee_temperature-sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'GS012345 Current coffee temperature',
+      'friendly_name': 'GS01234 Current coffee temperature',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.gs012345_current_coffee_temperature',
+    'entity_id': 'sensor.gs01234_current_coffee_temperature',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '96.5',
   })
 # ---
-# name: test_sensors[GS012345_current_steam_temperature-entry]
+# name: test_sensors[GS01234_current_steam_temperature-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -67,7 +67,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': None,
-    'entity_id': 'sensor.gs012345_current_steam_temperature',
+    'entity_id': 'sensor.gs01234_current_steam_temperature',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -87,27 +87,27 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'current_temp_steam',
-    'unique_id': 'GS012345_current_temp_steam',
+    'unique_id': 'GS01234_current_temp_steam',
     'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
   })
 # ---
-# name: test_sensors[GS012345_current_steam_temperature-sensor]
+# name: test_sensors[GS01234_current_steam_temperature-sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'temperature',
-      'friendly_name': 'GS012345 Current steam temperature',
+      'friendly_name': 'GS01234 Current steam temperature',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.gs012345_current_steam_temperature',
+    'entity_id': 'sensor.gs01234_current_steam_temperature',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '123.800003051758',
   })
 # ---
-# name: test_sensors[GS012345_shot_timer-entry]
+# name: test_sensors[GS01234_shot_timer-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -121,7 +121,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.gs012345_shot_timer',
+    'entity_id': 'sensor.gs01234_shot_timer',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -138,27 +138,27 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'shot_timer',
-    'unique_id': 'GS012345_shot_timer',
+    'unique_id': 'GS01234_shot_timer',
     'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
   })
 # ---
-# name: test_sensors[GS012345_shot_timer-sensor]
+# name: test_sensors[GS01234_shot_timer-sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'duration',
-      'friendly_name': 'GS012345 Shot timer',
+      'friendly_name': 'GS01234 Shot timer',
       'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfTime.SECONDS: 's'>,
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.gs012345_shot_timer',
+    'entity_id': 'sensor.gs01234_shot_timer',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '0',
   })
 # ---
-# name: test_sensors[GS012345_total_coffees_made-entry]
+# name: test_sensors[GS01234_total_coffees_made-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -172,7 +172,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.gs012345_total_coffees_made',
+    'entity_id': 'sensor.gs01234_total_coffees_made',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -189,26 +189,26 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'drink_stats_coffee',
-    'unique_id': 'GS012345_drink_stats_coffee',
+    'unique_id': 'GS01234_drink_stats_coffee',
     'unit_of_measurement': 'drinks',
   })
 # ---
-# name: test_sensors[GS012345_total_coffees_made-sensor]
+# name: test_sensors[GS01234_total_coffees_made-sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Total coffees made',
+      'friendly_name': 'GS01234 Total coffees made',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': 'drinks',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.gs012345_total_coffees_made',
+    'entity_id': 'sensor.gs01234_total_coffees_made',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': '1047',
   })
 # ---
-# name: test_sensors[GS012345_total_flushes_made-entry]
+# name: test_sensors[GS01234_total_flushes_made-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -222,7 +222,7 @@
     'disabled_by': None,
     'domain': 'sensor',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.gs012345_total_flushes_made',
+    'entity_id': 'sensor.gs01234_total_flushes_made',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -239,19 +239,19 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'drink_stats_flushing',
-    'unique_id': 'GS012345_drink_stats_flushing',
+    'unique_id': 'GS01234_drink_stats_flushing',
     'unit_of_measurement': 'drinks',
   })
 # ---
-# name: test_sensors[GS012345_total_flushes_made-sensor]
+# name: test_sensors[GS01234_total_flushes_made-sensor]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Total flushes made',
+      'friendly_name': 'GS01234 Total flushes made',
       'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': 'drinks',
     }),
     'context': <ANY>,
-    'entity_id': 'sensor.gs012345_total_flushes_made',
+    'entity_id': 'sensor.gs01234_total_flushes_made',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/lamarzocco/snapshots/test_switch.ambr b/tests/components/lamarzocco/snapshots/test_switch.ambr
index 5e3b99da617..5d020cbee5f 100644
--- a/tests/components/lamarzocco/snapshots/test_switch.ambr
+++ b/tests/components/lamarzocco/snapshots/test_switch.ambr
@@ -11,7 +11,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'switch.gs012345_auto_on_off_os2oswx',
+    'entity_id': 'switch.gs01234_auto_on_off_os2oswx',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -28,7 +28,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'auto_on_off',
-    'unique_id': 'GS012345_auto_on_off_Os2OswX',
+    'unique_id': 'GS01234_auto_on_off_Os2OswX',
     'unit_of_measurement': None,
   })
 # ---
@@ -44,7 +44,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': <EntityCategory.CONFIG: 'config'>,
-    'entity_id': 'switch.gs012345_auto_on_off_axfz5bj',
+    'entity_id': 'switch.gs01234_auto_on_off_axfz5bj',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -61,17 +61,17 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'auto_on_off',
-    'unique_id': 'GS012345_auto_on_off_aXFz5bJ',
+    'unique_id': 'GS01234_auto_on_off_aXFz5bJ',
     'unit_of_measurement': None,
   })
 # ---
 # name: test_auto_on_off_switches[state.auto_on_off_Os2OswX]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Auto on/off (Os2OswX)',
+      'friendly_name': 'GS01234 Auto on/off (Os2OswX)',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.gs012345_auto_on_off_os2oswx',
+    'entity_id': 'switch.gs01234_auto_on_off_os2oswx',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -81,10 +81,10 @@
 # name: test_auto_on_off_switches[state.auto_on_off_aXFz5bJ]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Auto on/off (aXFz5bJ)',
+      'friendly_name': 'GS01234 Auto on/off (aXFz5bJ)',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.gs012345_auto_on_off_axfz5bj',
+    'entity_id': 'switch.gs01234_auto_on_off_axfz5bj',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -105,7 +105,7 @@
     'identifiers': set({
       tuple(
         'lamarzocco',
-        'GS012345',
+        'GS01234',
       ),
     }),
     'is_new': False,
@@ -114,29 +114,29 @@
     'manufacturer': 'La Marzocco',
     'model': <MachineModel.GS3_AV: 'GS3 AV'>,
     'model_id': <MachineModel.GS3_AV: 'GS3 AV'>,
-    'name': 'GS012345',
+    'name': 'GS01234',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
-    'serial_number': 'GS012345',
+    'serial_number': 'GS01234',
     'suggested_area': None,
     'sw_version': '1.40',
     'via_device_id': None,
   })
 # ---
-# name: test_switches[-set_power-kwargs0]
+# name: test_switches[-set_power]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345',
+      'friendly_name': 'GS01234',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.gs012345',
+    'entity_id': 'switch.gs01234',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_switches[-set_power-kwargs0].1
+# name: test_switches[-set_power].1
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -148,7 +148,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.gs012345',
+    'entity_id': 'switch.gs01234',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -165,70 +165,24 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'main',
-    'unique_id': 'GS012345_main',
+    'unique_id': 'GS01234_main',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[_smart_standby_enabled-set_smart_standby-kwargs2]
+# name: test_switches[_steam_boiler-set_steam]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Smart standby enabled',
+      'friendly_name': 'GS01234 Steam boiler',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.gs012345_smart_standby_enabled',
+    'entity_id': 'switch.gs01234_steam_boiler',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_switches[_smart_standby_enabled-set_smart_standby-kwargs2].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.gs012345_smart_standby_enabled',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Smart standby enabled',
-    'platform': 'lamarzocco',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'smart_standby_enabled',
-    'unique_id': 'GS012345_smart_standby_enabled',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_switches[_steam_boiler-set_steam-kwargs1]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'GS012345 Steam boiler',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.gs012345_steam_boiler',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
-# name: test_switches[_steam_boiler-set_steam-kwargs1].1
+# name: test_switches[_steam_boiler-set_steam].1
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -240,7 +194,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.gs012345_steam_boiler',
+    'entity_id': 'switch.gs01234_steam_boiler',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -257,7 +211,7 @@
     'previous_unique_id': None,
     'supported_features': 0,
     'translation_key': 'steam_boiler',
-    'unique_id': 'GS012345_steam_boiler_enable',
+    'unique_id': 'GS01234_steam_boiler_enable',
     'unit_of_measurement': None,
   })
 # ---
diff --git a/tests/components/lamarzocco/snapshots/test_update.ambr b/tests/components/lamarzocco/snapshots/test_update.ambr
index 46fa4cff815..c40677a80ca 100644
--- a/tests/components/lamarzocco/snapshots/test_update.ambr
+++ b/tests/components/lamarzocco/snapshots/test_update.ambr
@@ -4,9 +4,8 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/lamarzocco/icon.png',
-      'friendly_name': 'GS012345 Gateway firmware',
+      'friendly_name': 'GS01234 Gateway firmware',
       'in_progress': False,
       'installed_version': 'v3.1-rc4',
       'latest_version': 'v3.5-rc3',
@@ -18,7 +17,7 @@
       'update_percentage': None,
     }),
     'context': <ANY>,
-    'entity_id': 'update.gs012345_gateway_firmware',
+    'entity_id': 'update.gs01234_gateway_firmware',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -37,7 +36,7 @@
     'disabled_by': None,
     'domain': 'update',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'update.gs012345_gateway_firmware',
+    'entity_id': 'update.gs01234_gateway_firmware',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -54,7 +53,7 @@
     'previous_unique_id': None,
     'supported_features': <UpdateEntityFeature: 1>,
     'translation_key': 'gateway_firmware',
-    'unique_id': 'GS012345_gateway_firmware',
+    'unique_id': 'GS01234_gateway_firmware',
     'unit_of_measurement': None,
   })
 # ---
@@ -63,9 +62,8 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/lamarzocco/icon.png',
-      'friendly_name': 'GS012345 Machine firmware',
+      'friendly_name': 'GS01234 Machine firmware',
       'in_progress': False,
       'installed_version': '1.40',
       'latest_version': '1.55',
@@ -77,7 +75,7 @@
       'update_percentage': None,
     }),
     'context': <ANY>,
-    'entity_id': 'update.gs012345_machine_firmware',
+    'entity_id': 'update.gs01234_machine_firmware',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -96,7 +94,7 @@
     'disabled_by': None,
     'domain': 'update',
     'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'update.gs012345_machine_firmware',
+    'entity_id': 'update.gs01234_machine_firmware',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -113,7 +111,7 @@
     'previous_unique_id': None,
     'supported_features': <UpdateEntityFeature: 1>,
     'translation_key': 'machine_firmware',
-    'unique_id': 'GS012345_machine_firmware',
+    'unique_id': 'GS01234_machine_firmware',
     'unit_of_measurement': None,
   })
 # ---
diff --git a/tests/components/lamarzocco/test_binary_sensor.py b/tests/components/lamarzocco/test_binary_sensor.py
index 956bfe90dd4..120d825c804 100644
--- a/tests/components/lamarzocco/test_binary_sensor.py
+++ b/tests/components/lamarzocco/test_binary_sensor.py
@@ -4,7 +4,7 @@ from datetime import timedelta
 from unittest.mock import MagicMock
 
 from freezegun.api import FrozenDateTimeFactory
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.exceptions import RequestNotSuccessful
 from syrupy import SnapshotAssertion
 
 from homeassistant.const import STATE_UNAVAILABLE
diff --git a/tests/components/lamarzocco/test_button.py b/tests/components/lamarzocco/test_button.py
index 61b7ba77c22..b754688f369 100644
--- a/tests/components/lamarzocco/test_button.py
+++ b/tests/components/lamarzocco/test_button.py
@@ -1,8 +1,8 @@
 """Tests for the La Marzocco Buttons."""
 
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import MagicMock
 
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.exceptions import RequestNotSuccessful
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -33,18 +33,14 @@ async def test_start_backflush(
     assert entry
     assert entry == snapshot
 
-    with patch(
-        "homeassistant.components.lamarzocco.button.asyncio.sleep",
-        new_callable=AsyncMock,
-    ):
-        await hass.services.async_call(
-            BUTTON_DOMAIN,
-            SERVICE_PRESS,
-            {
-                ATTR_ENTITY_ID: f"button.{serial_number}_start_backflush",
-            },
-            blocking=True,
-        )
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {
+            ATTR_ENTITY_ID: f"button.{serial_number}_start_backflush",
+        },
+        blocking=True,
+    )
 
     assert len(mock_lamarzocco.start_backflush.mock_calls) == 1
     mock_lamarzocco.start_backflush.assert_called_once()
diff --git a/tests/components/lamarzocco/test_config_flow.py b/tests/components/lamarzocco/test_config_flow.py
index be93779848f..89e5c968724 100644
--- a/tests/components/lamarzocco/test_config_flow.py
+++ b/tests/components/lamarzocco/test_config_flow.py
@@ -2,20 +2,13 @@
 
 from unittest.mock import MagicMock, patch
 
-from pylamarzocco.const import MachineModel
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
-from pylamarzocco.models import LaMarzoccoDeviceInfo
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
+from lmcloud.models import LaMarzoccoDeviceInfo
 import pytest
 
-from homeassistant.components.dhcp import DhcpServiceInfo
 from homeassistant.components.lamarzocco.config_flow import CONF_MACHINE
 from homeassistant.components.lamarzocco.const import CONF_USE_BLUETOOTH, DOMAIN
-from homeassistant.config_entries import (
-    SOURCE_BLUETOOTH,
-    SOURCE_DHCP,
-    SOURCE_USER,
-    ConfigEntryState,
-)
+from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_USER, ConfigEntryState
 from homeassistant.const import (
     CONF_HOST,
     CONF_MAC,
@@ -373,6 +366,10 @@ async def test_bluetooth_discovery(
     }
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.lamarzocco.config.error.machine_not_found"],
+)
 async def test_bluetooth_discovery_errors(
     hass: HomeAssistant,
     mock_lamarzocco: MagicMock,
@@ -438,50 +435,6 @@ async def test_bluetooth_discovery_errors(
     }
 
 
-@pytest.mark.parametrize(
-    "device_fixture",
-    [MachineModel.LINEA_MICRA, MachineModel.LINEA_MINI, MachineModel.GS3_AV],
-)
-async def test_dhcp_discovery(
-    hass: HomeAssistant,
-    mock_lamarzocco: MagicMock,
-    mock_cloud_client: MagicMock,
-    mock_device_info: LaMarzoccoDeviceInfo,
-) -> None:
-    """Test dhcp discovery."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_DHCP},
-        data=DhcpServiceInfo(
-            ip="192.168.1.42",
-            hostname=mock_lamarzocco.serial_number,
-            macaddress="aa:bb:cc:dd:ee:ff",
-        ),
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    with patch(
-        "homeassistant.components.lamarzocco.config_flow.LaMarzoccoLocalClient.validate_connection",
-        return_value=True,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            USER_INPUT,
-        )
-        assert result2["type"] is FlowResultType.CREATE_ENTRY
-        assert result2["data"] == {
-            **USER_INPUT,
-            CONF_HOST: "192.168.1.42",
-            CONF_MACHINE: mock_lamarzocco.serial_number,
-            CONF_MODEL: mock_device_info.model,
-            CONF_NAME: mock_device_info.name,
-            CONF_TOKEN: mock_device_info.communication_key,
-        }
-
-
 async def test_options_flow(
     hass: HomeAssistant,
     mock_lamarzocco: MagicMock,
diff --git a/tests/components/lamarzocco/test_init.py b/tests/components/lamarzocco/test_init.py
index b99077a9059..2c812f79438 100644
--- a/tests/components/lamarzocco/test_init.py
+++ b/tests/components/lamarzocco/test_init.py
@@ -2,8 +2,8 @@
 
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from pylamarzocco.const import FirmwareType
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
+from lmcloud.const import FirmwareType
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
 import pytest
 
 from homeassistant.components.lamarzocco.config_flow import CONF_MACHINE
diff --git a/tests/components/lamarzocco/test_number.py b/tests/components/lamarzocco/test_number.py
index 710a0220e06..70d8efa5de7 100644
--- a/tests/components/lamarzocco/test_number.py
+++ b/tests/components/lamarzocco/test_number.py
@@ -1,16 +1,15 @@
 """Tests for the La Marzocco number entities."""
 
-from typing import Any
 from unittest.mock import MagicMock
 
-from pylamarzocco.const import (
+from lmcloud.const import (
     KEYS_PER_MODEL,
     BoilerType,
     MachineModel,
     PhysicalKey,
     PrebrewMode,
 )
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.exceptions import RequestNotSuccessful
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -29,41 +28,20 @@ from . import async_init_integration
 from tests.common import MockConfigEntry
 
 
-@pytest.mark.parametrize(
-    ("entity_name", "value", "func_name", "kwargs"),
-    [
-        (
-            "coffee_target_temperature",
-            94,
-            "set_temp",
-            {"boiler": BoilerType.COFFEE, "temperature": 94},
-        ),
-        (
-            "smart_standby_time",
-            23,
-            "set_smart_standby",
-            {"enabled": True, "mode": "LastBrewing", "minutes": 23},
-        ),
-    ],
-)
-async def test_general_numbers(
+async def test_coffee_boiler(
     hass: HomeAssistant,
     mock_lamarzocco: MagicMock,
     mock_config_entry: MockConfigEntry,
     entity_registry: er.EntityRegistry,
     device_registry: dr.DeviceRegistry,
     snapshot: SnapshotAssertion,
-    entity_name: str,
-    value: float,
-    func_name: str,
-    kwargs: dict[str, Any],
 ) -> None:
-    """Test the numbers available to all machines."""
+    """Test the La Marzocco coffee temperature Number."""
 
     await async_init_integration(hass, mock_config_entry)
     serial_number = mock_lamarzocco.serial_number
 
-    state = hass.states.get(f"number.{serial_number}_{entity_name}")
+    state = hass.states.get(f"number.{serial_number}_coffee_target_temperature")
 
     assert state
     assert state == snapshot
@@ -81,14 +59,16 @@ async def test_general_numbers(
         NUMBER_DOMAIN,
         SERVICE_SET_VALUE,
         {
-            ATTR_ENTITY_ID: f"number.{serial_number}_{entity_name}",
-            ATTR_VALUE: value,
+            ATTR_ENTITY_ID: f"number.{serial_number}_coffee_target_temperature",
+            ATTR_VALUE: 94,
         },
         blocking=True,
     )
 
-    mock_func = getattr(mock_lamarzocco, func_name)
-    mock_func.assert_called_once_with(**kwargs)
+    assert len(mock_lamarzocco.set_temp.mock_calls) == 1
+    mock_lamarzocco.set_temp.assert_called_once_with(
+        boiler=BoilerType.COFFEE, temperature=94
+    )
 
 
 @pytest.mark.parametrize("device_fixture", [MachineModel.GS3_AV, MachineModel.GS3_MP])
diff --git a/tests/components/lamarzocco/test_select.py b/tests/components/lamarzocco/test_select.py
index 24b96f84f37..862898428f5 100644
--- a/tests/components/lamarzocco/test_select.py
+++ b/tests/components/lamarzocco/test_select.py
@@ -2,8 +2,8 @@
 
 from unittest.mock import MagicMock
 
-from pylamarzocco.const import MachineModel, PrebrewMode, SmartStandbyMode, SteamLevel
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.const import MachineModel, PrebrewMode, SteamLevel
+from lmcloud.exceptions import RequestNotSuccessful
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -121,40 +121,6 @@ async def test_pre_brew_infusion_select_none(
     assert state is None
 
 
-async def test_smart_standby_mode(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_lamarzocco: MagicMock,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test the La Marzocco Smart Standby mode select."""
-
-    serial_number = mock_lamarzocco.serial_number
-
-    state = hass.states.get(f"select.{serial_number}_smart_standby_mode")
-
-    assert state
-    assert state == snapshot
-
-    entry = entity_registry.async_get(state.entity_id)
-    assert entry
-    assert entry == snapshot
-
-    await hass.services.async_call(
-        SELECT_DOMAIN,
-        SERVICE_SELECT_OPTION,
-        {
-            ATTR_ENTITY_ID: f"select.{serial_number}_smart_standby_mode",
-            ATTR_OPTION: "power_on",
-        },
-        blocking=True,
-    )
-
-    mock_lamarzocco.set_smart_standby.assert_called_once_with(
-        enabled=True, mode=SmartStandbyMode.POWER_ON, minutes=10
-    )
-
-
 async def test_select_errors(
     hass: HomeAssistant,
     mock_lamarzocco: MagicMock,
diff --git a/tests/components/lamarzocco/test_sensor.py b/tests/components/lamarzocco/test_sensor.py
index 6f14d52d1fc..760dcffd28f 100644
--- a/tests/components/lamarzocco/test_sensor.py
+++ b/tests/components/lamarzocco/test_sensor.py
@@ -2,7 +2,7 @@
 
 from unittest.mock import MagicMock
 
-from pylamarzocco.const import MachineModel
+from lmcloud.const import MachineModel
 import pytest
 from syrupy import SnapshotAssertion
 
diff --git a/tests/components/lamarzocco/test_switch.py b/tests/components/lamarzocco/test_switch.py
index 5c6d1cb1e42..a09d254ffe9 100644
--- a/tests/components/lamarzocco/test_switch.py
+++ b/tests/components/lamarzocco/test_switch.py
@@ -1,9 +1,8 @@
 """Tests for La Marzocco switches."""
 
-from typing import Any
 from unittest.mock import MagicMock
 
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.exceptions import RequestNotSuccessful
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -26,15 +25,15 @@ from tests.common import MockConfigEntry
     (
         "entity_name",
         "method_name",
-        "kwargs",
     ),
     [
-        ("", "set_power", {}),
-        ("_steam_boiler", "set_steam", {}),
         (
-            "_smart_standby_enabled",
-            "set_smart_standby",
-            {"mode": "LastBrewing", "minutes": 10},
+            "",
+            "set_power",
+        ),
+        (
+            "_steam_boiler",
+            "set_steam",
         ),
     ],
 )
@@ -46,7 +45,6 @@ async def test_switches(
     snapshot: SnapshotAssertion,
     entity_name: str,
     method_name: str,
-    kwargs: dict[str, Any],
 ) -> None:
     """Test the La Marzocco switches."""
     await async_init_integration(hass, mock_config_entry)
@@ -73,7 +71,7 @@ async def test_switches(
     )
 
     assert len(control_fn.mock_calls) == 1
-    control_fn.assert_called_once_with(enabled=False, **kwargs)
+    control_fn.assert_called_once_with(False)
 
     await hass.services.async_call(
         SWITCH_DOMAIN,
@@ -85,7 +83,7 @@ async def test_switches(
     )
 
     assert len(control_fn.mock_calls) == 2
-    control_fn.assert_called_with(enabled=True, **kwargs)
+    control_fn.assert_called_with(True)
 
 
 async def test_device(
diff --git a/tests/components/lamarzocco/test_update.py b/tests/components/lamarzocco/test_update.py
index aef37d7c921..3dc2a86b574 100644
--- a/tests/components/lamarzocco/test_update.py
+++ b/tests/components/lamarzocco/test_update.py
@@ -2,8 +2,8 @@
 
 from unittest.mock import MagicMock
 
-from pylamarzocco.const import FirmwareType
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.const import FirmwareType
+from lmcloud.exceptions import RequestNotSuccessful
 import pytest
 from syrupy import SnapshotAssertion
 
diff --git a/tests/components/landisgyr_heat_meter/test_config_flow.py b/tests/components/landisgyr_heat_meter/test_config_flow.py
index fe62d530719..79088508e61 100644
--- a/tests/components/landisgyr_heat_meter/test_config_flow.py
+++ b/tests/components/landisgyr_heat_meter/test_config_flow.py
@@ -101,6 +101,10 @@ async def test_list_entry(mock_port, mock_heat_meter, hass: HomeAssistant) -> No
     }
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.landisgyr_heat_meter.config.error.cannot_connect"],
+)
 @patch(API_HEAT_METER_SERVICE)
 async def test_manual_entry_fail(mock_heat_meter, hass: HomeAssistant) -> None:
     """Test manual entry fails."""
@@ -131,6 +135,10 @@ async def test_manual_entry_fail(mock_heat_meter, hass: HomeAssistant) -> None:
     assert result["errors"] == {"base": "cannot_connect"}
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.landisgyr_heat_meter.config.error.cannot_connect"],
+)
 @patch(API_HEAT_METER_SERVICE)
 @patch("serial.tools.list_ports.comports", return_value=[mock_serial_port()])
 async def test_list_entry_fail(mock_port, mock_heat_meter, hass: HomeAssistant) -> None:
diff --git a/tests/components/lcn/fixtures/config_entry_pchk.json b/tests/components/lcn/fixtures/config_entry_pchk.json
index 068b8757707..d8eef6d1eb3 100644
--- a/tests/components/lcn/fixtures/config_entry_pchk.json
+++ b/tests/components/lcn/fixtures/config_entry_pchk.json
@@ -32,7 +32,7 @@
       "domain_data": {
         "output": "OUTPUT1",
         "dimmable": true,
-        "transition": 5.0
+        "transition": 5000.0
       }
     },
     {
@@ -43,7 +43,7 @@
       "domain_data": {
         "output": "OUTPUT2",
         "dimmable": false,
-        "transition": 0.0
+        "transition": 0
       }
     },
     {
@@ -93,24 +93,6 @@
         "output": "RELAY2"
       }
     },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Regulator1",
-      "resource": "r1varsetpoint",
-      "domain": "switch",
-      "domain_data": {
-        "output": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_KeyLock1",
-      "resource": "a1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "A1"
-      }
-    },
     {
       "address": [0, 5, true],
       "name": "Switch_Group5",
@@ -163,7 +145,7 @@
         "register": 0,
         "scene": 0,
         "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
-        "transition": 0.0
+        "transition": null
       }
     },
     {
@@ -175,7 +157,7 @@
         "register": 0,
         "scene": 1,
         "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
-        "transition": 10.0
+        "transition": 10
       }
     },
     {
diff --git a/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json b/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json
index e1893c30b42..9a8095ff16d 100644
--- a/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json
+++ b/tests/components/lcn/fixtures/config_entry_pchk_v1_1.json
@@ -92,24 +92,6 @@
         "output": "RELAY2"
       }
     },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Regulator1",
-      "resource": "r1varsetpoint",
-      "domain": "switch",
-      "domain_data": {
-        "output": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_KeyLock1",
-      "resource": "a1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "A1"
-      }
-    },
     {
       "address": [0, 5, true],
       "name": "Switch_Group5",
@@ -174,7 +156,7 @@
         "register": 0,
         "scene": 1,
         "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
-        "transition": 10000
+        "transition": 10
       }
     },
     {
diff --git a/tests/components/lcn/fixtures/config_entry_pchk_v1_2.json b/tests/components/lcn/fixtures/config_entry_pchk_v1_2.json
deleted file mode 100644
index 7389079dca9..00000000000
--- a/tests/components/lcn/fixtures/config_entry_pchk_v1_2.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-  "host": "pchk",
-  "ip_address": "192.168.2.41",
-  "port": 4114,
-  "username": "lcn",
-  "password": "lcn",
-  "sk_num_tries": 0,
-  "dim_mode": "STEPS200",
-  "acknowledge": false,
-  "devices": [
-    {
-      "address": [0, 7, false],
-      "name": "TestModule",
-      "hardware_serial": -1,
-      "software_serial": -1,
-      "hardware_type": -1
-    },
-    {
-      "address": [0, 5, true],
-      "name": "TestGroup",
-      "hardware_serial": -1,
-      "software_serial": -1,
-      "hardware_type": -1
-    }
-  ],
-  "entities": [
-    {
-      "address": [0, 7, false],
-      "name": "Light_Output1",
-      "resource": "output1",
-      "domain": "light",
-      "domain_data": {
-        "output": "OUTPUT1",
-        "dimmable": true,
-        "transition": 5000.0
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Light_Output2",
-      "resource": "output2",
-      "domain": "light",
-      "domain_data": {
-        "output": "OUTPUT2",
-        "dimmable": false,
-        "transition": 0
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Light_Relay1",
-      "resource": "relay1",
-      "domain": "light",
-      "domain_data": {
-        "output": "RELAY1",
-        "dimmable": false,
-        "transition": 0.0
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Output1",
-      "resource": "output1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "OUTPUT1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Output2",
-      "resource": "output2",
-      "domain": "switch",
-      "domain_data": {
-        "output": "OUTPUT2"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Relay1",
-      "resource": "relay1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Relay2",
-      "resource": "relay2",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY2"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_Regulator1",
-      "resource": "r1varsetpoint",
-      "domain": "switch",
-      "domain_data": {
-        "output": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Switch_KeyLock1",
-      "resource": "a1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "A1"
-      }
-    },
-    {
-      "address": [0, 5, true],
-      "name": "Switch_Group5",
-      "resource": "relay1",
-      "domain": "switch",
-      "domain_data": {
-        "output": "RELAY1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Cover_Outputs",
-      "resource": "outputs",
-      "domain": "cover",
-      "domain_data": {
-        "motor": "OUTPUTS",
-        "reverse_time": "RT1200"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Cover_Relays",
-      "resource": "motor1",
-      "domain": "cover",
-      "domain_data": {
-        "motor": "MOTOR1",
-        "reverse_time": "RT1200"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Climate1",
-      "resource": "var1.r1varsetpoint",
-      "domain": "climate",
-      "domain_data": {
-        "source": "VAR1",
-        "setpoint": "R1VARSETPOINT",
-        "lockable": true,
-        "min_temp": 0.0,
-        "max_temp": 40.0,
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Romantic",
-      "resource": "0.0",
-      "domain": "scene",
-      "domain_data": {
-        "register": 0,
-        "scene": 0,
-        "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
-        "transition": null
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Romantic Transition",
-      "resource": "0.1",
-      "domain": "scene",
-      "domain_data": {
-        "register": 0,
-        "scene": 1,
-        "outputs": ["OUTPUT1", "OUTPUT2", "RELAY1"],
-        "transition": 10000
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_LockRegulator1",
-      "resource": "r1varsetpoint",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "R1VARSETPOINT"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Binary_Sensor1",
-      "resource": "binsensor1",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "BINSENSOR1"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_KeyLock",
-      "resource": "a5",
-      "domain": "binary_sensor",
-      "domain_data": {
-        "source": "A5"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Var1",
-      "resource": "var1",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "VAR1",
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Setpoint1",
-      "resource": "r1varsetpoint",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "R1VARSETPOINT",
-        "unit_of_measurement": "°C"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_Led6",
-      "resource": "led6",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "LED6",
-        "unit_of_measurement": "NATIVE"
-      }
-    },
-    {
-      "address": [0, 7, false],
-      "name": "Sensor_LogicOp1",
-      "resource": "logicop1",
-      "domain": "sensor",
-      "domain_data": {
-        "source": "LOGICOP1",
-        "unit_of_measurement": "NATIVE"
-      }
-    }
-  ]
-}
diff --git a/tests/components/lcn/snapshots/test_switch.ambr b/tests/components/lcn/snapshots/test_switch.ambr
index 36145b8d4fd..1f2aac041aa 100644
--- a/tests/components/lcn/snapshots/test_switch.ambr
+++ b/tests/components/lcn/snapshots/test_switch.ambr
@@ -45,52 +45,6 @@
     'state': 'off',
   })
 # ---
-# name: test_setup_lcn_switch[switch.switch_keylock1-entry]
-  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.switch_keylock1',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Switch_KeyLock1',
-    'platform': 'lcn',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'lcn/config_entry_pchk.json-m000007-a1',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_setup_lcn_switch[switch.switch_keylock1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Switch_KeyLock1',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.switch_keylock1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
 # name: test_setup_lcn_switch[switch.switch_output1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -183,52 +137,6 @@
     'state': 'off',
   })
 # ---
-# name: test_setup_lcn_switch[switch.switch_regulator1-entry]
-  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.switch_regulator1',
-    'has_entity_name': False,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Switch_Regulator1',
-    'platform': 'lcn',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'lcn/config_entry_pchk.json-m000007-r1varsetpoint',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_setup_lcn_switch[switch.switch_regulator1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Switch_Regulator1',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.switch_regulator1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
 # name: test_setup_lcn_switch[switch.switch_relay1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/lcn/test_binary_sensor.py b/tests/components/lcn/test_binary_sensor.py
index 2f64f421b93..7abae6e0d89 100644
--- a/tests/components/lcn/test_binary_sensor.py
+++ b/tests/components/lcn/test_binary_sensor.py
@@ -5,19 +5,12 @@ from unittest.mock import patch
 from pypck.inputs import ModStatusBinSensors, ModStatusKeyLocks, ModStatusVar
 from pypck.lcn_addr import LcnAddr
 from pypck.lcn_defs import Var, VarValue
-import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components import automation, script
-from homeassistant.components.automation import automations_with_entity
-from homeassistant.components.lcn import DOMAIN
 from homeassistant.components.lcn.helpers import get_device_connection
-from homeassistant.components.script import scripts_with_entity
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, Platform
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.helpers.issue_registry as ir
-from homeassistant.setup import async_setup_component
 
 from .conftest import MockConfigEntry, init_integration
 
@@ -138,54 +131,3 @@ async def test_unload_config_entry(hass: HomeAssistant, entry: MockConfigEntry)
     assert hass.states.get(BINARY_SENSOR_LOCKREGULATOR1).state == STATE_UNAVAILABLE
     assert hass.states.get(BINARY_SENSOR_SENSOR1).state == STATE_UNAVAILABLE
     assert hass.states.get(BINARY_SENSOR_KEYLOCK).state == STATE_UNAVAILABLE
-
-
-@pytest.mark.parametrize(
-    "entity_id", ["binary_sensor.sensor_lockregulator1", "binary_sensor.sensor_keylock"]
-)
-async def test_create_issue(
-    hass: HomeAssistant,
-    service_calls: list[ServiceCall],
-    issue_registry: ir.IssueRegistry,
-    entry: MockConfigEntry,
-    entity_id,
-) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
-    assert await async_setup_component(
-        hass,
-        automation.DOMAIN,
-        {
-            automation.DOMAIN: {
-                "alias": "test",
-                "trigger": {"platform": "state", "entity_id": entity_id},
-                "action": {"action": "test.automation"},
-            }
-        },
-    )
-
-    assert await async_setup_component(
-        hass,
-        script.DOMAIN,
-        {
-            script.DOMAIN: {
-                "test": {
-                    "sequence": {
-                        "condition": "state",
-                        "entity_id": entity_id,
-                        "state": STATE_ON,
-                    }
-                }
-            }
-        },
-    )
-
-    await init_integration(hass, entry)
-
-    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
-    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
-
-    assert issue_registry.async_get_issue(
-        DOMAIN, f"deprecated_binary_sensor_{entity_id}"
-    )
-
-    assert len(issue_registry.issues) == 1
diff --git a/tests/components/lcn/test_config_flow.py b/tests/components/lcn/test_config_flow.py
index b7967c247ec..4ef83aeaf8a 100644
--- a/tests/components/lcn/test_config_flow.py
+++ b/tests/components/lcn/test_config_flow.py
@@ -23,7 +23,9 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_USERNAME,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import issue_registry as ir
 
 from tests.common import MockConfigEntry
 
@@ -46,6 +48,83 @@ IMPORT_DATA = {
 }
 
 
+async def test_step_import(
+    hass: HomeAssistant, issue_registry: ir.IssueRegistry
+) -> None:
+    """Test for import step."""
+
+    with (
+        patch("homeassistant.components.lcn.PchkConnectionManager.async_connect"),
+        patch("homeassistant.components.lcn.async_setup", return_value=True),
+        patch("homeassistant.components.lcn.async_setup_entry", return_value=True),
+    ):
+        data = IMPORT_DATA.copy()
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=data
+        )
+
+        assert result["type"] is FlowResultType.CREATE_ENTRY
+        assert result["title"] == "pchk"
+        assert result["data"] == IMPORT_DATA
+        assert issue_registry.async_get_issue(
+            HOMEASSISTANT_DOMAIN, f"deprecated_yaml_{DOMAIN}"
+        )
+
+
+async def test_step_import_existing_host(
+    hass: HomeAssistant, issue_registry: ir.IssueRegistry
+) -> None:
+    """Test for update of config_entry if imported host already exists."""
+
+    # Create config entry and add it to hass
+    mock_data = IMPORT_DATA.copy()
+    mock_data.update({CONF_SK_NUM_TRIES: 3, CONF_DIM_MODE: 50})
+    mock_entry = MockConfigEntry(domain=DOMAIN, data=mock_data)
+    mock_entry.add_to_hass(hass)
+    # Initialize a config flow with different data but same host address
+    with patch("homeassistant.components.lcn.PchkConnectionManager.async_connect"):
+        imported_data = IMPORT_DATA.copy()
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=imported_data
+        )
+
+        # Check if config entry was updated
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == "existing_configuration_updated"
+        assert mock_entry.source == config_entries.SOURCE_IMPORT
+        assert mock_entry.data == IMPORT_DATA
+        assert issue_registry.async_get_issue(
+            HOMEASSISTANT_DOMAIN, f"deprecated_yaml_{DOMAIN}"
+        )
+
+
+@pytest.mark.parametrize(
+    ("error", "reason"),
+    [
+        (PchkAuthenticationError, "authentication_error"),
+        (PchkLicenseError, "license_error"),
+        (TimeoutError, "connection_refused"),
+    ],
+)
+async def test_step_import_error(
+    hass: HomeAssistant, issue_registry: ir.IssueRegistry, error, reason
+) -> None:
+    """Test for error in import is handled correctly."""
+    with patch(
+        "homeassistant.components.lcn.PchkConnectionManager.async_connect",
+        side_effect=error,
+    ):
+        data = IMPORT_DATA.copy()
+        data.update({CONF_HOST: "pchk"})
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=data
+        )
+
+        assert result["type"] is FlowResultType.ABORT
+        assert result["reason"] == reason
+        assert issue_registry.async_get_issue(DOMAIN, reason)
+
+
 async def test_show_form(hass: HomeAssistant) -> None:
     """Test that the form is served with no input."""
     flow = LcnFlowHandler()
@@ -61,6 +140,7 @@ async def test_step_user(hass: HomeAssistant) -> None:
     """Test for user step."""
     with (
         patch("homeassistant.components.lcn.PchkConnectionManager.async_connect"),
+        patch("homeassistant.components.lcn.async_setup", return_value=True),
         patch("homeassistant.components.lcn.async_setup_entry", return_value=True),
     ):
         data = CONNECTION_DATA.copy()
@@ -130,6 +210,7 @@ async def test_step_reconfigure(hass: HomeAssistant, entry: MockConfigEntry) ->
 
     with (
         patch("homeassistant.components.lcn.PchkConnectionManager.async_connect"),
+        patch("homeassistant.components.lcn.async_setup", return_value=True),
         patch("homeassistant.components.lcn.async_setup_entry", return_value=True),
     ):
         result = await hass.config_entries.flow.async_configure(
diff --git a/tests/components/lcn/test_init.py b/tests/components/lcn/test_init.py
index 2327635e356..62fa79961cb 100644
--- a/tests/components/lcn/test_init.py
+++ b/tests/components/lcn/test_init.py
@@ -16,6 +16,7 @@ from .conftest import (
     MockPchkConnectionManager,
     create_config_entry,
     init_integration,
+    setup_component,
 )
 
 
@@ -82,6 +83,18 @@ async def test_async_setup_entry_update(
     assert dummy_entity in entity_registry.entities.values()
     assert dummy_device in device_registry.devices.values()
 
+    # setup new entry with same data via import step (should cleanup dummy device)
+    with patch(
+        "homeassistant.components.lcn.config_flow.validate_connection",
+        return_value=None,
+    ):
+        await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=entry.data
+        )
+
+    assert dummy_device not in device_registry.devices.values()
+    assert dummy_entity not in entity_registry.entities.values()
+
 
 @pytest.mark.parametrize(
     "exception", [PchkAuthenticationError, PchkLicenseError, TimeoutError]
@@ -101,6 +114,20 @@ async def test_async_setup_entry_raises_authentication_error(
     assert entry.state is ConfigEntryState.SETUP_ERROR
 
 
+async def test_async_setup_from_configuration_yaml(hass: HomeAssistant) -> None:
+    """Test a successful setup using data from configuration.yaml."""
+    with (
+        patch(
+            "homeassistant.components.lcn.config_flow.validate_connection",
+            return_value=None,
+        ),
+        patch("homeassistant.components.lcn.async_setup_entry") as async_setup_entry,
+    ):
+        await setup_component(hass)
+
+        assert async_setup_entry.await_count == 2
+
+
 @patch("homeassistant.components.lcn.PchkConnectionManager", MockPchkConnectionManager)
 async def test_migrate_1_1(hass: HomeAssistant, entry) -> None:
     """Test migration config entry."""
@@ -112,22 +139,6 @@ async def test_migrate_1_1(hass: HomeAssistant, entry) -> None:
 
     entry_migrated = hass.config_entries.async_get_entry(entry_v1_1.entry_id)
     assert entry_migrated.state is ConfigEntryState.LOADED
-    assert entry_migrated.version == 2
-    assert entry_migrated.minor_version == 1
-    assert entry_migrated.data == entry.data
-
-
-@patch("homeassistant.components.lcn.PchkConnectionManager", MockPchkConnectionManager)
-async def test_migrate_1_2(hass: HomeAssistant, entry) -> None:
-    """Test migration config entry."""
-    entry_v1_2 = create_config_entry("pchk_v1_2", version=(1, 2))
-    entry_v1_2.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(entry_v1_2.entry_id)
-    await hass.async_block_till_done()
-
-    entry_migrated = hass.config_entries.async_get_entry(entry_v1_2.entry_id)
-    assert entry_migrated.state is ConfigEntryState.LOADED
-    assert entry_migrated.version == 2
-    assert entry_migrated.minor_version == 1
+    assert entry_migrated.version == 1
+    assert entry_migrated.minor_version == 2
     assert entry_migrated.data == entry.data
diff --git a/tests/components/lcn/test_scene.py b/tests/components/lcn/test_scene.py
index 27e7864df41..fcd59693479 100644
--- a/tests/components/lcn/test_scene.py
+++ b/tests/components/lcn/test_scene.py
@@ -51,7 +51,7 @@ async def test_scene_activate(
     assert state is not None
 
     activate_scene.assert_awaited_with(
-        0, 0, [OutputPort.OUTPUT1, OutputPort.OUTPUT2], [RelayPort.RELAY1], 0.0
+        0, 0, [OutputPort.OUTPUT1, OutputPort.OUTPUT2], [RelayPort.RELAY1], None
     )
 
 
diff --git a/tests/components/lcn/test_switch.py b/tests/components/lcn/test_switch.py
index 15b156aac43..f57a51bc8a3 100644
--- a/tests/components/lcn/test_switch.py
+++ b/tests/components/lcn/test_switch.py
@@ -2,14 +2,9 @@
 
 from unittest.mock import patch
 
-from pypck.inputs import (
-    ModStatusKeyLocks,
-    ModStatusOutput,
-    ModStatusRelays,
-    ModStatusVar,
-)
+from pypck.inputs import ModStatusOutput, ModStatusRelays
 from pypck.lcn_addr import LcnAddr
-from pypck.lcn_defs import KeyLockStateModifier, RelayStateModifier, Var, VarValue
+from pypck.lcn_defs import RelayStateModifier
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.lcn.helpers import get_device_connection
@@ -34,8 +29,6 @@ SWITCH_OUTPUT1 = "switch.switch_output1"
 SWITCH_OUTPUT2 = "switch.switch_output2"
 SWITCH_RELAY1 = "switch.switch_relay1"
 SWITCH_RELAY2 = "switch.switch_relay2"
-SWITCH_REGULATOR1 = "switch.switch_regulator1"
-SWITCH_KEYLOCKK1 = "switch.switch_keylock1"
 
 
 async def test_setup_lcn_switch(
@@ -211,170 +204,6 @@ async def test_relay_turn_off(hass: HomeAssistant, entry: MockConfigEntry) -> No
         assert state.state == STATE_OFF
 
 
-async def test_regulatorlock_turn_on(
-    hass: HomeAssistant, entry: MockConfigEntry
-) -> None:
-    """Test the regulator lock switch turns on."""
-    await init_integration(hass, entry)
-
-    with patch.object(MockModuleConnection, "lock_regulator") as lock_regulator:
-        # command failed
-        lock_regulator.return_value = False
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: SWITCH_REGULATOR1},
-            blocking=True,
-        )
-
-        lock_regulator.assert_awaited_with(0, True)
-
-        state = hass.states.get(SWITCH_REGULATOR1)
-        assert state.state == STATE_OFF
-
-        # command success
-        lock_regulator.reset_mock(return_value=True)
-        lock_regulator.return_value = True
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: SWITCH_REGULATOR1},
-            blocking=True,
-        )
-
-        lock_regulator.assert_awaited_with(0, True)
-
-        state = hass.states.get(SWITCH_REGULATOR1)
-        assert state.state == STATE_ON
-
-
-async def test_regulatorlock_turn_off(
-    hass: HomeAssistant, entry: MockConfigEntry
-) -> None:
-    """Test the regulator lock switch turns off."""
-    await init_integration(hass, entry)
-
-    with patch.object(MockModuleConnection, "lock_regulator") as lock_regulator:
-        state = hass.states.get(SWITCH_REGULATOR1)
-        state.state = STATE_ON
-
-        # command failed
-        lock_regulator.return_value = False
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: SWITCH_REGULATOR1},
-            blocking=True,
-        )
-
-        lock_regulator.assert_awaited_with(0, False)
-
-        state = hass.states.get(SWITCH_REGULATOR1)
-        assert state.state == STATE_ON
-
-        # command success
-        lock_regulator.reset_mock(return_value=True)
-        lock_regulator.return_value = True
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: SWITCH_REGULATOR1},
-            blocking=True,
-        )
-
-        lock_regulator.assert_awaited_with(0, False)
-
-        state = hass.states.get(SWITCH_REGULATOR1)
-        assert state.state == STATE_OFF
-
-
-async def test_keylock_turn_on(hass: HomeAssistant, entry: MockConfigEntry) -> None:
-    """Test the keylock switch turns on."""
-    await init_integration(hass, entry)
-
-    with patch.object(MockModuleConnection, "lock_keys") as lock_keys:
-        states = [KeyLockStateModifier.NOCHANGE] * 8
-        states[0] = KeyLockStateModifier.ON
-
-        # command failed
-        lock_keys.return_value = False
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: SWITCH_KEYLOCKK1},
-            blocking=True,
-        )
-
-        lock_keys.assert_awaited_with(0, states)
-
-        state = hass.states.get(SWITCH_KEYLOCKK1)
-        assert state.state == STATE_OFF
-
-        # command success
-        lock_keys.reset_mock(return_value=True)
-        lock_keys.return_value = True
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: SWITCH_KEYLOCKK1},
-            blocking=True,
-        )
-
-        lock_keys.assert_awaited_with(0, states)
-
-        state = hass.states.get(SWITCH_KEYLOCKK1)
-        assert state.state == STATE_ON
-
-
-async def test_keylock_turn_off(hass: HomeAssistant, entry: MockConfigEntry) -> None:
-    """Test the keylock switch turns off."""
-    await init_integration(hass, entry)
-
-    with patch.object(MockModuleConnection, "lock_keys") as lock_keys:
-        states = [KeyLockStateModifier.NOCHANGE] * 8
-        states[0] = KeyLockStateModifier.OFF
-
-        state = hass.states.get(SWITCH_KEYLOCKK1)
-        state.state = STATE_ON
-
-        # command failed
-        lock_keys.return_value = False
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: SWITCH_KEYLOCKK1},
-            blocking=True,
-        )
-
-        lock_keys.assert_awaited_with(0, states)
-
-        state = hass.states.get(SWITCH_KEYLOCKK1)
-        assert state.state == STATE_ON
-
-        # command success
-        lock_keys.reset_mock(return_value=True)
-        lock_keys.return_value = True
-
-        await hass.services.async_call(
-            DOMAIN_SWITCH,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: SWITCH_KEYLOCKK1},
-            blocking=True,
-        )
-
-        lock_keys.assert_awaited_with(0, states)
-
-        state = hass.states.get(SWITCH_KEYLOCKK1)
-        assert state.state == STATE_OFF
-
-
 async def test_pushed_output_status_change(
     hass: HomeAssistant, entry: MockConfigEntry
 ) -> None:
@@ -430,64 +259,6 @@ async def test_pushed_relay_status_change(
     assert state.state == STATE_OFF
 
 
-async def test_pushed_regulatorlock_status_change(
-    hass: HomeAssistant, entry: MockConfigEntry
-) -> None:
-    """Test the regulator lock switch changes its state on status received."""
-    await init_integration(hass, entry)
-
-    device_connection = get_device_connection(hass, (0, 7, False), entry)
-    address = LcnAddr(0, 7, False)
-    states = [False] * 8
-
-    # push status "on"
-    states[0] = True
-    inp = ModStatusVar(address, Var.R1VARSETPOINT, VarValue(0x8000))
-    await device_connection.async_process_input(inp)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(SWITCH_REGULATOR1)
-    assert state.state == STATE_ON
-
-    # push status "off"
-    states[0] = False
-    inp = ModStatusVar(address, Var.R1VARSETPOINT, VarValue(0x7FFF))
-    await device_connection.async_process_input(inp)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(SWITCH_REGULATOR1)
-    assert state.state == STATE_OFF
-
-
-async def test_pushed_keylock_status_change(
-    hass: HomeAssistant, entry: MockConfigEntry
-) -> None:
-    """Test the keylock switch changes its state on status received."""
-    await init_integration(hass, entry)
-
-    device_connection = get_device_connection(hass, (0, 7, False), entry)
-    address = LcnAddr(0, 7, False)
-    states = [[False] * 8 for i in range(4)]
-    states[0][0] = True
-
-    # push status "on"
-    inp = ModStatusKeyLocks(address, states)
-    await device_connection.async_process_input(inp)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(SWITCH_KEYLOCKK1)
-    assert state.state == STATE_ON
-
-    # push status "off"
-    states[0][0] = False
-    inp = ModStatusKeyLocks(address, states)
-    await device_connection.async_process_input(inp)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(SWITCH_KEYLOCKK1)
-    assert state.state == STATE_OFF
-
-
 async def test_unload_config_entry(hass: HomeAssistant, entry: MockConfigEntry) -> None:
     """Test the switch is removed when the config entry is unloaded."""
     await init_integration(hass, entry)
diff --git a/tests/components/lektrico/fixtures/get_info.json b/tests/components/lektrico/fixtures/get_info.json
index 2b099a666e5..2f190d2f00c 100644
--- a/tests/components/lektrico/fixtures/get_info.json
+++ b/tests/components/lektrico/fixtures/get_info.json
@@ -13,16 +13,5 @@
   "led_max_brightness": 20,
   "dynamic_current": 32,
   "user_current": 32,
-  "lb_mode": 0,
-  "require_auth": true,
-  "state_e_activated": false,
-  "undervoltage_error": true,
-  "rcd_error": false,
-  "meter_fault": false,
-  "overcurrent": false,
-  "overtemp": false,
-  "overvoltage_error": false,
-  "contactor_failure": false,
-  "cp_diode_failure": false,
-  "critical_temp": false
+  "lb_mode": 0
 }
diff --git a/tests/components/lektrico/snapshots/test_binary_sensor.ambr b/tests/components/lektrico/snapshots/test_binary_sensor.ambr
deleted file mode 100644
index 6a28e7c60de..00000000000
--- a/tests/components/lektrico/snapshots/test_binary_sensor.ambr
+++ /dev/null
@@ -1,471 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[binary_sensor.1p7k_500006_ev_diode_short-entry]
-  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.1p7k_500006_ev_diode_short',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Ev diode short',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'cp_diode_failure',
-    'unique_id': '500006_cp_diode_failure',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_ev_diode_short-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Ev diode short',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_ev_diode_short',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_ev_error-entry]
-  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.1p7k_500006_ev_error',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Ev error',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'state_e_activated',
-    'unique_id': '500006_state_e_activated',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_ev_error-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Ev error',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_ev_error',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_metering_error-entry]
-  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.1p7k_500006_metering_error',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Metering error',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'meter_fault',
-    'unique_id': '500006_meter_fault',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_metering_error-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Metering error',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_metering_error',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_overcurrent-entry]
-  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.1p7k_500006_overcurrent',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Overcurrent',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'overcurrent',
-    'unique_id': '500006_overcurrent',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_overcurrent-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Overcurrent',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_overcurrent',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_overheating-entry]
-  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.1p7k_500006_overheating',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Overheating',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'critical_temp',
-    'unique_id': '500006_critical_temp',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_overheating-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Overheating',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_overheating',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_overvoltage-entry]
-  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.1p7k_500006_overvoltage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Overvoltage',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'overvoltage',
-    'unique_id': '500006_overvoltage',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_overvoltage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Overvoltage',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_overvoltage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_rcd_error-entry]
-  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.1p7k_500006_rcd_error',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Rcd error',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'rcd_error',
-    'unique_id': '500006_rcd_error',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_rcd_error-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Rcd error',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_rcd_error',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_relay_contacts_welded-entry]
-  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.1p7k_500006_relay_contacts_welded',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Relay contacts welded',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'contactor_failure',
-    'unique_id': '500006_contactor_failure',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_relay_contacts_welded-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Relay contacts welded',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_relay_contacts_welded',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_thermal_throttling-entry]
-  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.1p7k_500006_thermal_throttling',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Thermal throttling',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'overtemp',
-    'unique_id': '500006_overtemp',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_thermal_throttling-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Thermal throttling',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_thermal_throttling',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_undervoltage-entry]
-  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.1p7k_500006_undervoltage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Undervoltage',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'undervoltage',
-    'unique_id': '500006_undervoltage',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.1p7k_500006_undervoltage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': '1p7k_500006 Undervoltage',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.1p7k_500006_undervoltage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
diff --git a/tests/components/lektrico/snapshots/test_sensor.ambr b/tests/components/lektrico/snapshots/test_sensor.ambr
index 73ec88e6fa1..002e0b00ca8 100644
--- a/tests/components/lektrico/snapshots/test_sensor.ambr
+++ b/tests/components/lektrico/snapshots/test_sensor.ambr
@@ -381,13 +381,11 @@
     'capabilities': dict({
       'options': list([
         'available',
-        'charging',
         'connected',
-        'error',
-        'locked',
         'need_auth',
         'paused',
-        'paused_by_scheduler',
+        'charging',
+        'error',
         'updating_firmware',
       ]),
     }),
@@ -425,13 +423,11 @@
       'friendly_name': '1p7k_500006 State',
       'options': list([
         'available',
-        'charging',
         'connected',
-        'error',
-        'locked',
         'need_auth',
         'paused',
-        'paused_by_scheduler',
+        'charging',
+        'error',
         'updating_firmware',
       ]),
     }),
diff --git a/tests/components/lektrico/snapshots/test_switch.ambr b/tests/components/lektrico/snapshots/test_switch.ambr
deleted file mode 100644
index 3f4a1693315..00000000000
--- a/tests/components/lektrico/snapshots/test_switch.ambr
+++ /dev/null
@@ -1,93 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[switch.1p7k_500006_authentication-entry]
-  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.1p7k_500006_authentication',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Authentication',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'authentication',
-    'unique_id': '500006_authentication',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[switch.1p7k_500006_authentication-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': '1p7k_500006 Authentication',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.1p7k_500006_authentication',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
-# name: test_all_entities[switch.1p7k_500006_lock-entry]
-  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.1p7k_500006_lock',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Lock',
-    'platform': 'lektrico',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'lock',
-    'unique_id': '500006_lock',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[switch.1p7k_500006_lock-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': '1p7k_500006 Lock',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.1p7k_500006_lock',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/lektrico/test_binary_sensor.py b/tests/components/lektrico/test_binary_sensor.py
deleted file mode 100644
index d49eac6cc23..00000000000
--- a/tests/components/lektrico/test_binary_sensor.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""Tests for the Lektrico binary sensor platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_device: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-
-    with patch.multiple(
-        "homeassistant.components.lektrico",
-        CHARGERS_PLATFORMS=[Platform.BINARY_SENSOR],
-        LB_DEVICES_PLATFORMS=[Platform.BINARY_SENSOR],
-    ):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/lektrico/test_switch.py b/tests/components/lektrico/test_switch.py
deleted file mode 100644
index cfa693d9e44..00000000000
--- a/tests/components/lektrico/test_switch.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""Tests for the Lektrico switch platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_device: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-
-    with patch.multiple(
-        "homeassistant.components.lektrico",
-        CHARGERS_PLATFORMS=[Platform.SWITCH],
-        LB_DEVICES_PLATFORMS=[Platform.SWITCH],
-    ):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/lg_thinq/__init__.py b/tests/components/lg_thinq/__init__.py
deleted file mode 100644
index a5ba55ab1c9..00000000000
--- a/tests/components/lg_thinq/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""Tests for the LG ThinQ integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
-    """Fixture for setting up the component."""
-    config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/lg_thinq/conftest.py b/tests/components/lg_thinq/conftest.py
deleted file mode 100644
index 05cb3164137..00000000000
--- a/tests/components/lg_thinq/conftest.py
+++ /dev/null
@@ -1,110 +0,0 @@
-"""Configure tests for the LGThinQ integration."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from thinqconnect import ThinQAPIException
-
-from homeassistant.components.lg_thinq.const import CONF_CONNECT_CLIENT_ID, DOMAIN
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_COUNTRY
-
-from .const import MOCK_CONNECT_CLIENT_ID, MOCK_COUNTRY, MOCK_PAT, MOCK_UUID
-
-from tests.common import MockConfigEntry, load_json_object_fixture
-
-
-def mock_thinq_api_response(
-    *,
-    status: int = 200,
-    body: dict | None = None,
-    error_code: str | None = None,
-    error_message: str | None = None,
-) -> MagicMock:
-    """Create a mock thinq api response."""
-    response = MagicMock()
-    response.status = status
-    response.body = body
-    response.error_code = error_code
-    response.error_message = error_message
-    return response
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Create a mock config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        title=f"Test {DOMAIN}",
-        unique_id=MOCK_PAT,
-        data={
-            CONF_ACCESS_TOKEN: MOCK_PAT,
-            CONF_CONNECT_CLIENT_ID: MOCK_CONNECT_CLIENT_ID,
-            CONF_COUNTRY: MOCK_COUNTRY,
-        },
-    )
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Mock setting up a config entry."""
-    with patch(
-        "homeassistant.components.lg_thinq.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_uuid() -> Generator[AsyncMock]:
-    """Mock a uuid."""
-    with (
-        patch("uuid.uuid4", autospec=True, return_value=MOCK_UUID) as mock_uuid,
-        patch(
-            "homeassistant.components.lg_thinq.config_flow.uuid.uuid4",
-            new=mock_uuid,
-        ),
-    ):
-        yield mock_uuid.return_value
-
-
-@pytest.fixture
-def mock_thinq_api(mock_thinq_mqtt_client: AsyncMock) -> Generator[AsyncMock]:
-    """Mock a thinq api."""
-    with (
-        patch("homeassistant.components.lg_thinq.ThinQApi", autospec=True) as mock_api,
-        patch(
-            "homeassistant.components.lg_thinq.config_flow.ThinQApi",
-            new=mock_api,
-        ),
-    ):
-        thinq_api = mock_api.return_value
-        thinq_api.async_get_device_list.return_value = [
-            load_json_object_fixture("air_conditioner/device.json", DOMAIN)
-        ]
-        thinq_api.async_get_device_profile.return_value = load_json_object_fixture(
-            "air_conditioner/profile.json", DOMAIN
-        )
-        thinq_api.async_get_device_status.return_value = load_json_object_fixture(
-            "air_conditioner/status.json", DOMAIN
-        )
-        yield thinq_api
-
-
-@pytest.fixture
-def mock_thinq_mqtt_client() -> Generator[AsyncMock]:
-    """Mock a thinq api."""
-    with patch(
-        "homeassistant.components.lg_thinq.mqtt.ThinQMQTTClient", autospec=True
-    ) as mock_api:
-        yield mock_api
-
-
-@pytest.fixture
-def mock_invalid_thinq_api(mock_thinq_api: AsyncMock) -> AsyncMock:
-    """Mock an invalid thinq api."""
-    mock_thinq_api.async_get_device_list = AsyncMock(
-        side_effect=ThinQAPIException(
-            code="1309", message="Not allowed api call", headers=None
-        )
-    )
-    return mock_thinq_api
diff --git a/tests/components/lg_thinq/const.py b/tests/components/lg_thinq/const.py
deleted file mode 100644
index f46baa61c38..00000000000
--- a/tests/components/lg_thinq/const.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Constants for lgthinq test."""
-
-from typing import Final
-
-MOCK_PAT: Final[str] = "123abc4567de8f90g123h4ij56klmn789012p345rst6uvw789xy"
-MOCK_UUID: Final[str] = "1b3deabc-123d-456d-987d-2a1c7b3bdb67"
-MOCK_CONNECT_CLIENT_ID: Final[str] = f"home-assistant-{MOCK_UUID}"
-MOCK_COUNTRY: Final[str] = "KR"
diff --git a/tests/components/lg_thinq/fixtures/air_conditioner/device.json b/tests/components/lg_thinq/fixtures/air_conditioner/device.json
deleted file mode 100644
index fb931c69929..00000000000
--- a/tests/components/lg_thinq/fixtures/air_conditioner/device.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "deviceId": "MW2-2E247F93-B570-46A6-B827-920E9E10F966",
-  "deviceInfo": {
-    "deviceType": "DEVICE_AIR_CONDITIONER",
-    "modelName": "PAC_910604_WW",
-    "alias": "Test air conditioner",
-    "reportable": true
-  }
-}
diff --git a/tests/components/lg_thinq/fixtures/air_conditioner/profile.json b/tests/components/lg_thinq/fixtures/air_conditioner/profile.json
deleted file mode 100644
index 0d45dc5c9f4..00000000000
--- a/tests/components/lg_thinq/fixtures/air_conditioner/profile.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "notification": {
-    "push": ["WATER_IS_FULL"]
-  },
-  "property": {
-    "airConJobMode": {
-      "currentJobMode": {
-        "mode": ["r", "w"],
-        "type": "enum",
-        "value": {
-          "r": ["AIR_CLEAN", "COOL", "AIR_DRY"],
-          "w": ["AIR_CLEAN", "COOL", "AIR_DRY"]
-        }
-      }
-    },
-    "airFlow": {
-      "windStrength": {
-        "mode": ["r", "w"],
-        "type": "enum",
-        "value": {
-          "r": ["LOW", "HIGH", "MID"],
-          "w": ["LOW", "HIGH", "MID"]
-        }
-      }
-    },
-    "airQualitySensor": {
-      "PM1": {
-        "mode": ["r"],
-        "type": "number"
-      },
-      "PM10": {
-        "mode": ["r"],
-        "type": "number"
-      },
-      "PM2": {
-        "mode": ["r"],
-        "type": "number"
-      },
-      "humidity": {
-        "mode": ["r"],
-        "type": "number"
-      },
-      "monitoringEnabled": {
-        "mode": ["r", "w"],
-        "type": "enum",
-        "value": {
-          "r": ["ON_WORKING", "ALWAYS"],
-          "w": ["ON_WORKING", "ALWAYS"]
-        }
-      },
-      "oder": {
-        "mode": ["r"],
-        "type": "number"
-      },
-      "totalPollution": {
-        "mode": ["r"],
-        "type": "number"
-      }
-    },
-    "operation": {
-      "airCleanOperationMode": {
-        "mode": ["w"],
-        "type": "enum",
-        "value": {
-          "w": ["START", "STOP"]
-        }
-      },
-      "airConOperationMode": {
-        "mode": ["r", "w"],
-        "type": "enum",
-        "value": {
-          "r": ["POWER_ON", "POWER_OFF"],
-          "w": ["POWER_ON", "POWER_OFF"]
-        }
-      }
-    },
-    "powerSave": {
-      "powerSaveEnabled": {
-        "mode": ["r", "w"],
-        "type": "boolean",
-        "value": {
-          "r": [false, true],
-          "w": [false, true]
-        }
-      }
-    },
-    "temperature": {
-      "coolTargetTemperature": {
-        "mode": ["w"],
-        "type": "range",
-        "value": {
-          "w": {
-            "max": 30,
-            "min": 18,
-            "step": 1
-          }
-        }
-      },
-      "currentTemperature": {
-        "mode": ["r"],
-        "type": "number"
-      },
-      "targetTemperature": {
-        "mode": ["r", "w"],
-        "type": "range",
-        "value": {
-          "r": {
-            "max": 30,
-            "min": 18,
-            "step": 1
-          },
-          "w": {
-            "max": 30,
-            "min": 18,
-            "step": 1
-          }
-        }
-      },
-      "unit": {
-        "mode": ["r"],
-        "type": "enum",
-        "value": {
-          "r": ["C", "F"]
-        }
-      }
-    },
-    "timer": {
-      "relativeHourToStart": {
-        "mode": ["r", "w"],
-        "type": "number"
-      },
-      "relativeHourToStop": {
-        "mode": ["r", "w"],
-        "type": "number"
-      },
-      "relativeMinuteToStart": {
-        "mode": ["r", "w"],
-        "type": "number"
-      },
-      "relativeMinuteToStop": {
-        "mode": ["r", "w"],
-        "type": "number"
-      },
-      "absoluteHourToStart": {
-        "mode": ["r", "w"],
-        "type": "number"
-      },
-      "absoluteMinuteToStart": {
-        "mode": ["r", "w"],
-        "type": "number"
-      }
-    }
-  }
-}
diff --git a/tests/components/lg_thinq/fixtures/air_conditioner/status.json b/tests/components/lg_thinq/fixtures/air_conditioner/status.json
deleted file mode 100644
index 90d15d1ae16..00000000000
--- a/tests/components/lg_thinq/fixtures/air_conditioner/status.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "airConJobMode": {
-    "currentJobMode": "COOL"
-  },
-  "airFlow": {
-    "windStrength": "MID"
-  },
-  "airQualitySensor": {
-    "PM1": 12,
-    "PM10": 7,
-    "PM2": 24,
-    "humidity": 40,
-    "monitoringEnabled": "ON_WORKING",
-    "totalPollution": 3,
-    "totalPollutionLevel": "GOOD"
-  },
-  "filterInfo": {
-    "filterLifetime": 540,
-    "usedTime": 180
-  },
-  "operation": {
-    "airConOperationMode": "POWER_ON"
-  },
-  "powerSave": {
-    "powerSaveEnabled": false
-  },
-  "sleepTimer": {
-    "relativeStopTimer": "UNSET"
-  },
-  "temperature": {
-    "currentTemperature": 25,
-    "targetTemperature": 19,
-    "unit": "C"
-  },
-  "timer": {
-    "relativeStartTimer": "UNSET",
-    "relativeStopTimer": "UNSET",
-    "absoluteStartTimer": "SET",
-    "absoluteStopTimer": "UNSET",
-    "absoluteHourToStart": 13,
-    "absoluteMinuteToStart": 14
-  }
-}
diff --git a/tests/components/lg_thinq/snapshots/test_climate.ambr b/tests/components/lg_thinq/snapshots/test_climate.ambr
deleted file mode 100644
index e9470c3de03..00000000000
--- a/tests/components/lg_thinq/snapshots/test_climate.ambr
+++ /dev/null
@@ -1,86 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[climate.test_air_conditioner-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'fan_modes': list([
-        'low',
-        'high',
-        'mid',
-      ]),
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.COOL: 'cool'>,
-        <HVACMode.DRY: 'dry'>,
-      ]),
-      'max_temp': 30,
-      'min_temp': 18,
-      'preset_modes': list([
-        'air_clean',
-      ]),
-      'target_temp_step': 1,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'climate',
-    'entity_category': None,
-    'entity_id': 'climate.test_air_conditioner',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': <ClimateEntityFeature: 409>,
-    'translation_key': <ExtendedProperty.CLIMATE_AIR_CONDITIONER: 'climate_air_conditioner'>,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_climate_air_conditioner',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[climate.test_air_conditioner-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_humidity': 40,
-      'current_temperature': 25,
-      'fan_mode': 'mid',
-      'fan_modes': list([
-        'low',
-        'high',
-        'mid',
-      ]),
-      'friendly_name': 'Test air conditioner',
-      'hvac_modes': list([
-        <HVACMode.OFF: 'off'>,
-        <HVACMode.COOL: 'cool'>,
-        <HVACMode.DRY: 'dry'>,
-      ]),
-      'max_temp': 30,
-      'min_temp': 18,
-      'preset_mode': None,
-      'preset_modes': list([
-        'air_clean',
-      ]),
-      'supported_features': <ClimateEntityFeature: 409>,
-      'target_temp_step': 1,
-      'temperature': 19,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.test_air_conditioner',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'cool',
-  })
-# ---
diff --git a/tests/components/lg_thinq/snapshots/test_event.ambr b/tests/components/lg_thinq/snapshots/test_event.ambr
deleted file mode 100644
index 025f4496aeb..00000000000
--- a/tests/components/lg_thinq/snapshots/test_event.ambr
+++ /dev/null
@@ -1,55 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[event.test_air_conditioner_notification-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'event_types': list([
-        'water_is_full',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'event',
-    'entity_category': None,
-    'entity_id': 'event.test_air_conditioner_notification',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Notification',
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <ThinQPropertyEx.NOTIFICATION: 'notification'>,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_notification',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[event.test_air_conditioner_notification-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'event_type': None,
-      'event_types': list([
-        'water_is_full',
-      ]),
-      'friendly_name': 'Test air conditioner Notification',
-    }),
-    'context': <ANY>,
-    'entity_id': 'event.test_air_conditioner_notification',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
diff --git a/tests/components/lg_thinq/snapshots/test_number.ambr b/tests/components/lg_thinq/snapshots/test_number.ambr
deleted file mode 100644
index 68f01854501..00000000000
--- a/tests/components/lg_thinq/snapshots/test_number.ambr
+++ /dev/null
@@ -1,113 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[number.test_air_conditioner_schedule_turn_off-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'max': 100.0,
-      'min': 0.0,
-      'mode': <NumberMode.BOX: 'box'>,
-      'step': 1.0,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'number',
-    'entity_category': None,
-    'entity_id': 'number.test_air_conditioner_schedule_turn_off',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Schedule turn-off',
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <Property.RELATIVE_HOUR_TO_STOP: 'relative_hour_to_stop'>,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_relative_hour_to_stop',
-    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
-  })
-# ---
-# name: test_all_entities[number.test_air_conditioner_schedule_turn_off-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Test air conditioner Schedule turn-off',
-      'max': 100.0,
-      'min': 0.0,
-      'mode': <NumberMode.BOX: 'box'>,
-      'step': 1.0,
-      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'number.test_air_conditioner_schedule_turn_off',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_all_entities[number.test_air_conditioner_schedule_turn_on-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'max': 100.0,
-      'min': 0.0,
-      'mode': <NumberMode.BOX: 'box'>,
-      'step': 1.0,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'number',
-    'entity_category': None,
-    'entity_id': 'number.test_air_conditioner_schedule_turn_on',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Schedule turn-on',
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <Property.RELATIVE_HOUR_TO_START: 'relative_hour_to_start'>,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_relative_hour_to_start',
-    'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
-  })
-# ---
-# name: test_all_entities[number.test_air_conditioner_schedule_turn_on-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Test air conditioner Schedule turn-on',
-      'max': 100.0,
-      'min': 0.0,
-      'mode': <NumberMode.BOX: 'box'>,
-      'step': 1.0,
-      'unit_of_measurement': <UnitOfTime.HOURS: 'h'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'number.test_air_conditioner_schedule_turn_on',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
diff --git a/tests/components/lg_thinq/snapshots/test_sensor.ambr b/tests/components/lg_thinq/snapshots/test_sensor.ambr
deleted file mode 100644
index 387df916eba..00000000000
--- a/tests/components/lg_thinq/snapshots/test_sensor.ambr
+++ /dev/null
@@ -1,205 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[sensor.test_air_conditioner_humidity-entry]
-  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.test_air_conditioner_humidity',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.HUMIDITY: 'humidity'>,
-    'original_icon': None,
-    'original_name': 'Humidity',
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_humidity',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_all_entities[sensor.test_air_conditioner_humidity-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'humidity',
-      'friendly_name': 'Test air conditioner Humidity',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_air_conditioner_humidity',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '40',
-  })
-# ---
-# name: test_all_entities[sensor.test_air_conditioner_pm1-entry]
-  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.test_air_conditioner_pm1',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.PM1: 'pm1'>,
-    'original_icon': None,
-    'original_name': 'PM1',
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_pm1',
-    'unit_of_measurement': 'µg/m³',
-  })
-# ---
-# name: test_all_entities[sensor.test_air_conditioner_pm1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'pm1',
-      'friendly_name': 'Test air conditioner PM1',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'µg/m³',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_air_conditioner_pm1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '12',
-  })
-# ---
-# name: test_all_entities[sensor.test_air_conditioner_pm10-entry]
-  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.test_air_conditioner_pm10',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.PM10: 'pm10'>,
-    'original_icon': None,
-    'original_name': 'PM10',
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_pm10',
-    'unit_of_measurement': 'µg/m³',
-  })
-# ---
-# name: test_all_entities[sensor.test_air_conditioner_pm10-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'pm10',
-      'friendly_name': 'Test air conditioner PM10',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'µg/m³',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_air_conditioner_pm10',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '7',
-  })
-# ---
-# name: test_all_entities[sensor.test_air_conditioner_pm2_5-entry]
-  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.test_air_conditioner_pm2_5',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.PM25: 'pm25'>,
-    'original_icon': None,
-    'original_name': 'PM2.5',
-    'platform': 'lg_thinq',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'MW2-2E247F93-B570-46A6-B827-920E9E10F966_pm2',
-    'unit_of_measurement': 'µg/m³',
-  })
-# ---
-# name: test_all_entities[sensor.test_air_conditioner_pm2_5-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'pm25',
-      'friendly_name': 'Test air conditioner PM2.5',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'µg/m³',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_air_conditioner_pm2_5',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '24',
-  })
-# ---
diff --git a/tests/components/lg_thinq/test_climate.py b/tests/components/lg_thinq/test_climate.py
deleted file mode 100644
index 24ed3ad230d..00000000000
--- a/tests/components/lg_thinq/test_climate.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Tests for the LG Thinq climate platform."""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_thinq_api: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.lg_thinq.PLATFORMS", [Platform.CLIMATE]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/lg_thinq/test_config_flow.py b/tests/components/lg_thinq/test_config_flow.py
deleted file mode 100644
index e7ee632810e..00000000000
--- a/tests/components/lg_thinq/test_config_flow.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""Test the lgthinq config flow."""
-
-from unittest.mock import AsyncMock
-
-from homeassistant.components.lg_thinq.const import CONF_CONNECT_CLIENT_ID, DOMAIN
-from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_COUNTRY
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from .const import MOCK_CONNECT_CLIENT_ID, MOCK_COUNTRY, MOCK_PAT
-
-from tests.common import MockConfigEntry
-
-
-async def test_config_flow(
-    hass: HomeAssistant,
-    mock_thinq_api: AsyncMock,
-    mock_uuid: AsyncMock,
-    mock_setup_entry: AsyncMock,
-) -> None:
-    """Test that an thinq entry is normally created."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={CONF_ACCESS_TOKEN: MOCK_PAT, CONF_COUNTRY: MOCK_COUNTRY},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] == {
-        CONF_ACCESS_TOKEN: MOCK_PAT,
-        CONF_COUNTRY: MOCK_COUNTRY,
-        CONF_CONNECT_CLIENT_ID: MOCK_CONNECT_CLIENT_ID,
-    }
-
-    mock_thinq_api.async_get_device_list.assert_called_once()
-
-
-async def test_config_flow_invalid_pat(
-    hass: HomeAssistant, mock_invalid_thinq_api: AsyncMock
-) -> None:
-    """Test that an thinq flow should be aborted with an invalid PAT."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_ACCESS_TOKEN: MOCK_PAT, CONF_COUNTRY: MOCK_COUNTRY},
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "token_unauthorized"}
-    mock_invalid_thinq_api.async_get_device_list.assert_called_once()
-
-
-async def test_config_flow_already_configured(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_thinq_api: AsyncMock
-) -> None:
-    """Test that thinq flow should be aborted when already configured."""
-    mock_config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_ACCESS_TOKEN: MOCK_PAT, CONF_COUNTRY: MOCK_COUNTRY},
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
diff --git a/tests/components/lg_thinq/test_event.py b/tests/components/lg_thinq/test_event.py
deleted file mode 100644
index bea758cb943..00000000000
--- a/tests/components/lg_thinq/test_event.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Tests for the LG Thinq event platform."""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_thinq_api: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.lg_thinq.PLATFORMS", [Platform.EVENT]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/lg_thinq/test_init.py b/tests/components/lg_thinq/test_init.py
deleted file mode 100644
index 7da7e79fec0..00000000000
--- a/tests/components/lg_thinq/test_init.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""Tests for the LG ThinQ integration."""
-
-from unittest.mock import AsyncMock
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def test_load_unload_entry(
-    hass: HomeAssistant,
-    mock_thinq_api: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test load and unload entry."""
-    mock_config_entry.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    await hass.config_entries.async_remove(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/lg_thinq/test_number.py b/tests/components/lg_thinq/test_number.py
deleted file mode 100644
index e578e4eba7a..00000000000
--- a/tests/components/lg_thinq/test_number.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Tests for the LG Thinq number platform."""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_thinq_api: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.lg_thinq.PLATFORMS", [Platform.NUMBER]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/lg_thinq/test_sensor.py b/tests/components/lg_thinq/test_sensor.py
deleted file mode 100644
index 02b91b4771b..00000000000
--- a/tests/components/lg_thinq/test_sensor.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Tests for the LG Thinq sensor platform."""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_thinq_api: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.lg_thinq.PLATFORMS", [Platform.SENSOR]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/lidarr/conftest.py b/tests/components/lidarr/conftest.py
index bd87fa947bc..1024aadc403 100644
--- a/tests/components/lidarr/conftest.py
+++ b/tests/components/lidarr/conftest.py
@@ -44,12 +44,10 @@ def mock_error(
         aioclient_mock.get(f"{API_URL}/rootfolder", status=status)
         aioclient_mock.get(f"{API_URL}/system/status", status=status)
         aioclient_mock.get(f"{API_URL}/wanted/missing", status=status)
-        aioclient_mock.get(f"{API_URL}/album", status=status)
     aioclient_mock.get(f"{API_URL}/queue", exc=ClientError)
     aioclient_mock.get(f"{API_URL}/rootfolder", exc=ClientError)
     aioclient_mock.get(f"{API_URL}/system/status", exc=ClientError)
     aioclient_mock.get(f"{API_URL}/wanted/missing", exc=ClientError)
-    aioclient_mock.get(f"{API_URL}/album", exc=ClientError)
 
 
 @pytest.fixture
@@ -117,11 +115,6 @@ def mock_connection(aioclient_mock: AiohttpClientMocker) -> None:
         text=load_fixture("lidarr/wanted-missing.json"),
         headers={"Content-Type": CONTENT_TYPE_JSON},
     )
-    aioclient_mock.get(
-        f"{API_URL}/album",
-        text=load_fixture("lidarr/album.json"),
-        headers={"Content-Type": CONTENT_TYPE_JSON},
-    )
     aioclient_mock.get(
         f"{API_URL}/rootfolder",
         text=load_fixture("lidarr/rootfolder-linux.json"),
diff --git a/tests/components/lidarr/fixtures/album.json b/tests/components/lidarr/fixtures/album.json
deleted file mode 100644
index d257cabf1f1..00000000000
--- a/tests/components/lidarr/fixtures/album.json
+++ /dev/null
@@ -1,155 +0,0 @@
-[
-  {
-    "id": 0,
-    "title": "string",
-    "disambiguation": "string",
-    "overview": "string",
-    "artistId": 0,
-    "foreignAlbumId": "string",
-    "monitored": true,
-    "anyReleaseOk": true,
-    "profileId": 0,
-    "duration": 0,
-    "albumType": "string",
-    "secondaryTypes": ["string"],
-    "mediumCount": 0,
-    "ratings": {
-      "votes": 0,
-      "value": 0
-    },
-    "releaseDate": "2024-09-09T20:16:28.493Z",
-    "releases": [
-      {
-        "id": 0,
-        "albumId": 0,
-        "foreignReleaseId": "string",
-        "title": "string",
-        "status": "string",
-        "duration": 0,
-        "trackCount": 0,
-        "media": [
-          {
-            "mediumNumber": 0,
-            "mediumName": "string",
-            "mediumFormat": "string"
-          }
-        ],
-        "mediumCount": 0,
-        "disambiguation": "string",
-        "country": ["string"],
-        "label": ["string"],
-        "format": "string",
-        "monitored": true
-      }
-    ],
-    "genres": ["string"],
-    "media": [
-      {
-        "mediumNumber": 0,
-        "mediumName": "string",
-        "mediumFormat": "string"
-      }
-    ],
-    "artist": {
-      "id": 0,
-      "status": "continuing",
-      "ended": true,
-      "artistName": "string",
-      "foreignArtistId": "string",
-      "mbId": "string",
-      "tadbId": 0,
-      "discogsId": 0,
-      "allMusicId": "string",
-      "overview": "string",
-      "artistType": "string",
-      "disambiguation": "string",
-      "links": [
-        {
-          "url": "string",
-          "name": "string"
-        }
-      ],
-      "nextAlbum": "string",
-      "lastAlbum": "string",
-      "images": [
-        {
-          "url": "string",
-          "coverType": "unknown",
-          "extension": "string",
-          "remoteUrl": "string"
-        }
-      ],
-      "members": [
-        {
-          "name": "string",
-          "instrument": "string",
-          "images": [
-            {
-              "url": "string",
-              "coverType": "unknown",
-              "extension": "string",
-              "remoteUrl": "string"
-            }
-          ]
-        }
-      ],
-      "remotePoster": "string",
-      "path": "string",
-      "qualityProfileId": 0,
-      "metadataProfileId": 0,
-      "monitored": true,
-      "monitorNewItems": "all",
-      "rootFolderPath": "string",
-      "folder": "string",
-      "genres": ["string"],
-      "cleanName": "string",
-      "sortName": "string",
-      "tags": [0],
-      "added": "2024-09-09T20:16:28.493Z",
-      "addOptions": {
-        "monitor": "all",
-        "albumsToMonitor": ["string"],
-        "monitored": true,
-        "searchForMissingAlbums": true
-      },
-      "ratings": {
-        "votes": 0,
-        "value": 0
-      },
-      "statistics": {
-        "albumCount": 0,
-        "trackFileCount": 0,
-        "trackCount": 0,
-        "totalTrackCount": 0,
-        "sizeOnDisk": 0,
-        "percentOfTracks": 0
-      }
-    },
-    "images": [
-      {
-        "url": "string",
-        "coverType": "unknown",
-        "extension": "string",
-        "remoteUrl": "string"
-      }
-    ],
-    "links": [
-      {
-        "url": "string",
-        "name": "string"
-      }
-    ],
-    "statistics": {
-      "trackFileCount": 0,
-      "trackCount": 0,
-      "totalTrackCount": 0,
-      "sizeOnDisk": 0,
-      "percentOfTracks": 0
-    },
-    "addOptions": {
-      "addType": "automatic",
-      "searchForNewAlbum": true
-    },
-    "remoteCover": "string"
-  }
-]
diff --git a/tests/components/lidarr/test_sensor.py b/tests/components/lidarr/test_sensor.py
index 716df21303a..0c19355a252 100644
--- a/tests/components/lidarr/test_sensor.py
+++ b/tests/components/lidarr/test_sensor.py
@@ -25,14 +25,10 @@ async def test_sensors(
     assert state.state == "2"
     assert state.attributes.get("string") == "stopped"
     assert state.attributes.get("string2") == "downloading"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "albums"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Albums"
     assert state.attributes.get(CONF_STATE_CLASS) == SensorStateClass.TOTAL
     state = hass.states.get("sensor.mock_title_wanted")
     assert state.state == "1"
     assert state.attributes.get("test") == "test"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "albums"
-    assert state.attributes.get(CONF_STATE_CLASS) == SensorStateClass.TOTAL
-    state = hass.states.get("sensor.mock_title_albums")
-    assert state.state == "1"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "albums"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "Albums"
     assert state.attributes.get(CONF_STATE_CLASS) == SensorStateClass.TOTAL
diff --git a/tests/components/linkplay/__init__.py b/tests/components/linkplay/__init__.py
index f825826f196..5962f7fdaba 100644
--- a/tests/components/linkplay/__init__.py
+++ b/tests/components/linkplay/__init__.py
@@ -1,16 +1 @@
 """Tests for the LinkPlay integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Fixture for setting up the component."""
-    config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/linkplay/conftest.py b/tests/components/linkplay/conftest.py
index 81ae993f6c3..be83dd2412d 100644
--- a/tests/components/linkplay/conftest.py
+++ b/tests/components/linkplay/conftest.py
@@ -1,22 +1,12 @@
 """Test configuration and mocks for LinkPlay component."""
 
-from collections.abc import Generator, Iterator
-from contextlib import contextmanager
-from typing import Any
-from unittest import mock
+from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
 from aiohttp import ClientSession
 from linkplay.bridge import LinkPlayBridge, LinkPlayDevice
 import pytest
 
-from homeassistant.components.linkplay.const import DOMAIN
-from homeassistant.const import CONF_HOST, EVENT_HOMEASSISTANT_CLOSE
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry, load_fixture
-from tests.conftest import AiohttpClientMocker
-
 HOST = "10.0.0.150"
 HOST_REENTRY = "10.0.0.66"
 UUID = "FF31F09E-5001-FBDE-0546-2DBFFF31F09E"
@@ -34,15 +24,15 @@ def mock_linkplay_factory_bridge() -> Generator[AsyncMock]:
         ),
         patch(
             "homeassistant.components.linkplay.config_flow.linkplay_factory_httpapi_bridge",
-        ) as conf_factory,
+        ) as factory,
     ):
         bridge = AsyncMock(spec=LinkPlayBridge)
         bridge.endpoint = HOST
         bridge.device = AsyncMock(spec=LinkPlayDevice)
         bridge.device.uuid = UUID
         bridge.device.name = NAME
-        conf_factory.return_value = bridge
-        yield conf_factory
+        factory.return_value = bridge
+        yield factory
 
 
 @pytest.fixture
@@ -53,55 +43,3 @@ def mock_setup_entry() -> Generator[AsyncMock]:
         return_value=True,
     ) as mock_setup_entry:
         yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Mock a config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        title=NAME,
-        data={CONF_HOST: HOST},
-        unique_id=UUID,
-    )
-
-
-@pytest.fixture
-def mock_player_ex(
-    mock_player_ex: AsyncMock,
-) -> AsyncMock:
-    """Mock a update_status of the LinkPlayPlayer."""
-    mock_player_ex.return_value = load_fixture("getPlayerEx.json", DOMAIN)
-    return mock_player_ex
-
-
-@pytest.fixture
-def mock_status_ex(
-    mock_status_ex: AsyncMock,
-) -> AsyncMock:
-    """Mock a update_status of the LinkPlayDevice."""
-    mock_status_ex.return_value = load_fixture("getStatusEx.json", DOMAIN)
-    return mock_status_ex
-
-
-@contextmanager
-def mock_lp_aiohttp_client() -> Iterator[AiohttpClientMocker]:
-    """Context manager to mock aiohttp client."""
-    mocker = AiohttpClientMocker()
-
-    def create_session(hass: HomeAssistant, *args: Any, **kwargs: Any) -> ClientSession:
-        session = mocker.create_session(hass.loop)
-
-        async def close_session(event):
-            """Close session."""
-            await session.close()
-
-        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_CLOSE, close_session)
-
-        return session
-
-    with mock.patch(
-        "homeassistant.components.linkplay.async_get_client_session",
-        side_effect=create_session,
-    ):
-        yield mocker
diff --git a/tests/components/linkplay/fixtures/getPlayerEx.json b/tests/components/linkplay/fixtures/getPlayerEx.json
deleted file mode 100644
index 79d09f942df..00000000000
--- a/tests/components/linkplay/fixtures/getPlayerEx.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "type": "0",
-  "ch": "0",
-  "mode": "0",
-  "loop": "0",
-  "eq": "0",
-  "status": "stop",
-  "curpos": "0",
-  "offset_pts": "0",
-  "totlen": "0",
-  "Title": "",
-  "Artist": "",
-  "Album": "",
-  "alarmflag": "0",
-  "plicount": "0",
-  "plicurr": "0",
-  "vol": "80",
-  "mute": "0"
-}
diff --git a/tests/components/linkplay/fixtures/getStatusEx.json b/tests/components/linkplay/fixtures/getStatusEx.json
deleted file mode 100644
index 17eda4aeee8..00000000000
--- a/tests/components/linkplay/fixtures/getStatusEx.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "uuid": "FF31F09E5001FBDE05462DBFFF31F09E",
-  "DeviceName": "Smart Zone 1_54B9",
-  "GroupName": "Smart Zone 1_54B9",
-  "ssid": "Smart Zone 1_54B9",
-  "language": "en_us",
-  "firmware": "4.6.415145",
-  "hardware": "A31",
-  "build": "release",
-  "project": "SMART_ZONE4_AMP",
-  "priv_prj": "SMART_ZONE4_AMP",
-  "project_build_name": "a31rakoit",
-  "Release": "20220427",
-  "temp_uuid": "97296CE38DE8CC3D",
-  "hideSSID": "1",
-  "SSIDStrategy": "2",
-  "branch": "A31_stable_4.6",
-  "group": "0",
-  "wmrm_version": "4.2",
-  "internet": "1",
-  "MAC": "00:22:6C:21:7F:1D",
-  "STA_MAC": "00:00:00:00:00:00",
-  "CountryCode": "CN",
-  "CountryRegion": "1",
-  "netstat": "0",
-  "essid": "",
-  "apcli0": "",
-  "eth2": "192.168.168.197",
-  "ra0": "10.10.10.254",
-  "eth_dhcp": "1",
-  "VersionUpdate": "0",
-  "NewVer": "0",
-  "set_dns_enable": "1",
-  "mcu_ver": "37",
-  "mcu_ver_new": "0",
-  "dsp_ver": "0",
-  "dsp_ver_new": "0",
-  "date": "2024:10:29",
-  "time": "17:13:22",
-  "tz": "1.0000",
-  "dst_enable": "1",
-  "region": "unknown",
-  "prompt_status": "1",
-  "iot_ver": "1.0.0",
-  "upnp_version": "1005",
-  "cap1": "0x305200",
-  "capability": "0x28e90b80",
-  "languages": "0x6",
-  "streams_all": "0x7bff7ffe",
-  "streams": "0x7b9831fe",
-  "external": "0x0",
-  "plm_support": "0x40152",
-  "preset_key": "10",
-  "spotify_active": "0",
-  "lbc_support": "0",
-  "privacy_mode": "0",
-  "WifiChannel": "11",
-  "RSSI": "0",
-  "BSSID": "",
-  "battery": "0",
-  "battery_percent": "0",
-  "securemode": "1",
-  "auth": "WPAPSKWPA2PSK",
-  "encry": "AES",
-  "upnp_uuid": "uuid:FF31F09E-5001-FBDE-0546-2DBFFF31F09E",
-  "uart_pass_port": "8899",
-  "communication_port": "8819",
-  "web_firmware_update_hide": "0",
-  "ignore_talkstart": "0",
-  "web_login_result": "-1",
-  "silenceOTATime": "",
-  "ignore_silenceOTATime": "1",
-  "new_tunein_preset_and_alarm": "1",
-  "iheartradio_new": "1",
-  "new_iheart_podcast": "1",
-  "tidal_version": "2.0",
-  "service_version": "1.0",
-  "ETH_MAC": "00:22:6C:21:7F:20",
-  "security": "https/2.0",
-  "security_version": "2.0"
-}
diff --git a/tests/components/linkplay/snapshots/test_diagnostics.ambr b/tests/components/linkplay/snapshots/test_diagnostics.ambr
deleted file mode 100644
index d8c52a25649..00000000000
--- a/tests/components/linkplay/snapshots/test_diagnostics.ambr
+++ /dev/null
@@ -1,115 +0,0 @@
-# serializer version: 1
-# name: test_diagnostics
-  dict({
-    'device_info': dict({
-      'device': dict({
-        'properties': dict({
-          'BSSID': '',
-          'CountryCode': 'CN',
-          'CountryRegion': '1',
-          'DeviceName': 'Smart Zone 1_54B9',
-          'ETH_MAC': '00:22:6C:21:7F:20',
-          'GroupName': 'Smart Zone 1_54B9',
-          'MAC': '00:22:6C:21:7F:1D',
-          'NewVer': '0',
-          'RSSI': '0',
-          'Release': '20220427',
-          'SSIDStrategy': '2',
-          'STA_MAC': '00:00:00:00:00:00',
-          'VersionUpdate': '0',
-          'WifiChannel': '11',
-          'apcli0': '',
-          'auth': 'WPAPSKWPA2PSK',
-          'battery': '0',
-          'battery_percent': '0',
-          'branch': 'A31_stable_4.6',
-          'build': 'release',
-          'cap1': '0x305200',
-          'capability': '0x28e90b80',
-          'communication_port': '8819',
-          'date': '2024:10:29',
-          'dsp_ver': '0',
-          'dsp_ver_new': '0',
-          'dst_enable': '1',
-          'encry': 'AES',
-          'essid': '',
-          'eth2': '192.168.168.197',
-          'eth_dhcp': '1',
-          'external': '0x0',
-          'firmware': '4.6.415145',
-          'group': '0',
-          'hardware': 'A31',
-          'hideSSID': '1',
-          'ignore_silenceOTATime': '1',
-          'ignore_talkstart': '0',
-          'iheartradio_new': '1',
-          'internet': '1',
-          'iot_ver': '1.0.0',
-          'language': 'en_us',
-          'languages': '0x6',
-          'lbc_support': '0',
-          'mcu_ver': '37',
-          'mcu_ver_new': '0',
-          'netstat': '0',
-          'new_iheart_podcast': '1',
-          'new_tunein_preset_and_alarm': '1',
-          'plm_support': '0x40152',
-          'preset_key': '10',
-          'priv_prj': 'SMART_ZONE4_AMP',
-          'privacy_mode': '0',
-          'project': 'SMART_ZONE4_AMP',
-          'project_build_name': 'a31rakoit',
-          'prompt_status': '1',
-          'ra0': '10.10.10.254',
-          'region': 'unknown',
-          'securemode': '1',
-          'security': 'https/2.0',
-          'security_version': '2.0',
-          'service_version': '1.0',
-          'set_dns_enable': '1',
-          'silenceOTATime': '',
-          'spotify_active': '0',
-          'ssid': 'Smart Zone 1_54B9',
-          'streams': '0x7b9831fe',
-          'streams_all': '0x7bff7ffe',
-          'temp_uuid': '97296CE38DE8CC3D',
-          'tidal_version': '2.0',
-          'time': '17:13:22',
-          'tz': '1.0000',
-          'uart_pass_port': '8899',
-          'upnp_uuid': 'uuid:FF31F09E-5001-FBDE-0546-2DBFFF31F09E',
-          'upnp_version': '1005',
-          'uuid': 'FF31F09E5001FBDE05462DBFFF31F09E',
-          'web_firmware_update_hide': '0',
-          'web_login_result': '-1',
-          'wmrm_version': '4.2',
-        }),
-      }),
-      'endpoint': dict({
-        'endpoint': 'https://10.0.0.150',
-      }),
-      'multiroom': None,
-      'player': dict({
-        'properties': dict({
-          'Album': '',
-          'Artist': '',
-          'Title': '',
-          'alarmflag': '0',
-          'ch': '0',
-          'curpos': '0',
-          'eq': '0',
-          'loop': '0',
-          'mode': '0',
-          'mute': '0',
-          'offset_pts': '0',
-          'plicount': '0',
-          'plicurr': '0',
-          'status': 'stop',
-          'totlen': '0',
-          'type': '0',
-          'vol': '80',
-        }),
-      }),
-    }),
-  })
-# ---
diff --git a/tests/components/linkplay/test_diagnostics.py b/tests/components/linkplay/test_diagnostics.py
deleted file mode 100644
index 369142978a3..00000000000
--- a/tests/components/linkplay/test_diagnostics.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""Tests for the LinkPlay diagnostics."""
-
-from unittest.mock import patch
-
-from linkplay.bridge import LinkPlayMultiroom
-from linkplay.consts import API_ENDPOINT
-from linkplay.endpoint import LinkPlayApiEndpoint
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.linkplay.const import DOMAIN
-from homeassistant.core import HomeAssistant
-
-from . import setup_integration
-from .conftest import HOST, mock_lp_aiohttp_client
-
-from tests.common import MockConfigEntry, load_fixture
-from tests.components.diagnostics import get_diagnostics_for_config_entry
-from tests.typing import ClientSessionGenerator
-
-
-async def test_diagnostics(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    mock_config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test diagnostics."""
-
-    with (
-        mock_lp_aiohttp_client() as mock_session,
-        patch.object(LinkPlayMultiroom, "update_status", return_value=None),
-    ):
-        endpoints = [
-            LinkPlayApiEndpoint(protocol="https", endpoint=HOST, session=None),
-            LinkPlayApiEndpoint(protocol="http", endpoint=HOST, session=None),
-        ]
-        for endpoint in endpoints:
-            mock_session.get(
-                API_ENDPOINT.format(str(endpoint), "getPlayerStatusEx"),
-                text=load_fixture("getPlayerEx.json", DOMAIN),
-            )
-
-            mock_session.get(
-                API_ENDPOINT.format(str(endpoint), "getStatusEx"),
-                text=load_fixture("getStatusEx.json", DOMAIN),
-            )
-
-        await setup_integration(hass, mock_config_entry)
-
-        assert (
-            await get_diagnostics_for_config_entry(hass, hass_client, mock_config_entry)
-            == snapshot
-        )
diff --git a/tests/components/locative/test_init.py b/tests/components/locative/test_init.py
index c41db68e3d6..89d26ea6c7a 100644
--- a/tests/components/locative/test_init.py
+++ b/tests/components/locative/test_init.py
@@ -11,8 +11,8 @@ from homeassistant.components import locative
 from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
 from homeassistant.components.device_tracker.legacy import Device
 from homeassistant.components.locative import DOMAIN, TRACKER_UPDATE
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.dispatcher import DATA_DISPATCHER
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/lovelace/test_cast.py b/tests/components/lovelace/test_cast.py
index dc57975701d..c54b31d9297 100644
--- a/tests/components/lovelace/test_cast.py
+++ b/tests/components/lovelace/test_cast.py
@@ -8,8 +8,8 @@ import pytest
 
 from homeassistant.components.lovelace import cast as lovelace_cast
 from homeassistant.components.media_player import MediaClass
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/mailgun/test_init.py b/tests/components/mailgun/test_init.py
index 7dbde02b10f..2e60c56faa4 100644
--- a/tests/components/mailgun/test_init.py
+++ b/tests/components/mailgun/test_init.py
@@ -8,9 +8,9 @@ import pytest
 
 from homeassistant import config_entries
 from homeassistant.components import mailgun, webhook
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import CONF_API_KEY, CONF_DOMAIN
 from homeassistant.core import Event, HomeAssistant, callback
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/manual/test_alarm_control_panel.py b/tests/components/manual/test_alarm_control_panel.py
index 9fc92cd5458..7900dfd1c91 100644
--- a/tests/components/manual/test_alarm_control_panel.py
+++ b/tests/components/manual/test_alarm_control_panel.py
@@ -7,10 +7,7 @@ from freezegun import freeze_time
 import pytest
 
 from homeassistant.components import alarm_control_panel
-from homeassistant.components.alarm_control_panel import (
-    AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import AlarmControlPanelEntityFeature
 from homeassistant.components.demo import alarm_control_panel as demo
 from homeassistant.components.manual.alarm_control_panel import (
     ATTR_NEXT_STATE,
@@ -24,6 +21,15 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_ARM_NIGHT,
     SERVICE_ALARM_ARM_VACATION,
+    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_PENDING,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.exceptions import ServiceValidationError
@@ -47,14 +53,11 @@ async def test_setup_demo_platform(hass: HomeAssistant) -> None:
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_no_pending(hass: HomeAssistant, service, expected_state) -> None:
@@ -76,7 +79,7 @@ async def test_no_pending(hass: HomeAssistant, service, expected_state) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -91,14 +94,11 @@ async def test_no_pending(hass: HomeAssistant, service, expected_state) -> None:
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_no_pending_when_code_not_req(
@@ -123,7 +123,7 @@ async def test_no_pending_when_code_not_req(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -138,14 +138,11 @@ async def test_no_pending_when_code_not_req(
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_pending(hass: HomeAssistant, service, expected_state) -> None:
@@ -167,7 +164,7 @@ async def test_with_pending(hass: HomeAssistant, service, expected_state) -> Non
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -176,7 +173,7 @@ async def test_with_pending(hass: HomeAssistant, service, expected_state) -> Non
         blocking=True,
     )
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMING
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMING
 
     state = hass.states.get(entity_id)
     assert state.attributes["next_state"] == expected_state
@@ -206,14 +203,11 @@ async def test_with_pending(hass: HomeAssistant, service, expected_state) -> Non
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_invalid_code(hass: HomeAssistant, service, expected_state) -> None:
@@ -235,7 +229,7 @@ async def test_with_invalid_code(hass: HomeAssistant, service, expected_state) -
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     with pytest.raises(ServiceValidationError, match=r"^Invalid alarm code provided$"):
         await hass.services.async_call(
@@ -248,20 +242,17 @@ async def test_with_invalid_code(hass: HomeAssistant, service, expected_state) -
             blocking=True,
         )
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_template_code(hass: HomeAssistant, service, expected_state) -> None:
@@ -283,7 +274,7 @@ async def test_with_template_code(hass: HomeAssistant, service, expected_state)
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -299,14 +290,11 @@ async def test_with_template_code(hass: HomeAssistant, service, expected_state)
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_specific_pending(
@@ -336,7 +324,7 @@ async def test_with_specific_pending(
         blocking=True,
     )
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMING
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMING
 
     future = dt_util.utcnow() + timedelta(seconds=2)
     with patch(
@@ -367,11 +355,11 @@ async def test_trigger_no_pending(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     future = dt_util.utcnow() + timedelta(seconds=60)
     with patch(
@@ -382,8 +370,8 @@ async def test_trigger_no_pending(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_delay(hass: HomeAssistant) -> None:
@@ -406,17 +394,17 @@ async def test_trigger_with_delay(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -427,8 +415,8 @@ async def test_trigger_with_delay(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_zero_trigger_time(hass: HomeAssistant) -> None:
@@ -450,11 +438,11 @@ async def test_trigger_zero_trigger_time(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_zero_trigger_time_with_pending(hass: HomeAssistant) -> None:
@@ -476,11 +464,11 @@ async def test_trigger_zero_trigger_time_with_pending(hass: HomeAssistant) -> No
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_pending(hass: HomeAssistant) -> None:
@@ -502,14 +490,14 @@ async def test_trigger_with_pending(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     state = hass.states.get(entity_id)
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=2)
     with patch(
@@ -520,8 +508,8 @@ async def test_trigger_with_pending(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -532,7 +520,7 @@ async def test_trigger_with_pending(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.DISARMED
+    assert state.state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_unused_specific_delay(hass: HomeAssistant) -> None:
@@ -556,17 +544,17 @@ async def test_trigger_with_unused_specific_delay(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -577,8 +565,8 @@ async def test_trigger_with_unused_specific_delay(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_specific_delay(hass: HomeAssistant) -> None:
@@ -602,17 +590,17 @@ async def test_trigger_with_specific_delay(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -623,8 +611,8 @@ async def test_trigger_with_specific_delay(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_pending_and_delay(hass: HomeAssistant) -> None:
@@ -647,17 +635,17 @@ async def test_trigger_with_pending_and_delay(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -668,8 +656,8 @@ async def test_trigger_with_pending_and_delay(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future += timedelta(seconds=1)
     with patch(
@@ -680,8 +668,8 @@ async def test_trigger_with_pending_and_delay(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_pending_and_specific_delay(hass: HomeAssistant) -> None:
@@ -705,17 +693,17 @@ async def test_trigger_with_pending_and_specific_delay(hass: HomeAssistant) -> N
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -726,8 +714,8 @@ async def test_trigger_with_pending_and_specific_delay(hass: HomeAssistant) -> N
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future += timedelta(seconds=1)
     with patch(
@@ -738,8 +726,8 @@ async def test_trigger_with_pending_and_specific_delay(hass: HomeAssistant) -> N
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_specific_pending(hass: HomeAssistant) -> None:
@@ -764,7 +752,7 @@ async def test_trigger_with_specific_pending(hass: HomeAssistant) -> None:
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     future = dt_util.utcnow() + timedelta(seconds=2)
     with patch(
@@ -775,8 +763,8 @@ async def test_trigger_with_specific_pending(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -786,7 +774,7 @@ async def test_trigger_with_specific_pending(hass: HomeAssistant) -> None:
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_disarm_after_trigger(hass: HomeAssistant) -> None:
@@ -808,13 +796,13 @@ async def test_trigger_with_disarm_after_trigger(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -824,7 +812,7 @@ async def test_trigger_with_disarm_after_trigger(hass: HomeAssistant) -> None:
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_zero_specific_trigger_time(hass: HomeAssistant) -> None:
@@ -847,11 +835,11 @@ async def test_trigger_with_zero_specific_trigger_time(hass: HomeAssistant) -> N
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_unused_zero_specific_trigger_time(
@@ -876,13 +864,13 @@ async def test_trigger_with_unused_zero_specific_trigger_time(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -892,7 +880,7 @@ async def test_trigger_with_unused_zero_specific_trigger_time(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_specific_trigger_time(hass: HomeAssistant) -> None:
@@ -914,13 +902,13 @@ async def test_trigger_with_specific_trigger_time(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -930,7 +918,7 @@ async def test_trigger_with_specific_trigger_time(hass: HomeAssistant) -> None:
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_no_disarm_after_trigger(hass: HomeAssistant) -> None:
@@ -953,17 +941,17 @@ async def test_trigger_with_no_disarm_after_trigger(hass: HomeAssistant) -> None
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE, entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -973,7 +961,7 @@ async def test_trigger_with_no_disarm_after_trigger(hass: HomeAssistant) -> None
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
 
 async def test_back_to_back_trigger_with_no_disarm_after_trigger(
@@ -998,17 +986,17 @@ async def test_back_to_back_trigger_with_no_disarm_after_trigger(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE, entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -1018,13 +1006,13 @@ async def test_back_to_back_trigger_with_no_disarm_after_trigger(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -1034,7 +1022,7 @@ async def test_back_to_back_trigger_with_no_disarm_after_trigger(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
 
 async def test_disarm_while_pending_trigger(hass: HomeAssistant) -> None:
@@ -1055,15 +1043,15 @@ async def test_disarm_while_pending_trigger(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     await common.async_alarm_disarm(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -1073,7 +1061,7 @@ async def test_disarm_while_pending_trigger(hass: HomeAssistant) -> None:
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_disarm_during_trigger_with_invalid_code(hass: HomeAssistant) -> None:
@@ -1095,7 +1083,7 @@ async def test_disarm_during_trigger_with_invalid_code(hass: HomeAssistant) -> N
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     assert (
         hass.states.get(entity_id).attributes[alarm_control_panel.ATTR_CODE_FORMAT]
         == alarm_control_panel.CodeFormat.NUMBER
@@ -1103,12 +1091,12 @@ async def test_disarm_during_trigger_with_invalid_code(hass: HomeAssistant) -> N
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     with pytest.raises(ServiceValidationError, match=r"^Invalid alarm code provided$"):
         await common.async_alarm_disarm(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -1119,8 +1107,8 @@ async def test_disarm_during_trigger_with_invalid_code(hass: HomeAssistant) -> N
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_disarm_with_template_code(hass: HomeAssistant) -> None:
@@ -1142,23 +1130,23 @@ async def test_disarm_with_template_code(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_home(hass, "def")
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.ARMED_HOME
+    assert state.state == STATE_ALARM_ARMED_HOME
 
     with pytest.raises(ServiceValidationError, match=r"^Invalid alarm code provided$"):
         await common.async_alarm_disarm(hass, "def")
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.ARMED_HOME
+    assert state.state == STATE_ALARM_ARMED_HOME
 
     await common.async_alarm_disarm(hass, "abc")
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.DISARMED
+    assert state.state == STATE_ALARM_DISARMED
 
 
 async def test_arm_away_after_disabled_disarmed(hass: HomeAssistant) -> None:
@@ -1183,21 +1171,21 @@ async def test_arm_away_after_disabled_disarmed(hass: HomeAssistant) -> None:
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.ARMING
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.attributes["next_state"] == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMING
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.attributes["next_state"] == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.ARMING
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
-    assert state.attributes["next_state"] == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMING
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
+    assert state.attributes["next_state"] == STATE_ALARM_ARMED_AWAY
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with freeze_time(future):
@@ -1205,14 +1193,14 @@ async def test_arm_away_after_disabled_disarmed(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         state = hass.states.get(entity_id)
-        assert state.state == AlarmControlPanelState.ARMED_AWAY
+        assert state.state == STATE_ALARM_ARMED_AWAY
 
         await common.async_alarm_trigger(hass, entity_id=entity_id)
 
         state = hass.states.get(entity_id)
-        assert state.state == AlarmControlPanelState.PENDING
-        assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-        assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
+        assert state.state == STATE_ALARM_PENDING
+        assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+        assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
 
     future += timedelta(seconds=1)
     with freeze_time(future):
@@ -1220,19 +1208,19 @@ async def test_arm_away_after_disabled_disarmed(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.attributes["previous_state"] == AlarmControlPanelState.ARMED_AWAY
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["previous_state"] == STATE_ALARM_ARMED_AWAY
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 @pytest.mark.parametrize(
     "expected_state",
     [
-        (AlarmControlPanelState.ARMED_AWAY),
-        (AlarmControlPanelState.ARMED_CUSTOM_BYPASS),
-        (AlarmControlPanelState.ARMED_HOME),
-        (AlarmControlPanelState.ARMED_NIGHT),
-        (AlarmControlPanelState.ARMED_VACATION),
-        (AlarmControlPanelState.DISARMED),
+        (STATE_ALARM_ARMED_AWAY),
+        (STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (STATE_ALARM_ARMED_HOME),
+        (STATE_ALARM_ARMED_NIGHT),
+        (STATE_ALARM_ARMED_VACATION),
+        (STATE_ALARM_DISARMED),
     ],
 )
 async def test_restore_state(hass: HomeAssistant, expected_state) -> None:
@@ -1265,11 +1253,11 @@ async def test_restore_state(hass: HomeAssistant, expected_state) -> None:
 @pytest.mark.parametrize(
     "expected_state",
     [
-        (AlarmControlPanelState.ARMED_AWAY),
-        (AlarmControlPanelState.ARMED_CUSTOM_BYPASS),
-        (AlarmControlPanelState.ARMED_HOME),
-        (AlarmControlPanelState.ARMED_NIGHT),
-        (AlarmControlPanelState.ARMED_VACATION),
+        (STATE_ALARM_ARMED_AWAY),
+        (STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (STATE_ALARM_ARMED_HOME),
+        (STATE_ALARM_ARMED_NIGHT),
+        (STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_restore_state_arming(hass: HomeAssistant, expected_state) -> None:
@@ -1277,7 +1265,7 @@ async def test_restore_state_arming(hass: HomeAssistant, expected_state) -> None
     time = dt_util.utcnow() - timedelta(seconds=15)
     entity_id = "alarm_control_panel.test"
     attributes = {
-        "previous_state": AlarmControlPanelState.DISARMED,
+        "previous_state": STATE_ALARM_DISARMED,
         "next_state": expected_state,
     }
     mock_restore_cache(
@@ -1304,9 +1292,9 @@ async def test_restore_state_arming(hass: HomeAssistant, expected_state) -> None
 
     state = hass.states.get(entity_id)
     assert state
-    assert state.attributes["previous_state"] == AlarmControlPanelState.DISARMED
+    assert state.attributes["previous_state"] == STATE_ALARM_DISARMED
     assert state.attributes["next_state"] == expected_state
-    assert state.state == AlarmControlPanelState.ARMING
+    assert state.state == STATE_ALARM_ARMING
 
     future = time + timedelta(seconds=61)
     with freeze_time(future):
@@ -1320,12 +1308,12 @@ async def test_restore_state_arming(hass: HomeAssistant, expected_state) -> None
 @pytest.mark.parametrize(
     "previous_state",
     [
-        (AlarmControlPanelState.ARMED_AWAY),
-        (AlarmControlPanelState.ARMED_CUSTOM_BYPASS),
-        (AlarmControlPanelState.ARMED_HOME),
-        (AlarmControlPanelState.ARMED_NIGHT),
-        (AlarmControlPanelState.ARMED_VACATION),
-        (AlarmControlPanelState.DISARMED),
+        (STATE_ALARM_ARMED_AWAY),
+        (STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (STATE_ALARM_ARMED_HOME),
+        (STATE_ALARM_ARMED_NIGHT),
+        (STATE_ALARM_ARMED_VACATION),
+        (STATE_ALARM_DISARMED),
     ],
 )
 async def test_restore_state_pending(hass: HomeAssistant, previous_state) -> None:
@@ -1334,18 +1322,11 @@ async def test_restore_state_pending(hass: HomeAssistant, previous_state) -> Non
     entity_id = "alarm_control_panel.test"
     attributes = {
         "previous_state": previous_state,
-        "next_state": AlarmControlPanelState.TRIGGERED,
+        "next_state": STATE_ALARM_TRIGGERED,
     }
     mock_restore_cache(
         hass,
-        (
-            State(
-                entity_id,
-                AlarmControlPanelState.TRIGGERED,
-                attributes,
-                last_updated=time,
-            ),
-        ),
+        (State(entity_id, STATE_ALARM_TRIGGERED, attributes, last_updated=time),),
     )
 
     hass.set_state(CoreState.starting)
@@ -1370,8 +1351,8 @@ async def test_restore_state_pending(hass: HomeAssistant, previous_state) -> Non
     state = hass.states.get(entity_id)
     assert state
     assert state.attributes["previous_state"] == previous_state
-    assert state.attributes["next_state"] == AlarmControlPanelState.TRIGGERED
-    assert state.state == AlarmControlPanelState.PENDING
+    assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
 
     future = time + timedelta(seconds=61)
     with freeze_time(future):
@@ -1379,7 +1360,7 @@ async def test_restore_state_pending(hass: HomeAssistant, previous_state) -> Non
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = time + timedelta(seconds=121)
     with freeze_time(future):
@@ -1393,12 +1374,12 @@ async def test_restore_state_pending(hass: HomeAssistant, previous_state) -> Non
 @pytest.mark.parametrize(
     "previous_state",
     [
-        (AlarmControlPanelState.ARMED_AWAY),
-        (AlarmControlPanelState.ARMED_CUSTOM_BYPASS),
-        (AlarmControlPanelState.ARMED_HOME),
-        (AlarmControlPanelState.ARMED_NIGHT),
-        (AlarmControlPanelState.ARMED_VACATION),
-        (AlarmControlPanelState.DISARMED),
+        (STATE_ALARM_ARMED_AWAY),
+        (STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (STATE_ALARM_ARMED_HOME),
+        (STATE_ALARM_ARMED_NIGHT),
+        (STATE_ALARM_ARMED_VACATION),
+        (STATE_ALARM_DISARMED),
     ],
 )
 async def test_restore_state_triggered(hass: HomeAssistant, previous_state) -> None:
@@ -1410,14 +1391,7 @@ async def test_restore_state_triggered(hass: HomeAssistant, previous_state) -> N
     }
     mock_restore_cache(
         hass,
-        (
-            State(
-                entity_id,
-                AlarmControlPanelState.TRIGGERED,
-                attributes,
-                last_updated=time,
-            ),
-        ),
+        (State(entity_id, STATE_ALARM_TRIGGERED, attributes, last_updated=time),),
     )
 
     hass.set_state(CoreState.starting)
@@ -1443,7 +1417,7 @@ async def test_restore_state_triggered(hass: HomeAssistant, previous_state) -> N
     assert state
     assert state.attributes[ATTR_PREVIOUS_STATE] == previous_state
     assert state.attributes[ATTR_NEXT_STATE] is None
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
     future = time + timedelta(seconds=121)
     with freeze_time(future):
@@ -1459,18 +1433,11 @@ async def test_restore_state_triggered_long_ago(hass: HomeAssistant) -> None:
     time = dt_util.utcnow() - timedelta(seconds=125)
     entity_id = "alarm_control_panel.test"
     attributes = {
-        "previous_state": AlarmControlPanelState.ARMED_AWAY,
+        "previous_state": STATE_ALARM_ARMED_AWAY,
     }
     mock_restore_cache(
         hass,
-        (
-            State(
-                entity_id,
-                AlarmControlPanelState.TRIGGERED,
-                attributes,
-                last_updated=time,
-            ),
-        ),
+        (State(entity_id, STATE_ALARM_TRIGGERED, attributes, last_updated=time),),
     )
 
     hass.set_state(CoreState.starting)
@@ -1493,7 +1460,7 @@ async def test_restore_state_triggered_long_ago(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.DISARMED
+    assert state.state == STATE_ALARM_DISARMED
 
 
 async def test_default_arming_states(hass: HomeAssistant) -> None:
diff --git a/tests/components/manual_mqtt/test_alarm_control_panel.py b/tests/components/manual_mqtt/test_alarm_control_panel.py
index 2b401cb10a0..a1c913135a7 100644
--- a/tests/components/manual_mqtt/test_alarm_control_panel.py
+++ b/tests/components/manual_mqtt/test_alarm_control_panel.py
@@ -7,7 +7,6 @@ from freezegun import freeze_time
 import pytest
 
 from homeassistant.components import alarm_control_panel
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.const import (
     ATTR_CODE,
     ATTR_ENTITY_ID,
@@ -16,6 +15,14 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_ARM_NIGHT,
     SERVICE_ALARM_ARM_VACATION,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -71,14 +78,11 @@ async def test_fail_setup_without_command_topic(
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_no_pending(
@@ -107,7 +111,7 @@ async def test_no_pending(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -122,14 +126,11 @@ async def test_no_pending(
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_no_pending_when_code_not_req(
@@ -159,7 +160,7 @@ async def test_no_pending_when_code_not_req(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -174,14 +175,11 @@ async def test_no_pending_when_code_not_req(
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_pending(
@@ -210,7 +208,7 @@ async def test_with_pending(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -219,7 +217,7 @@ async def test_with_pending(
         blocking=True,
     )
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     state = hass.states.get(entity_id)
     assert state.attributes["post_pending_state"] == expected_state
@@ -249,14 +247,11 @@ async def test_with_pending(
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_invalid_code(
@@ -285,7 +280,7 @@ async def test_with_invalid_code(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     with pytest.raises(HomeAssistantError, match=r"^Invalid alarm code provided$"):
         await hass.services.async_call(
@@ -295,20 +290,17 @@ async def test_with_invalid_code(
             blocking=True,
         )
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_template_code(
@@ -337,7 +329,7 @@ async def test_with_template_code(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await hass.services.async_call(
         alarm_control_panel.DOMAIN,
@@ -353,14 +345,11 @@ async def test_with_template_code(
 @pytest.mark.parametrize(
     ("service", "expected_state"),
     [
-        (SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (SERVICE_ALARM_ARM_HOME, AlarmControlPanelState.ARMED_HOME),
-        (SERVICE_ALARM_ARM_NIGHT, AlarmControlPanelState.ARMED_NIGHT),
-        (SERVICE_ALARM_ARM_VACATION, AlarmControlPanelState.ARMED_VACATION),
+        (SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (SERVICE_ALARM_ARM_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (SERVICE_ALARM_ARM_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (SERVICE_ALARM_ARM_VACATION, STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_with_specific_pending(
@@ -395,7 +384,7 @@ async def test_with_specific_pending(
         blocking=True,
     )
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     future = dt_util.utcnow() + timedelta(seconds=2)
     with patch(
@@ -430,12 +419,12 @@ async def test_trigger_no_pending(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     future = dt_util.utcnow() + timedelta(seconds=60)
     with patch(
@@ -445,7 +434,7 @@ async def test_trigger_no_pending(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_delay(
@@ -472,17 +461,17 @@ async def test_trigger_with_delay(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -493,7 +482,7 @@ async def test_trigger_with_delay(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_zero_trigger_time(
@@ -519,11 +508,11 @@ async def test_trigger_zero_trigger_time(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_zero_trigger_time_with_pending(
@@ -549,11 +538,11 @@ async def test_trigger_zero_trigger_time_with_pending(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_pending(
@@ -579,14 +568,14 @@ async def test_trigger_with_pending(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     state = hass.states.get(entity_id)
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=2)
     with patch(
@@ -596,7 +585,7 @@ async def test_trigger_with_pending(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -606,7 +595,7 @@ async def test_trigger_with_pending(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_disarm_after_trigger(
@@ -632,11 +621,11 @@ async def test_trigger_with_disarm_after_trigger(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -646,7 +635,7 @@ async def test_trigger_with_disarm_after_trigger(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_zero_specific_trigger_time(
@@ -673,11 +662,11 @@ async def test_trigger_with_zero_specific_trigger_time(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_unused_zero_specific_trigger_time(
@@ -704,11 +693,11 @@ async def test_trigger_with_unused_zero_specific_trigger_time(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -718,7 +707,7 @@ async def test_trigger_with_unused_zero_specific_trigger_time(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_specific_trigger_time(
@@ -744,11 +733,11 @@ async def test_trigger_with_specific_trigger_time(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -758,7 +747,7 @@ async def test_trigger_with_specific_trigger_time(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_back_to_back_trigger_with_no_disarm_after_trigger(
@@ -784,15 +773,15 @@ async def test_back_to_back_trigger_with_no_disarm_after_trigger(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE, entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -802,11 +791,11 @@ async def test_back_to_back_trigger_with_no_disarm_after_trigger(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -816,7 +805,7 @@ async def test_back_to_back_trigger_with_no_disarm_after_trigger(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
 
 async def test_disarm_while_pending_trigger(
@@ -841,15 +830,15 @@ async def test_disarm_while_pending_trigger(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     await common.async_alarm_disarm(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -859,7 +848,7 @@ async def test_disarm_while_pending_trigger(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_disarm_during_trigger_with_invalid_code(
@@ -885,7 +874,7 @@ async def test_disarm_during_trigger_with_invalid_code(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     assert (
         hass.states.get(entity_id).attributes[alarm_control_panel.ATTR_CODE_FORMAT]
         == alarm_control_panel.CodeFormat.NUMBER
@@ -893,12 +882,12 @@ async def test_disarm_during_trigger_with_invalid_code(
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     with pytest.raises(HomeAssistantError, match=r"Invalid alarm code provided$"):
         await common.async_alarm_disarm(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -908,7 +897,7 @@ async def test_disarm_during_trigger_with_invalid_code(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_unused_specific_delay(
@@ -936,17 +925,17 @@ async def test_trigger_with_unused_specific_delay(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -957,7 +946,7 @@ async def test_trigger_with_unused_specific_delay(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_specific_delay(
@@ -985,17 +974,17 @@ async def test_trigger_with_specific_delay(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -1006,7 +995,7 @@ async def test_trigger_with_specific_delay(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_pending_and_delay(
@@ -1034,17 +1023,17 @@ async def test_trigger_with_pending_and_delay(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -1055,8 +1044,8 @@ async def test_trigger_with_pending_and_delay(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future += timedelta(seconds=1)
     with patch(
@@ -1067,7 +1056,7 @@ async def test_trigger_with_pending_and_delay(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_pending_and_specific_delay(
@@ -1096,17 +1085,17 @@ async def test_trigger_with_pending_and_specific_delay(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with patch(
@@ -1117,8 +1106,8 @@ async def test_trigger_with_pending_and_specific_delay(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future += timedelta(seconds=1)
     with patch(
@@ -1129,7 +1118,7 @@ async def test_trigger_with_pending_and_specific_delay(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_trigger_with_specific_pending(
@@ -1158,7 +1147,7 @@ async def test_trigger_with_specific_pending(
 
     await common.async_alarm_trigger(hass)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     future = dt_util.utcnow() + timedelta(seconds=2)
     with patch(
@@ -1168,7 +1157,7 @@ async def test_trigger_with_specific_pending(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -1178,7 +1167,7 @@ async def test_trigger_with_specific_pending(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_trigger_with_no_disarm_after_trigger(
@@ -1205,15 +1194,15 @@ async def test_trigger_with_no_disarm_after_trigger(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE, entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     future = dt_util.utcnow() + timedelta(seconds=5)
     with patch(
@@ -1223,7 +1212,7 @@ async def test_trigger_with_no_disarm_after_trigger(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
 
 async def test_arm_away_after_disabled_disarmed(
@@ -1252,21 +1241,21 @@ async def test_arm_away_after_disabled_disarmed(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_away(hass, CODE)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["pre_pending_state"] == AlarmControlPanelState.DISARMED
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["pre_pending_state"] == STATE_ALARM_DISARMED
+    assert state.attributes["post_pending_state"] == STATE_ALARM_ARMED_AWAY
 
     await common.async_alarm_trigger(hass, entity_id=entity_id)
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.PENDING
-    assert state.attributes["pre_pending_state"] == AlarmControlPanelState.DISARMED
-    assert state.attributes["post_pending_state"] == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_PENDING
+    assert state.attributes["pre_pending_state"] == STATE_ALARM_DISARMED
+    assert state.attributes["post_pending_state"] == STATE_ALARM_ARMED_AWAY
 
     future = dt_util.utcnow() + timedelta(seconds=1)
     with freeze_time(future):
@@ -1274,18 +1263,14 @@ async def test_arm_away_after_disabled_disarmed(
         await hass.async_block_till_done()
 
         state = hass.states.get(entity_id)
-        assert state.state == AlarmControlPanelState.ARMED_AWAY
+        assert state.state == STATE_ALARM_ARMED_AWAY
 
         await common.async_alarm_trigger(hass, entity_id=entity_id)
 
         state = hass.states.get(entity_id)
-        assert state.state == AlarmControlPanelState.PENDING
-        assert (
-            state.attributes["pre_pending_state"] == AlarmControlPanelState.ARMED_AWAY
-        )
-        assert (
-            state.attributes["post_pending_state"] == AlarmControlPanelState.TRIGGERED
-        )
+        assert state.state == STATE_ALARM_PENDING
+        assert state.attributes["pre_pending_state"] == STATE_ALARM_ARMED_AWAY
+        assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
 
     future += timedelta(seconds=1)
     with freeze_time(future):
@@ -1293,7 +1278,7 @@ async def test_arm_away_after_disabled_disarmed(
         await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.TRIGGERED
+    assert state.state == STATE_ALARM_TRIGGERED
 
 
 async def test_disarm_with_template_code(
@@ -1319,33 +1304,33 @@ async def test_disarm_with_template_code(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_arm_home(hass, "def")
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.ARMED_HOME
+    assert state.state == STATE_ALARM_ARMED_HOME
 
     with pytest.raises(HomeAssistantError, match=r"Invalid alarm code provided$"):
         await common.async_alarm_disarm(hass, "def")
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.ARMED_HOME
+    assert state.state == STATE_ALARM_ARMED_HOME
 
     await common.async_alarm_disarm(hass, "abc")
 
     state = hass.states.get(entity_id)
-    assert state.state == AlarmControlPanelState.DISARMED
+    assert state.state == STATE_ALARM_DISARMED
 
 
 @pytest.mark.parametrize(
     ("config", "expected_state"),
     [
-        ("payload_arm_away", AlarmControlPanelState.ARMED_AWAY),
-        ("payload_arm_custom_bypass", AlarmControlPanelState.ARMED_CUSTOM_BYPASS),
-        ("payload_arm_home", AlarmControlPanelState.ARMED_HOME),
-        ("payload_arm_night", AlarmControlPanelState.ARMED_NIGHT),
-        ("payload_arm_vacation", AlarmControlPanelState.ARMED_VACATION),
+        ("payload_arm_away", STATE_ALARM_ARMED_AWAY),
+        ("payload_arm_custom_bypass", STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        ("payload_arm_home", STATE_ALARM_ARMED_HOME),
+        ("payload_arm_night", STATE_ALARM_ARMED_NIGHT),
+        ("payload_arm_vacation", STATE_ALARM_ARMED_VACATION),
     ],
 )
 async def test_arm_via_command_topic(
@@ -1374,12 +1359,12 @@ async def test_arm_via_command_topic(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     # Fire the arm command via MQTT; ensure state changes to arming
     async_fire_mqtt_message(hass, "alarm/command", command)
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     # Fast-forward a little bit
     future = dt_util.utcnow() + timedelta(seconds=1)
@@ -1415,18 +1400,18 @@ async def test_disarm_pending_via_command_topic(
 
     entity_id = "alarm_control_panel.test"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     await common.async_alarm_trigger(hass)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.PENDING
+    assert hass.states.get(entity_id).state == STATE_ALARM_PENDING
 
     # Now that we're pending, receive a command to disarm
     async_fire_mqtt_message(hass, "alarm/command", "DISARM")
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
 
 async def test_state_changes_are_published_to_mqtt(
@@ -1452,7 +1437,7 @@ async def test_state_changes_are_published_to_mqtt(
     # Component should send disarmed alarm state on startup
     await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.DISARMED, 0, True
+        "alarm/state", STATE_ALARM_DISARMED, 0, True
     )
     mqtt_mock.async_publish.reset_mock()
 
@@ -1460,7 +1445,7 @@ async def test_state_changes_are_published_to_mqtt(
     await common.async_alarm_arm_home(hass, "1234")
     await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.PENDING, 0, True
+        "alarm/state", STATE_ALARM_PENDING, 0, True
     )
     mqtt_mock.async_publish.reset_mock()
     # Fast-forward a little bit
@@ -1472,7 +1457,7 @@ async def test_state_changes_are_published_to_mqtt(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.ARMED_HOME, 0, True
+        "alarm/state", STATE_ALARM_ARMED_HOME, 0, True
     )
     mqtt_mock.async_publish.reset_mock()
 
@@ -1480,7 +1465,7 @@ async def test_state_changes_are_published_to_mqtt(
     await common.async_alarm_arm_away(hass, "1234")
     await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.PENDING, 0, True
+        "alarm/state", STATE_ALARM_PENDING, 0, True
     )
     mqtt_mock.async_publish.reset_mock()
     # Fast-forward a little bit
@@ -1492,7 +1477,7 @@ async def test_state_changes_are_published_to_mqtt(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.ARMED_AWAY, 0, True
+        "alarm/state", STATE_ALARM_ARMED_AWAY, 0, True
     )
     mqtt_mock.async_publish.reset_mock()
 
@@ -1500,7 +1485,7 @@ async def test_state_changes_are_published_to_mqtt(
     await common.async_alarm_arm_night(hass, "1234")
     await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.PENDING, 0, True
+        "alarm/state", STATE_ALARM_PENDING, 0, True
     )
     mqtt_mock.async_publish.reset_mock()
     # Fast-forward a little bit
@@ -1512,7 +1497,7 @@ async def test_state_changes_are_published_to_mqtt(
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.ARMED_NIGHT, 0, True
+        "alarm/state", STATE_ALARM_ARMED_NIGHT, 0, True
     )
     mqtt_mock.async_publish.reset_mock()
 
@@ -1520,7 +1505,7 @@ async def test_state_changes_are_published_to_mqtt(
     await common.async_alarm_disarm(hass)
     await hass.async_block_till_done()
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/state", AlarmControlPanelState.DISARMED, 0, True
+        "alarm/state", STATE_ALARM_DISARMED, 0, True
     )
 
 
diff --git a/tests/components/mastodon/conftest.py b/tests/components/mastodon/conftest.py
index ac23141be55..c64de44d496 100644
--- a/tests/components/mastodon/conftest.py
+++ b/tests/components/mastodon/conftest.py
@@ -1,7 +1,7 @@
 """Mastodon tests configuration."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 
@@ -9,6 +9,7 @@ from homeassistant.components.mastodon.const import CONF_BASE_URL, DOMAIN
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
 
 from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.components.smhi.common import AsyncMock
 
 
 @pytest.fixture
diff --git a/tests/components/matrix/conftest.py b/tests/components/matrix/conftest.py
index f0f16787f77..0b84aff5434 100644
--- a/tests/components/matrix/conftest.py
+++ b/tests/components/matrix/conftest.py
@@ -267,9 +267,7 @@ def mock_load_json():
 @pytest.fixture
 def mock_allowed_path():
     """Allow using NamedTemporaryFile for mock image."""
-    with patch(
-        "homeassistant.core_config.Config.is_allowed_path", return_value=True
-    ) as mock:
+    with patch("homeassistant.core.Config.is_allowed_path", return_value=True) as mock:
         yield mock
 
 
diff --git a/tests/components/matter/conftest.py b/tests/components/matter/conftest.py
index bbafec48e10..556d324d7ee 100644
--- a/tests/components/matter/conftest.py
+++ b/tests/components/matter/conftest.py
@@ -108,7 +108,6 @@ async def integration_fixture(
         "switch_unit",
         "temperature_sensor",
         "thermostat",
-        "vacuum_cleaner",
         "valve",
         "window_covering_full",
         "window_covering_lift",
diff --git a/tests/components/matter/fixtures/nodes/vacuum_cleaner.json b/tests/components/matter/fixtures/nodes/vacuum_cleaner.json
deleted file mode 100644
index d6268144ffd..00000000000
--- a/tests/components/matter/fixtures/nodes/vacuum_cleaner.json
+++ /dev/null
@@ -1,309 +0,0 @@
-{
-  "node_id": 66,
-  "date_commissioned": "2024-10-29T08:27:39.860951",
-  "last_interview": "2024-10-29T08:27:39.860959",
-  "interview_version": 6,
-  "available": true,
-  "is_bridge": false,
-  "attributes": {
-    "0/29/0": [
-      {
-        "0": 22,
-        "1": 1
-      }
-    ],
-    "0/29/1": [29, 31, 40, 48, 49, 50, 51, 60, 62, 63],
-    "0/29/2": [],
-    "0/29/3": [1],
-    "0/29/65532": 0,
-    "0/29/65533": 2,
-    "0/29/65528": [],
-    "0/29/65529": [],
-    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
-    "0/31/0": [
-      {
-        "1": 5,
-        "2": 2,
-        "3": [112233],
-        "4": null,
-        "254": 1
-      }
-    ],
-    "0/31/1": [],
-    "0/31/2": 4,
-    "0/31/3": 3,
-    "0/31/4": 4,
-    "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": 17,
-    "0/40/1": "TEST_VENDOR",
-    "0/40/2": 65521,
-    "0/40/3": "Mock Vacuum",
-    "0/40/4": 32769,
-    "0/40/5": "Mock Vacuum",
-    "0/40/6": "**REDACTED**",
-    "0/40/7": 0,
-    "0/40/8": "TEST_VERSION",
-    "0/40/9": 1,
-    "0/40/10": "1.0",
-    "0/40/11": "20200101",
-    "0/40/12": "",
-    "0/40/13": "",
-    "0/40/14": "",
-    "0/40/15": "TEST_SN",
-    "0/40/16": false,
-    "0/40/18": "F0D59DFAAEAD6E76",
-    "0/40/19": {
-      "0": 3,
-      "1": 65535
-    },
-    "0/40/21": 16973824,
-    "0/40/22": 1,
-    "0/40/65532": 0,
-    "0/40/65533": 3,
-    "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, 18, 19, 21, 22,
-      65528, 65529, 65531, 65532, 65533
-    ],
-    "0/48/0": 0,
-    "0/48/1": {
-      "0": 60,
-      "1": 900
-    },
-    "0/48/2": 0,
-    "0/48/3": 2,
-    "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": [
-      {
-        "0": "ZW5kMA==",
-        "1": true
-      }
-    ],
-    "0/49/2": 0,
-    "0/49/3": 0,
-    "0/49/4": true,
-    "0/49/5": null,
-    "0/49/6": null,
-    "0/49/7": null,
-    "0/49/65532": 4,
-    "0/49/65533": 2,
-    "0/49/65528": [],
-    "0/49/65529": [],
-    "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": [],
-    "0/51/1": 1,
-    "0/51/2": 47,
-    "0/51/3": 0,
-    "0/51/4": 0,
-    "0/51/5": [],
-    "0/51/6": [],
-    "0/51/7": [],
-    "0/51/8": false,
-    "0/51/65532": 0,
-    "0/51/65533": 2,
-    "0/51/65528": [2],
-    "0/51/65529": [0, 1],
-    "0/51/65531": [
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 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, 2],
-    "0/60/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
-    "0/62/0": [],
-    "0/62/1": [],
-    "0/62/2": 16,
-    "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": 4,
-    "0/63/3": 3,
-    "0/63/65532": 0,
-    "0/63/65533": 2,
-    "0/63/65528": [2, 5],
-    "0/63/65529": [0, 1, 3, 4],
-    "0/63/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
-    "1/29/0": [
-      {
-        "0": 116,
-        "1": 1
-      }
-    ],
-    "1/29/1": [3, 29, 84, 85, 97],
-    "1/29/2": [],
-    "1/29/3": [],
-    "1/29/65532": 0,
-    "1/29/65533": 2,
-    "1/29/65528": [],
-    "1/29/65529": [],
-    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
-    "1/84/0": [
-      {
-        "0": "Idle",
-        "1": 0,
-        "2": [
-          {
-            "1": 16384
-          }
-        ]
-      },
-      {
-        "0": "Cleaning",
-        "1": 1,
-        "2": [
-          {
-            "1": 16385
-          }
-        ]
-      },
-      {
-        "0": "Mapping",
-        "1": 2,
-        "2": [
-          {
-            "1": 16386
-          }
-        ]
-      }
-    ],
-    "1/84/1": 0,
-    "1/84/65532": 0,
-    "1/84/65533": 2,
-    "1/84/65528": [1],
-    "1/84/65529": [0],
-    "1/84/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
-    "1/85/0": [
-      {
-        "0": "Quick",
-        "1": 0,
-        "2": [
-          {
-            "1": 16385
-          },
-          {
-            "1": 1
-          }
-        ]
-      },
-      {
-        "0": "Auto",
-        "1": 1,
-        "2": [
-          {
-            "1": 0
-          },
-          {
-            "1": 16385
-          }
-        ]
-      },
-      {
-        "0": "Deep Clean",
-        "1": 2,
-        "2": [
-          {
-            "1": 16386
-          },
-          {
-            "1": 16384
-          },
-          {
-            "1": 16385
-          }
-        ]
-      },
-      {
-        "0": "Quiet",
-        "1": 3,
-        "2": [
-          {
-            "1": 2
-          },
-          {
-            "1": 16385
-          }
-        ]
-      },
-      {
-        "0": "Max Vac",
-        "1": 4,
-        "2": [
-          {
-            "1": 16385
-          },
-          {
-            "1": 16384
-          }
-        ]
-      }
-    ],
-    "1/85/1": 0,
-    "1/85/65532": 0,
-    "1/85/65533": 2,
-    "1/85/65528": [1],
-    "1/85/65529": [0],
-    "1/85/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
-    "1/97/0": null,
-    "1/97/1": null,
-    "1/97/3": [
-      {
-        "0": 0
-      },
-      {
-        "0": 1
-      },
-      {
-        "0": 2
-      },
-      {
-        "0": 3
-      },
-      {
-        "0": 64
-      },
-      {
-        "0": 65
-      },
-      {
-        "0": 66
-      }
-    ],
-    "1/97/4": 0,
-    "1/97/5": {
-      "0": 0
-    },
-    "1/97/65532": 0,
-    "1/97/65533": 1,
-    "1/97/65528": [4],
-    "1/97/65529": [0, 3, 128],
-    "1/97/65531": [0, 1, 3, 4, 5, 65528, 65529, 65531, 65532, 65533]
-  },
-  "attribute_subscriptions": []
-}
diff --git a/tests/components/matter/snapshots/test_climate.ambr b/tests/components/matter/snapshots/test_climate.ambr
index 25f5ca06f62..f45f8a1bb99 100644
--- a/tests/components/matter/snapshots/test_climate.ambr
+++ b/tests/components/matter/snapshots/test_climate.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_climates[air_purifier][climate.air_purifier-entry]
+# name: test_climates[air_purifier][climate.air_purifier_thermostat-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -18,7 +18,7 @@
     'disabled_by': None,
     'domain': 'climate',
     'entity_category': None,
-    'entity_id': 'climate.air_purifier',
+    'entity_id': 'climate.air_purifier_thermostat',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -30,20 +30,20 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Thermostat',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
-    'translation_key': None,
+    'translation_key': 'thermostat',
     'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-5-MatterThermostat-513-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_climates[air_purifier][climate.air_purifier-state]
+# name: test_climates[air_purifier][climate.air_purifier_thermostat-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_temperature': 20.0,
-      'friendly_name': 'Air Purifier',
+      'friendly_name': 'Air Purifier Thermostat',
       'hvac_modes': list([
         <HVACMode.OFF: 'off'>,
         <HVACMode.HEAT: 'heat'>,
@@ -54,14 +54,14 @@
       'temperature': 20.0,
     }),
     'context': <ANY>,
-    'entity_id': 'climate.air_purifier',
+    'entity_id': 'climate.air_purifier_thermostat',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_climates[eve_thermo][climate.eve_thermo-entry]
+# name: test_climates[eve_thermo][climate.eve_thermo_thermostat-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -80,7 +80,7 @@
     'disabled_by': None,
     'domain': 'climate',
     'entity_category': None,
-    'entity_id': 'climate.eve_thermo',
+    'entity_id': 'climate.eve_thermo_thermostat',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -92,20 +92,20 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Thermostat',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
-    'translation_key': None,
+    'translation_key': 'thermostat',
     'unique_id': '00000000000004D2-0000000000000021-MatterNodeDevice-1-MatterThermostat-513-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_climates[eve_thermo][climate.eve_thermo-state]
+# name: test_climates[eve_thermo][climate.eve_thermo_thermostat-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_temperature': 21.0,
-      'friendly_name': 'Eve Thermo',
+      'friendly_name': 'Eve Thermo Thermostat',
       'hvac_modes': list([
         <HVACMode.OFF: 'off'>,
         <HVACMode.HEAT: 'heat'>,
@@ -116,14 +116,14 @@
       'temperature': 17.0,
     }),
     'context': <ANY>,
-    'entity_id': 'climate.eve_thermo',
+    'entity_id': 'climate.eve_thermo_thermostat',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'heat',
   })
 # ---
-# name: test_climates[room_airconditioner][climate.room_airconditioner-entry]
+# name: test_climates[room_airconditioner][climate.room_airconditioner_thermostat-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -146,7 +146,7 @@
     'disabled_by': None,
     'domain': 'climate',
     'entity_category': None,
-    'entity_id': 'climate.room_airconditioner',
+    'entity_id': 'climate.room_airconditioner_thermostat',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -158,20 +158,20 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Thermostat',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
-    'translation_key': None,
+    'translation_key': 'thermostat',
     'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-MatterThermostat-513-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_climates[room_airconditioner][climate.room_airconditioner-state]
+# name: test_climates[room_airconditioner][climate.room_airconditioner_thermostat-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_temperature': 20.0,
-      'friendly_name': 'Room AirConditioner',
+      'friendly_name': 'Room AirConditioner Thermostat',
       'hvac_modes': list([
         <HVACMode.OFF: 'off'>,
         <HVACMode.HEAT: 'heat'>,
@@ -186,14 +186,14 @@
       'temperature': 20.0,
     }),
     'context': <ANY>,
-    'entity_id': 'climate.room_airconditioner',
+    'entity_id': 'climate.room_airconditioner_thermostat',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_climates[thermostat][climate.longan_link_hvac-entry]
+# name: test_climates[thermostat][climate.longan_link_hvac_thermostat-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -214,7 +214,7 @@
     'disabled_by': None,
     'domain': 'climate',
     'entity_category': None,
-    'entity_id': 'climate.longan_link_hvac',
+    'entity_id': 'climate.longan_link_hvac_thermostat',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -226,20 +226,20 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Thermostat',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 387>,
-    'translation_key': None,
+    'translation_key': 'thermostat',
     'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterThermostat-513-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_climates[thermostat][climate.longan_link_hvac-state]
+# name: test_climates[thermostat][climate.longan_link_hvac_thermostat-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_temperature': 28.3,
-      'friendly_name': 'Longan link HVAC',
+      'friendly_name': 'Longan link HVAC Thermostat',
       'hvac_modes': list([
         <HVACMode.OFF: 'off'>,
         <HVACMode.HEAT: 'heat'>,
@@ -254,7 +254,7 @@
       'temperature': None,
     }),
     'context': <ANY>,
-    'entity_id': 'climate.longan_link_hvac',
+    'entity_id': 'climate.longan_link_hvac_thermostat',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/snapshots/test_cover.ambr b/tests/components/matter/snapshots/test_cover.ambr
index 7d036d35983..3f39cf7bbe8 100644
--- a/tests/components/matter/snapshots/test_cover.ambr
+++ b/tests/components/matter/snapshots/test_cover.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_covers[window_covering_full][cover.mock_full_window_covering-entry]
+# name: test_covers[window_covering_full][cover.mock_full_window_covering_cover-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -11,7 +11,7 @@
     'disabled_by': None,
     'domain': 'cover',
     'entity_category': None,
-    'entity_id': 'cover.mock_full_window_covering',
+    'entity_id': 'cover.mock_full_window_covering_cover',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23,33 +23,33 @@
     }),
     'original_device_class': <CoverDeviceClass.AWNING: 'awning'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Cover',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <CoverEntityFeature: 143>,
-    'translation_key': None,
+    'translation_key': 'cover',
     'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-MatterCoverPositionAwareLiftAndTilt-258-10',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_covers[window_covering_full][cover.mock_full_window_covering-state]
+# name: test_covers[window_covering_full][cover.mock_full_window_covering_cover-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_position': 100,
       'current_tilt_position': 100,
       'device_class': 'awning',
-      'friendly_name': 'Mock Full Window Covering',
+      'friendly_name': 'Mock Full Window Covering Cover',
       'supported_features': <CoverEntityFeature: 143>,
     }),
     'context': <ANY>,
-    'entity_id': 'cover.mock_full_window_covering',
+    'entity_id': 'cover.mock_full_window_covering_cover',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'open',
   })
 # ---
-# name: test_covers[window_covering_lift][cover.mock_lift_window_covering-entry]
+# name: test_covers[window_covering_lift][cover.mock_lift_window_covering_cover-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -61,7 +61,7 @@
     'disabled_by': None,
     'domain': 'cover',
     'entity_category': None,
-    'entity_id': 'cover.mock_lift_window_covering',
+    'entity_id': 'cover.mock_lift_window_covering_cover',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -73,31 +73,31 @@
     }),
     'original_device_class': <CoverDeviceClass.AWNING: 'awning'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Cover',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <CoverEntityFeature: 15>,
-    'translation_key': None,
+    'translation_key': 'cover',
     'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-MatterCover-258-10',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_covers[window_covering_lift][cover.mock_lift_window_covering-state]
+# name: test_covers[window_covering_lift][cover.mock_lift_window_covering_cover-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'awning',
-      'friendly_name': 'Mock Lift Window Covering',
+      'friendly_name': 'Mock Lift Window Covering Cover',
       'supported_features': <CoverEntityFeature: 15>,
     }),
     'context': <ANY>,
-    'entity_id': 'cover.mock_lift_window_covering',
+    'entity_id': 'cover.mock_lift_window_covering_cover',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'unknown',
   })
 # ---
-# name: test_covers[window_covering_pa_lift][cover.longan_link_wncv_da01-entry]
+# name: test_covers[window_covering_pa_lift][cover.longan_link_wncv_da01_cover-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -109,7 +109,7 @@
     'disabled_by': None,
     'domain': 'cover',
     'entity_category': None,
-    'entity_id': 'cover.longan_link_wncv_da01',
+    'entity_id': 'cover.longan_link_wncv_da01_cover',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -121,32 +121,32 @@
     }),
     'original_device_class': <CoverDeviceClass.AWNING: 'awning'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Cover',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <CoverEntityFeature: 15>,
-    'translation_key': None,
+    'translation_key': 'cover',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterCoverPositionAwareLift-258-10',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_covers[window_covering_pa_lift][cover.longan_link_wncv_da01-state]
+# name: test_covers[window_covering_pa_lift][cover.longan_link_wncv_da01_cover-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_position': 51,
       'device_class': 'awning',
-      'friendly_name': 'Longan link WNCV DA01',
+      'friendly_name': 'Longan link WNCV DA01 Cover',
       'supported_features': <CoverEntityFeature: 15>,
     }),
     'context': <ANY>,
-    'entity_id': 'cover.longan_link_wncv_da01',
+    'entity_id': 'cover.longan_link_wncv_da01_cover',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'open',
   })
 # ---
-# name: test_covers[window_covering_pa_tilt][cover.mock_pa_tilt_window_covering-entry]
+# name: test_covers[window_covering_pa_tilt][cover.mock_pa_tilt_window_covering_cover-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -158,7 +158,7 @@
     'disabled_by': None,
     'domain': 'cover',
     'entity_category': None,
-    'entity_id': 'cover.mock_pa_tilt_window_covering',
+    'entity_id': 'cover.mock_pa_tilt_window_covering_cover',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -170,32 +170,32 @@
     }),
     'original_device_class': <CoverDeviceClass.AWNING: 'awning'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Cover',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <CoverEntityFeature: 139>,
-    'translation_key': None,
+    'translation_key': 'cover',
     'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-MatterCoverPositionAwareTilt-258-10',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_covers[window_covering_pa_tilt][cover.mock_pa_tilt_window_covering-state]
+# name: test_covers[window_covering_pa_tilt][cover.mock_pa_tilt_window_covering_cover-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_tilt_position': 100,
       'device_class': 'awning',
-      'friendly_name': 'Mock PA Tilt Window Covering',
+      'friendly_name': 'Mock PA Tilt Window Covering Cover',
       'supported_features': <CoverEntityFeature: 139>,
     }),
     'context': <ANY>,
-    'entity_id': 'cover.mock_pa_tilt_window_covering',
+    'entity_id': 'cover.mock_pa_tilt_window_covering_cover',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'unknown',
   })
 # ---
-# name: test_covers[window_covering_tilt][cover.mock_tilt_window_covering-entry]
+# name: test_covers[window_covering_tilt][cover.mock_tilt_window_covering_cover-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -207,7 +207,7 @@
     'disabled_by': None,
     'domain': 'cover',
     'entity_category': None,
-    'entity_id': 'cover.mock_tilt_window_covering',
+    'entity_id': 'cover.mock_tilt_window_covering_cover',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -219,24 +219,24 @@
     }),
     'original_device_class': <CoverDeviceClass.AWNING: 'awning'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Cover',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <CoverEntityFeature: 139>,
-    'translation_key': None,
+    'translation_key': 'cover',
     'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-MatterCover-258-10',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_covers[window_covering_tilt][cover.mock_tilt_window_covering-state]
+# name: test_covers[window_covering_tilt][cover.mock_tilt_window_covering_cover-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'awning',
-      'friendly_name': 'Mock Tilt Window Covering',
+      'friendly_name': 'Mock Tilt Window Covering Cover',
       'supported_features': <CoverEntityFeature: 139>,
     }),
     'context': <ANY>,
-    'entity_id': 'cover.mock_tilt_window_covering',
+    'entity_id': 'cover.mock_tilt_window_covering_cover',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/snapshots/test_fan.ambr b/tests/components/matter/snapshots/test_fan.ambr
index 7f1fe7d42db..ae1bfc5ddd0 100644
--- a/tests/components/matter/snapshots/test_fan.ambr
+++ b/tests/components/matter/snapshots/test_fan.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_fans[air_purifier][fan.air_purifier-entry]
+# name: test_fans[air_purifier][fan.air_purifier_fan-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -20,7 +20,7 @@
     'disabled_by': None,
     'domain': 'fan',
     'entity_category': None,
-    'entity_id': 'fan.air_purifier',
+    'entity_id': 'fan.air_purifier_fan',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -32,20 +32,20 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Fan',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <FanEntityFeature: 63>,
-    'translation_key': None,
+    'translation_key': 'fan',
     'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-1-MatterFan-514-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_fans[air_purifier][fan.air_purifier-state]
+# name: test_fans[air_purifier][fan.air_purifier_fan-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'direction': 'forward',
-      'friendly_name': 'Air Purifier',
+      'friendly_name': 'Air Purifier Fan',
       'oscillating': False,
       'percentage': None,
       'percentage_step': 10.0,
@@ -61,14 +61,14 @@
       'supported_features': <FanEntityFeature: 63>,
     }),
     'context': <ANY>,
-    'entity_id': 'fan.air_purifier',
+    'entity_id': 'fan.air_purifier_fan',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_fans[fan][fan.mocked_fan_switch-entry]
+# name: test_fans[fan][fan.mocked_fan_switch_fan-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -89,7 +89,7 @@
     'disabled_by': None,
     'domain': 'fan',
     'entity_category': None,
-    'entity_id': 'fan.mocked_fan_switch',
+    'entity_id': 'fan.mocked_fan_switch_fan',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -101,19 +101,19 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Fan',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <FanEntityFeature: 57>,
-    'translation_key': None,
+    'translation_key': 'fan',
     'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-MatterFan-514-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_fans[fan][fan.mocked_fan_switch-state]
+# name: test_fans[fan][fan.mocked_fan_switch_fan-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Mocked Fan Switch',
+      'friendly_name': 'Mocked Fan Switch Fan',
       'percentage': 0,
       'percentage_step': 33.333333333333336,
       'preset_mode': None,
@@ -128,14 +128,14 @@
       'supported_features': <FanEntityFeature: 57>,
     }),
     'context': <ANY>,
-    'entity_id': 'fan.mocked_fan_switch',
+    'entity_id': 'fan.mocked_fan_switch_fan',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_fans[room_airconditioner][fan.room_airconditioner-entry]
+# name: test_fans[room_airconditioner][fan.room_airconditioner_fan-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -155,7 +155,7 @@
     'disabled_by': None,
     'domain': 'fan',
     'entity_category': None,
-    'entity_id': 'fan.room_airconditioner',
+    'entity_id': 'fan.room_airconditioner_fan',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -167,19 +167,19 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Fan',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <FanEntityFeature: 57>,
-    'translation_key': None,
+    'translation_key': 'fan',
     'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-MatterFan-514-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_fans[room_airconditioner][fan.room_airconditioner-state]
+# name: test_fans[room_airconditioner][fan.room_airconditioner_fan-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Room AirConditioner',
+      'friendly_name': 'Room AirConditioner Fan',
       'percentage': 0,
       'percentage_step': 33.333333333333336,
       'preset_mode': None,
@@ -193,14 +193,14 @@
       'supported_features': <FanEntityFeature: 57>,
     }),
     'context': <ANY>,
-    'entity_id': 'fan.room_airconditioner',
+    'entity_id': 'fan.room_airconditioner_fan',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_fans[thermostat][fan.longan_link_hvac-entry]
+# name: test_fans[thermostat][fan.longan_link_hvac_fan-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -219,7 +219,7 @@
     'disabled_by': None,
     'domain': 'fan',
     'entity_category': None,
-    'entity_id': 'fan.longan_link_hvac',
+    'entity_id': 'fan.longan_link_hvac_fan',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -231,19 +231,19 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Fan',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <FanEntityFeature: 56>,
-    'translation_key': None,
+    'translation_key': 'fan',
     'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterFan-514-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_fans[thermostat][fan.longan_link_hvac-state]
+# name: test_fans[thermostat][fan.longan_link_hvac_fan-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Longan link HVAC',
+      'friendly_name': 'Longan link HVAC Fan',
       'preset_mode': None,
       'preset_modes': list([
         'low',
@@ -254,7 +254,7 @@
       'supported_features': <FanEntityFeature: 56>,
     }),
     'context': <ANY>,
-    'entity_id': 'fan.longan_link_hvac',
+    'entity_id': 'fan.longan_link_hvac_fan',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/snapshots/test_light.ambr b/tests/components/matter/snapshots/test_light.ambr
index 68c1b7dca74..9711937fa12 100644
--- a/tests/components/matter/snapshots/test_light.ambr
+++ b/tests/components/matter/snapshots/test_light.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_lights[color_temperature_light][light.mock_color_temperature_light-entry]
+# name: test_lights[color_temperature_light][light.mock_color_temperature_light_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -19,7 +19,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.mock_color_temperature_light',
+    'entity_id': 'light.mock_color_temperature_light_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -31,23 +31,23 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <LightEntityFeature: 32>,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[color_temperature_light][light.mock_color_temperature_light-state]
+# name: test_lights[color_temperature_light][light.mock_color_temperature_light_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'brightness': 128,
       'color_mode': <ColorMode.COLOR_TEMP: 'color_temp'>,
       'color_temp': 284,
       'color_temp_kelvin': 3521,
-      'friendly_name': 'Mock Color Temperature Light',
+      'friendly_name': 'Mock Color Temperature Light Light',
       'hs_color': tuple(
         27.152,
         44.32,
@@ -71,14 +71,14 @@
       ),
     }),
     'context': <ANY>,
-    'entity_id': 'light.mock_color_temperature_light',
+    'entity_id': 'light.mock_color_temperature_light_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_lights[dimmable_light][light.mock_dimmable_light-entry]
+# name: test_lights[dimmable_light][light.mock_dimmable_light_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -94,7 +94,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.mock_dimmable_light',
+    'entity_id': 'light.mock_dimmable_light_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -106,35 +106,35 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <LightEntityFeature: 32>,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[dimmable_light][light.mock_dimmable_light-state]
+# name: test_lights[dimmable_light][light.mock_dimmable_light_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'brightness': 51,
       'color_mode': <ColorMode.BRIGHTNESS: 'brightness'>,
-      'friendly_name': 'Mock Dimmable Light',
+      'friendly_name': 'Mock Dimmable Light Light',
       'supported_color_modes': list([
         <ColorMode.BRIGHTNESS: 'brightness'>,
       ]),
       'supported_features': <LightEntityFeature: 32>,
     }),
     'context': <ANY>,
-    'entity_id': 'light.mock_dimmable_light',
+    'entity_id': 'light.mock_dimmable_light_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_lights[dimmable_plugin_unit][light.dimmable_plugin_unit-entry]
+# name: test_lights[dimmable_plugin_unit][light.dimmable_plugin_unit_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -150,7 +150,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.dimmable_plugin_unit',
+    'entity_id': 'light.dimmable_plugin_unit_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -162,35 +162,35 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <LightEntityFeature: 32>,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[dimmable_plugin_unit][light.dimmable_plugin_unit-state]
+# name: test_lights[dimmable_plugin_unit][light.dimmable_plugin_unit_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'brightness': 255,
       'color_mode': <ColorMode.BRIGHTNESS: 'brightness'>,
-      'friendly_name': 'Dimmable Plugin Unit',
+      'friendly_name': 'Dimmable Plugin Unit Light',
       'supported_color_modes': list([
         <ColorMode.BRIGHTNESS: 'brightness'>,
       ]),
       'supported_features': <LightEntityFeature: 32>,
     }),
     'context': <ANY>,
-    'entity_id': 'light.dimmable_plugin_unit',
+    'entity_id': 'light.dimmable_plugin_unit_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_lights[extended_color_light][light.mock_extended_color_light-entry]
+# name: test_lights[extended_color_light][light.mock_extended_color_light_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -212,7 +212,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.mock_extended_color_light',
+    'entity_id': 'light.mock_extended_color_light_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -224,23 +224,23 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <LightEntityFeature: 32>,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[extended_color_light][light.mock_extended_color_light-state]
+# name: test_lights[extended_color_light][light.mock_extended_color_light_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'brightness': 128,
       'color_mode': <ColorMode.HS: 'hs'>,
       'color_temp': None,
       'color_temp_kelvin': None,
-      'friendly_name': 'Mock Extended Color Light',
+      'friendly_name': 'Mock Extended Color Light Light',
       'hs_color': tuple(
         51.024,
         20.079,
@@ -266,7 +266,7 @@
       ),
     }),
     'context': <ANY>,
-    'entity_id': 'light.mock_extended_color_light',
+    'entity_id': 'light.mock_extended_color_light_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -402,7 +402,7 @@
     'state': 'off',
   })
 # ---
-# name: test_lights[onoff_light][light.mock_onoff_light-entry]
+# name: test_lights[onoff_light][light.mock_onoff_light_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -418,7 +418,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.mock_onoff_light',
+    'entity_id': 'light.mock_onoff_light_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -430,34 +430,34 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[onoff_light][light.mock_onoff_light-state]
+# name: test_lights[onoff_light][light.mock_onoff_light_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'color_mode': <ColorMode.ONOFF: 'onoff'>,
-      'friendly_name': 'Mock OnOff Light',
+      'friendly_name': 'Mock OnOff Light Light',
       'supported_color_modes': list([
         <ColorMode.ONOFF: 'onoff'>,
       ]),
       'supported_features': <LightEntityFeature: 0>,
     }),
     'context': <ANY>,
-    'entity_id': 'light.mock_onoff_light',
+    'entity_id': 'light.mock_onoff_light_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_lights[onoff_light_alt_name][light.mock_onoff_light-entry]
+# name: test_lights[onoff_light_alt_name][light.mock_onoff_light_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -479,7 +479,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.mock_onoff_light',
+    'entity_id': 'light.mock_onoff_light_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -491,23 +491,23 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <LightEntityFeature: 32>,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[onoff_light_alt_name][light.mock_onoff_light-state]
+# name: test_lights[onoff_light_alt_name][light.mock_onoff_light_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'brightness': None,
       'color_mode': <ColorMode.COLOR_TEMP: 'color_temp'>,
       'color_temp': None,
       'color_temp_kelvin': None,
-      'friendly_name': 'Mock OnOff Light',
+      'friendly_name': 'Mock OnOff Light Light',
       'hs_color': None,
       'max_color_temp_kelvin': 6535,
       'max_mireds': 500,
@@ -523,14 +523,14 @@
       'xy_color': None,
     }),
     'context': <ANY>,
-    'entity_id': 'light.mock_onoff_light',
+    'entity_id': 'light.mock_onoff_light_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_lights[onoff_light_no_name][light.mock_light-entry]
+# name: test_lights[onoff_light_no_name][light.mock_light_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -552,7 +552,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.mock_light',
+    'entity_id': 'light.mock_light_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -564,23 +564,23 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <LightEntityFeature: 32>,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[onoff_light_no_name][light.mock_light-state]
+# name: test_lights[onoff_light_no_name][light.mock_light_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'brightness': None,
       'color_mode': <ColorMode.COLOR_TEMP: 'color_temp'>,
       'color_temp': None,
       'color_temp_kelvin': None,
-      'friendly_name': 'Mock Light',
+      'friendly_name': 'Mock Light Light',
       'hs_color': None,
       'max_color_temp_kelvin': 6535,
       'max_mireds': 500,
@@ -596,14 +596,14 @@
       'xy_color': None,
     }),
     'context': <ANY>,
-    'entity_id': 'light.mock_light',
+    'entity_id': 'light.mock_light_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'on',
   })
 # ---
-# name: test_lights[onoff_light_with_levelcontrol_present][light.d215s-entry]
+# name: test_lights[onoff_light_with_levelcontrol_present][light.d215s_light-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -619,7 +619,7 @@
     'disabled_by': None,
     'domain': 'light',
     'entity_category': None,
-    'entity_id': 'light.d215s',
+    'entity_id': 'light.d215s_light',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -631,27 +631,27 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Light',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'light',
     'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-MatterLight-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_lights[onoff_light_with_levelcontrol_present][light.d215s-state]
+# name: test_lights[onoff_light_with_levelcontrol_present][light.d215s_light-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'color_mode': None,
-      'friendly_name': 'D215S',
+      'friendly_name': 'D215S Light',
       'supported_color_modes': list([
         <ColorMode.ONOFF: 'onoff'>,
       ]),
       'supported_features': <LightEntityFeature: 0>,
     }),
     'context': <ANY>,
-    'entity_id': 'light.d215s',
+    'entity_id': 'light.d215s_light',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/snapshots/test_lock.ambr b/tests/components/matter/snapshots/test_lock.ambr
index bf34ac267d7..3a57a0950b1 100644
--- a/tests/components/matter/snapshots/test_lock.ambr
+++ b/tests/components/matter/snapshots/test_lock.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_locks[door_lock][lock.mock_door_lock-entry]
+# name: test_locks[door_lock][lock.mock_door_lock_lock-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -11,7 +11,7 @@
     'disabled_by': None,
     'domain': 'lock',
     'entity_category': None,
-    'entity_id': 'lock.mock_door_lock',
+    'entity_id': 'lock.mock_door_lock_lock',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23,30 +23,30 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Lock',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'lock',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLock-257-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_locks[door_lock][lock.mock_door_lock-state]
+# name: test_locks[door_lock][lock.mock_door_lock_lock-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Door Lock',
+      'friendly_name': 'Mock Door Lock Lock',
       'supported_features': <LockEntityFeature: 0>,
     }),
     'context': <ANY>,
-    'entity_id': 'lock.mock_door_lock',
+    'entity_id': 'lock.mock_door_lock_lock',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'unlocked',
   })
 # ---
-# name: test_locks[door_lock_with_unbolt][lock.mock_door_lock-entry]
+# name: test_locks[door_lock_with_unbolt][lock.mock_door_lock_lock-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -58,7 +58,7 @@
     'disabled_by': None,
     'domain': 'lock',
     'entity_category': None,
-    'entity_id': 'lock.mock_door_lock',
+    'entity_id': 'lock.mock_door_lock_lock',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -70,23 +70,23 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Lock',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <LockEntityFeature: 1>,
-    'translation_key': None,
+    'translation_key': 'lock',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLock-257-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_locks[door_lock_with_unbolt][lock.mock_door_lock-state]
+# name: test_locks[door_lock_with_unbolt][lock.mock_door_lock_lock-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Door Lock',
+      'friendly_name': 'Mock Door Lock Lock',
       'supported_features': <LockEntityFeature: 1>,
     }),
     'context': <ANY>,
-    'entity_id': 'lock.mock_door_lock',
+    'entity_id': 'lock.mock_door_lock_lock',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/snapshots/test_select.ambr b/tests/components/matter/snapshots/test_select.ambr
index 663b0cdaf51..710c7c19a9b 100644
--- a/tests/components/matter/snapshots/test_select.ambr
+++ b/tests/components/matter/snapshots/test_select.ambr
@@ -1573,64 +1573,3 @@
     'state': 'previous',
   })
 # ---
-# name: test_selects[vacuum_cleaner][select.mock_vacuum_clean_mode-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        'Quick',
-        'Auto',
-        'Deep Clean',
-        'Quiet',
-        'Max Vac',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'select',
-    'entity_category': None,
-    'entity_id': 'select.mock_vacuum_clean_mode',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Clean mode',
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'clean_mode',
-    'unique_id': '00000000000004D2-0000000000000042-MatterNodeDevice-1-MatterRvcCleanMode-85-1',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_selects[vacuum_cleaner][select.mock_vacuum_clean_mode-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Vacuum Clean mode',
-      'options': list([
-        'Quick',
-        'Auto',
-        'Deep Clean',
-        'Quiet',
-        'Max Vac',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'select.mock_vacuum_clean_mode',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'Quick',
-  })
-# ---
diff --git a/tests/components/matter/snapshots/test_switch.ambr b/tests/components/matter/snapshots/test_switch.ambr
index 9396dccd245..1f3c95fd6cb 100644
--- a/tests/components/matter/snapshots/test_switch.ambr
+++ b/tests/components/matter/snapshots/test_switch.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_switches[door_lock][switch.mock_door_lock-entry]
+# name: test_switches[door_lock][switch.mock_door_lock_switch-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -11,7 +11,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.mock_door_lock',
+    'entity_id': 'switch.mock_door_lock_switch',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23,30 +23,30 @@
     }),
     'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Switch',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'switch',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterSwitch-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[door_lock][switch.mock_door_lock-state]
+# name: test_switches[door_lock][switch.mock_door_lock_switch-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'outlet',
-      'friendly_name': 'Mock Door Lock',
+      'friendly_name': 'Mock Door Lock Switch',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.mock_door_lock',
+    'entity_id': 'switch.mock_door_lock_switch',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_switches[door_lock_with_unbolt][switch.mock_door_lock-entry]
+# name: test_switches[door_lock_with_unbolt][switch.mock_door_lock_switch-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -58,7 +58,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.mock_door_lock',
+    'entity_id': 'switch.mock_door_lock_switch',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -70,30 +70,30 @@
     }),
     'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Switch',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'switch',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterSwitch-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[door_lock_with_unbolt][switch.mock_door_lock-state]
+# name: test_switches[door_lock_with_unbolt][switch.mock_door_lock_switch-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'outlet',
-      'friendly_name': 'Mock Door Lock',
+      'friendly_name': 'Mock Door Lock Switch',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.mock_door_lock',
+    'entity_id': 'switch.mock_door_lock_switch',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_switches[eve_energy_plug][switch.eve_energy_plug-entry]
+# name: test_switches[eve_energy_plug][switch.eve_energy_plug_switch-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -105,7 +105,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.eve_energy_plug',
+    'entity_id': 'switch.eve_energy_plug_switch',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -117,30 +117,30 @@
     }),
     'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Switch',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'switch',
     'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-MatterPlug-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[eve_energy_plug][switch.eve_energy_plug-state]
+# name: test_switches[eve_energy_plug][switch.eve_energy_plug_switch-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'outlet',
-      'friendly_name': 'Eve Energy Plug',
+      'friendly_name': 'Eve Energy Plug Switch',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.eve_energy_plug',
+    'entity_id': 'switch.eve_energy_plug_switch',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_switches[eve_energy_plug_patched][switch.eve_energy_plug_patched-entry]
+# name: test_switches[eve_energy_plug_patched][switch.eve_energy_plug_patched_switch-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -152,7 +152,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.eve_energy_plug_patched',
+    'entity_id': 'switch.eve_energy_plug_patched_switch',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -164,30 +164,30 @@
     }),
     'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Switch',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'switch',
     'unique_id': '00000000000004D2-00000000000000B7-MatterNodeDevice-1-MatterPlug-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[eve_energy_plug_patched][switch.eve_energy_plug_patched-state]
+# name: test_switches[eve_energy_plug_patched][switch.eve_energy_plug_patched_switch-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'outlet',
-      'friendly_name': 'Eve Energy Plug Patched',
+      'friendly_name': 'Eve Energy Plug Patched Switch',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.eve_energy_plug_patched',
+    'entity_id': 'switch.eve_energy_plug_patched_switch',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_switches[on_off_plugin_unit][switch.mock_onoffpluginunit-entry]
+# name: test_switches[on_off_plugin_unit][switch.mock_onoffpluginunit_switch-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -199,7 +199,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.mock_onoffpluginunit',
+    'entity_id': 'switch.mock_onoffpluginunit_switch',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -211,23 +211,23 @@
     }),
     'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Switch',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'switch',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterPlug-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[on_off_plugin_unit][switch.mock_onoffpluginunit-state]
+# name: test_switches[on_off_plugin_unit][switch.mock_onoffpluginunit_switch-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'outlet',
-      'friendly_name': 'Mock OnOffPluginUnit',
+      'friendly_name': 'Mock OnOffPluginUnit Switch',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.mock_onoffpluginunit',
+    'entity_id': 'switch.mock_onoffpluginunit_switch',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
@@ -281,7 +281,7 @@
     'state': 'off',
   })
 # ---
-# name: test_switches[switch_unit][switch.mock_switchunit-entry]
+# name: test_switches[switch_unit][switch.mock_switchunit_switch-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -293,7 +293,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.mock_switchunit',
+    'entity_id': 'switch.mock_switchunit_switch',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -305,30 +305,30 @@
     }),
     'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Switch',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'switch',
     'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterSwitch-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[switch_unit][switch.mock_switchunit-state]
+# name: test_switches[switch_unit][switch.mock_switchunit_switch-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'outlet',
-      'friendly_name': 'Mock SwitchUnit',
+      'friendly_name': 'Mock SwitchUnit Switch',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.mock_switchunit',
+    'entity_id': 'switch.mock_switchunit_switch',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
     'state': 'off',
   })
 # ---
-# name: test_switches[thermostat][switch.longan_link_hvac-entry]
+# name: test_switches[thermostat][switch.longan_link_hvac_switch-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -340,7 +340,7 @@
     'disabled_by': None,
     'domain': 'switch',
     'entity_category': None,
-    'entity_id': 'switch.longan_link_hvac',
+    'entity_id': 'switch.longan_link_hvac_switch',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -352,23 +352,23 @@
     }),
     'original_device_class': <SwitchDeviceClass.OUTLET: 'outlet'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Switch',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'switch',
     'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterSwitch-6-0',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_switches[thermostat][switch.longan_link_hvac-state]
+# name: test_switches[thermostat][switch.longan_link_hvac_switch-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'outlet',
-      'friendly_name': 'Longan link HVAC',
+      'friendly_name': 'Longan link HVAC Switch',
     }),
     'context': <ANY>,
-    'entity_id': 'switch.longan_link_hvac',
+    'entity_id': 'switch.longan_link_hvac_switch',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/snapshots/test_vacuum.ambr b/tests/components/matter/snapshots/test_vacuum.ambr
deleted file mode 100644
index 9e6b52ed572..00000000000
--- a/tests/components/matter/snapshots/test_vacuum.ambr
+++ /dev/null
@@ -1,48 +0,0 @@
-# serializer version: 1
-# name: test_vacuum[vacuum_cleaner][vacuum.mock_vacuum-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'vacuum',
-    'entity_category': None,
-    'entity_id': 'vacuum.mock_vacuum',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'matter',
-    'previous_unique_id': None,
-    'supported_features': <VacuumEntityFeature: 12308>,
-    'translation_key': None,
-    'unique_id': '00000000000004D2-0000000000000042-MatterNodeDevice-1-MatterVacuumCleaner-84-1',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_vacuum[vacuum_cleaner][vacuum.mock_vacuum-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Vacuum',
-      'supported_features': <VacuumEntityFeature: 12308>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'vacuum.mock_vacuum',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'idle',
-  })
-# ---
diff --git a/tests/components/matter/snapshots/test_valve.ambr b/tests/components/matter/snapshots/test_valve.ambr
index 98634635476..fac1e83ce05 100644
--- a/tests/components/matter/snapshots/test_valve.ambr
+++ b/tests/components/matter/snapshots/test_valve.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_valves[valve][valve.valve-entry]
+# name: test_valves[valve][valve.valve_valve-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -11,7 +11,7 @@
     'disabled_by': None,
     'domain': 'valve',
     'entity_category': None,
-    'entity_id': 'valve.valve',
+    'entity_id': 'valve.valve_valve',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -23,24 +23,24 @@
     }),
     'original_device_class': <ValveDeviceClass.WATER: 'water'>,
     'original_icon': None,
-    'original_name': None,
+    'original_name': 'Valve',
     'platform': 'matter',
     'previous_unique_id': None,
     'supported_features': <ValveEntityFeature: 3>,
-    'translation_key': None,
+    'translation_key': 'valve',
     'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-MatterValve-129-4',
     'unit_of_measurement': None,
   })
 # ---
-# name: test_valves[valve][valve.valve-state]
+# name: test_valves[valve][valve.valve_valve-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'device_class': 'water',
-      'friendly_name': 'Valve',
+      'friendly_name': 'Valve Valve',
       'supported_features': <ValveEntityFeature: 3>,
     }),
     'context': <ANY>,
-    'entity_id': 'valve.valve',
+    'entity_id': 'valve.valve_valve',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
diff --git a/tests/components/matter/test_adapter.py b/tests/components/matter/test_adapter.py
index 01dff3b7899..6b1816ec9f4 100644
--- a/tests/components/matter/test_adapter.py
+++ b/tests/components/matter/test_adapter.py
@@ -135,13 +135,13 @@ async def test_node_added_subscription(
     node_added_callback = matter_client.subscribe_events.call_args.kwargs["callback"]
     node = create_node_from_fixture("onoff_light")
 
-    entity_state = hass.states.get("light.mock_onoff_light")
+    entity_state = hass.states.get("light.mock_onoff_light_light")
     assert not entity_state
 
     node_added_callback(EventType.NODE_ADDED, node)
     await hass.async_block_till_done()
 
-    entity_state = hass.states.get("light.mock_onoff_light")
+    entity_state = hass.states.get("light.mock_onoff_light_light")
     assert entity_state
 
 
@@ -200,6 +200,6 @@ async def test_bad_node_not_crash_integration(
     await hass.async_block_till_done()
 
     assert matter_client.get_nodes.call_count == 1
-    assert hass.states.get("light.mock_onoff_light") is not None
+    assert hass.states.get("light.mock_onoff_light_light") is not None
     assert len(hass.states.async_all("light")) == 1
     assert "Error setting up node" in caplog.text
diff --git a/tests/components/matter/test_climate.py b/tests/components/matter/test_climate.py
index 037ec4e7626..b8402d18723 100644
--- a/tests/components/matter/test_climate.py
+++ b/tests/components/matter/test_climate.py
@@ -38,7 +38,7 @@ async def test_thermostat_base(
 ) -> None:
     """Test thermostat base attributes and state updates."""
     # test entity attributes
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["min_temp"] == 7
     assert state.attributes["max_temp"] == 35
@@ -60,7 +60,7 @@ async def test_thermostat_base(
     set_node_attribute(matter_node, 1, 513, 5, 1600)
     set_node_attribute(matter_node, 1, 513, 6, 3000)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["min_temp"] == 16
     assert state.attributes["max_temp"] == 30
@@ -74,56 +74,56 @@ async def test_thermostat_base(
     # test system mode update from device
     set_node_attribute(matter_node, 1, 513, 28, 0)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.state == HVACMode.OFF
 
     # test running state update from device
     set_node_attribute(matter_node, 1, 513, 41, 1)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.HEATING
 
     set_node_attribute(matter_node, 1, 513, 41, 8)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.HEATING
 
     set_node_attribute(matter_node, 1, 513, 41, 2)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.COOLING
 
     set_node_attribute(matter_node, 1, 513, 41, 16)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.COOLING
 
     set_node_attribute(matter_node, 1, 513, 41, 4)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.FAN
 
     set_node_attribute(matter_node, 1, 513, 41, 32)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.FAN
 
     set_node_attribute(matter_node, 1, 513, 41, 64)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.FAN
 
     set_node_attribute(matter_node, 1, 513, 41, 66)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["hvac_action"] == HVACAction.OFF
 
@@ -131,7 +131,7 @@ async def test_thermostat_base(
     set_node_attribute(matter_node, 1, 513, 28, 4)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.state == HVACMode.HEAT
 
@@ -139,7 +139,7 @@ async def test_thermostat_base(
     set_node_attribute(matter_node, 1, 513, 18, 2000)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.attributes["temperature"] == 20
 
@@ -152,14 +152,14 @@ async def test_thermostat_service_calls(
 ) -> None:
     """Test climate platform service calls."""
     # test single-setpoint temperature adjustment when cool mode is active
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.state == HVACMode.COOL
     await hass.services.async_call(
         "climate",
         "set_temperature",
         {
-            "entity_id": "climate.longan_link_hvac",
+            "entity_id": "climate.longan_link_hvac_thermostat",
             "temperature": 25,
         },
         blocking=True,
@@ -180,7 +180,7 @@ async def test_thermostat_service_calls(
         "climate",
         "set_temperature",
         {
-            "entity_id": "climate.longan_link_hvac",
+            "entity_id": "climate.longan_link_hvac_thermostat",
             "temperature": 25,
         },
         blocking=True,
@@ -192,7 +192,7 @@ async def test_thermostat_service_calls(
     # test single-setpoint temperature adjustment when heat mode is active
     set_node_attribute(matter_node, 1, 513, 28, 4)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.state == HVACMode.HEAT
 
@@ -200,7 +200,7 @@ async def test_thermostat_service_calls(
         "climate",
         "set_temperature",
         {
-            "entity_id": "climate.longan_link_hvac",
+            "entity_id": "climate.longan_link_hvac_thermostat",
             "temperature": 20,
         },
         blocking=True,
@@ -217,7 +217,7 @@ async def test_thermostat_service_calls(
     # test dual setpoint temperature adjustments when heat_cool mode is active
     set_node_attribute(matter_node, 1, 513, 28, 1)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.longan_link_hvac")
+    state = hass.states.get("climate.longan_link_hvac_thermostat")
     assert state
     assert state.state == HVACMode.HEAT_COOL
 
@@ -225,7 +225,7 @@ async def test_thermostat_service_calls(
         "climate",
         "set_temperature",
         {
-            "entity_id": "climate.longan_link_hvac",
+            "entity_id": "climate.longan_link_hvac_thermostat",
             "target_temp_low": 10,
             "target_temp_high": 30,
         },
@@ -250,7 +250,7 @@ async def test_thermostat_service_calls(
         "climate",
         "set_hvac_mode",
         {
-            "entity_id": "climate.longan_link_hvac",
+            "entity_id": "climate.longan_link_hvac_thermostat",
             "hvac_mode": HVACMode.HEAT,
         },
         blocking=True,
@@ -274,7 +274,7 @@ async def test_thermostat_service_calls(
         "climate",
         "set_temperature",
         {
-            "entity_id": "climate.longan_link_hvac",
+            "entity_id": "climate.longan_link_hvac_thermostat",
             "temperature": 22,
             "hvac_mode": HVACMode.COOL,
         },
@@ -304,7 +304,7 @@ async def test_room_airconditioner(
     matter_node: MatterNode,
 ) -> None:
     """Test if a climate entity is created for a Room Airconditioner device."""
-    state = hass.states.get("climate.room_airconditioner")
+    state = hass.states.get("climate.room_airconditioner_thermostat")
     assert state
     assert state.attributes["current_temperature"] == 20
     # room airconditioner has mains power on OnOff cluster with value set to False
@@ -318,7 +318,7 @@ async def test_room_airconditioner(
     # set mains power to ON (OnOff cluster)
     set_node_attribute(matter_node, 1, 6, 0, True)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.room_airconditioner")
+    state = hass.states.get("climate.room_airconditioner_thermostat")
 
     # test supported HVAC modes include fan and dry modes
     assert state.attributes["hvac_modes"] == [
@@ -332,19 +332,19 @@ async def test_room_airconditioner(
     # test fan-only hvac mode
     set_node_attribute(matter_node, 1, 513, 28, 7)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.room_airconditioner")
+    state = hass.states.get("climate.room_airconditioner_thermostat")
     assert state
     assert state.state == HVACMode.FAN_ONLY
 
     # test dry hvac mode
     set_node_attribute(matter_node, 1, 513, 28, 8)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.room_airconditioner")
+    state = hass.states.get("climate.room_airconditioner_thermostat")
     assert state
     assert state.state == HVACMode.DRY
 
     # test featuremap update
     set_node_attribute(matter_node, 1, 513, 65532, 1)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("climate.room_airconditioner")
+    state = hass.states.get("climate.room_airconditioner_thermostat")
     assert state.attributes["supported_features"] & ClimateEntityFeature.TURN_ON
diff --git a/tests/components/matter/test_config_flow.py b/tests/components/matter/test_config_flow.py
index eed776c132e..9b4f0ce1a21 100644
--- a/tests/components/matter/test_config_flow.py
+++ b/tests/components/matter/test_config_flow.py
@@ -5,19 +5,17 @@ from __future__ import annotations
 from collections.abc import Generator
 from ipaddress import ip_address
 from unittest.mock import AsyncMock, MagicMock, call, patch
-from uuid import uuid4
 
 from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import Discovery
 from matter_server.client.exceptions import CannotConnect, InvalidServerVersion
 import pytest
 
 from homeassistant import config_entries
+from homeassistant.components.hassio import HassioAPIError, HassioServiceInfo
 from homeassistant.components.matter.const import ADDON_SLUG, DOMAIN
 from homeassistant.components.zeroconf import ZeroconfServiceInfo
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from tests.common import MockConfigEntry
 
@@ -292,19 +290,7 @@ async def test_zeroconf_discovery_not_onboarded_not_supervisor(
 
 
 @pytest.mark.parametrize("zeroconf_info", [ZEROCONF_INFO_TCP, ZEROCONF_INFO_UDP])
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_zeroconf_not_onboarded_already_discovered(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -342,19 +328,7 @@ async def test_zeroconf_not_onboarded_already_discovered(
 
 
 @pytest.mark.parametrize("zeroconf_info", [ZEROCONF_INFO_TCP, ZEROCONF_INFO_UDP])
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_zeroconf_not_onboarded_running(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -386,19 +360,7 @@ async def test_zeroconf_not_onboarded_running(
 
 
 @pytest.mark.parametrize("zeroconf_info", [ZEROCONF_INFO_TCP, ZEROCONF_INFO_UDP])
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_zeroconf_not_onboarded_installed(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -432,19 +394,7 @@ async def test_zeroconf_not_onboarded_installed(
 
 
 @pytest.mark.parametrize("zeroconf_info", [ZEROCONF_INFO_TCP, ZEROCONF_INFO_UDP])
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_zeroconf_not_onboarded_not_installed(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -481,19 +431,7 @@ async def test_zeroconf_not_onboarded_not_installed(
     assert setup_entry.call_count == 1
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_supervisor_discovery(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -531,19 +469,7 @@ async def test_supervisor_discovery(
 
 @pytest.mark.parametrize(
     ("discovery_info", "error"),
-    [
-        (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
-            SupervisorError(),
-        )
-    ],
+    [({"config": ADDON_DISCOVERY_INFO}, SupervisorError())],
 )
 async def test_supervisor_discovery_addon_info_failed(
     hass: HomeAssistant,
@@ -576,19 +502,7 @@ async def test_supervisor_discovery_addon_info_failed(
     assert result["reason"] == "addon_info_failed"
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_clean_supervisor_discovery_on_user_create(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -879,19 +793,7 @@ async def test_not_addon(
     assert setup_entry.call_count == 1
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_running(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -937,15 +839,8 @@ async def test_addon_running(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
-            SupervisorError(),
+            {"config": ADDON_DISCOVERY_INFO},
+            HassioAPIError(),
             None,
             None,
             "addon_get_discovery_info_failed",
@@ -953,14 +848,7 @@ async def test_addon_running(
             False,
         ),
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             CannotConnect(Exception("Boom")),
             None,
@@ -969,7 +857,7 @@ async def test_addon_running(
             True,
         ),
         (
-            [],
+            None,
             None,
             None,
             None,
@@ -978,14 +866,7 @@ async def test_addon_running(
             False,
         ),
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             None,
             SupervisorError(),
@@ -1044,15 +925,8 @@ async def test_addon_running_failures(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
-            SupervisorError(),
+            {"config": ADDON_DISCOVERY_INFO},
+            HassioAPIError(),
             None,
             None,
             "addon_get_discovery_info_failed",
@@ -1060,14 +934,7 @@ async def test_addon_running_failures(
             False,
         ),
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             CannotConnect(Exception("Boom")),
             None,
@@ -1076,7 +943,7 @@ async def test_addon_running_failures(
             True,
         ),
         (
-            [],
+            None,
             None,
             None,
             None,
@@ -1085,14 +952,7 @@ async def test_addon_running_failures(
             False,
         ),
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             None,
             SupervisorError(),
@@ -1136,19 +996,7 @@ async def test_addon_running_failures_zeroconf(
     assert result["reason"] == abort_reason
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_running_already_configured(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -1186,19 +1034,7 @@ async def test_addon_running_already_configured(
     assert setup_entry.call_count == 1
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_installed(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -1248,35 +1084,21 @@ async def test_addon_installed(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             SupervisorError(),
             None,
             False,
             False,
         ),
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             CannotConnect(Exception("Boom")),
             True,
             True,
         ),
         (
-            [],
+            None,
             None,
             None,
             True,
@@ -1337,35 +1159,21 @@ async def test_addon_installed_failures(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             SupervisorError(),
             None,
             False,
             False,
         ),
         (
-            [
-                Discovery(
-                    addon="core_matter_server",
-                    service="matter",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             CannotConnect(Exception("Boom")),
             True,
             True,
         ),
         (
-            [],
+            None,
             None,
             None,
             True,
@@ -1405,19 +1213,7 @@ async def test_addon_installed_failures_zeroconf(
     assert result["reason"] == "addon_start_failed"
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_installed_already_configured(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -1463,19 +1259,7 @@ async def test_addon_installed_already_configured(
     assert setup_entry.call_count == 1
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_not_installed(
     hass: HomeAssistant,
     supervisor: MagicMock,
@@ -1584,19 +1368,7 @@ async def test_addon_not_installed_failures_zeroconf(
     assert result["reason"] == "addon_install_failed"
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_matter_server",
-                service="matter",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_not_installed_already_configured(
     hass: HomeAssistant,
     supervisor: MagicMock,
diff --git a/tests/components/matter/test_cover.py b/tests/components/matter/test_cover.py
index 224aabd9082..12fe37aa48b 100644
--- a/tests/components/matter/test_cover.py
+++ b/tests/components/matter/test_cover.py
@@ -33,11 +33,11 @@ async def test_covers(
 @pytest.mark.parametrize(
     ("node_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"),
+        ("window_covering_lift", "cover.mock_lift_window_covering_cover"),
+        ("window_covering_pa_lift", "cover.longan_link_wncv_da01_cover"),
+        ("window_covering_tilt", "cover.mock_tilt_window_covering_cover"),
+        ("window_covering_pa_tilt", "cover.mock_pa_tilt_window_covering_cover"),
+        ("window_covering_full", "cover.mock_full_window_covering_cover"),
     ],
 )
 async def test_cover(
@@ -103,9 +103,9 @@ async def test_cover(
 @pytest.mark.parametrize(
     ("node_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"),
+        ("window_covering_lift", "cover.mock_lift_window_covering_cover"),
+        ("window_covering_pa_lift", "cover.longan_link_wncv_da01_cover"),
+        ("window_covering_full", "cover.mock_full_window_covering_cover"),
     ],
 )
 async def test_cover_lift(
@@ -151,7 +151,7 @@ async def test_cover_lift(
 @pytest.mark.parametrize(
     ("node_fixture", "entity_id"),
     [
-        ("window_covering_lift", "cover.mock_lift_window_covering"),
+        ("window_covering_lift", "cover.mock_lift_window_covering_cover"),
     ],
 )
 async def test_cover_lift_only(
@@ -188,7 +188,7 @@ async def test_cover_lift_only(
 @pytest.mark.parametrize(
     ("node_fixture", "entity_id"),
     [
-        ("window_covering_pa_lift", "cover.longan_link_wncv_da01"),
+        ("window_covering_pa_lift", "cover.longan_link_wncv_da01_cover"),
     ],
 )
 async def test_cover_position_aware_lift(
@@ -232,9 +232,9 @@ async def test_cover_position_aware_lift(
 @pytest.mark.parametrize(
     ("node_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"),
+        ("window_covering_tilt", "cover.mock_tilt_window_covering_cover"),
+        ("window_covering_pa_tilt", "cover.mock_pa_tilt_window_covering_cover"),
+        ("window_covering_full", "cover.mock_full_window_covering_cover"),
     ],
 )
 async def test_cover_tilt(
@@ -282,7 +282,7 @@ async def test_cover_tilt(
 @pytest.mark.parametrize(
     ("node_fixture", "entity_id"),
     [
-        ("window_covering_tilt", "cover.mock_tilt_window_covering"),
+        ("window_covering_tilt", "cover.mock_tilt_window_covering_cover"),
     ],
 )
 async def test_cover_tilt_only(
@@ -317,7 +317,7 @@ async def test_cover_tilt_only(
 @pytest.mark.parametrize(
     ("node_fixture", "entity_id"),
     [
-        ("window_covering_pa_tilt", "cover.mock_pa_tilt_window_covering"),
+        ("window_covering_pa_tilt", "cover.mock_pa_tilt_window_covering_cover"),
     ],
 )
 async def test_cover_position_aware_tilt(
@@ -357,7 +357,7 @@ async def test_cover_full_features(
     matter_node: MatterNode,
 ) -> None:
     """Test window covering devices with all the features."""
-    entity_id = "cover.mock_full_window_covering"
+    entity_id = "cover.mock_full_window_covering_cover"
 
     state = hass.states.get(entity_id)
     assert state
diff --git a/tests/components/matter/test_fan.py b/tests/components/matter/test_fan.py
index 6ed95b0ecc2..ee0d46c2d64 100644
--- a/tests/components/matter/test_fan.py
+++ b/tests/components/matter/test_fan.py
@@ -51,7 +51,7 @@ async def test_fan_base(
     matter_node: MatterNode,
 ) -> None:
     """Test Fan platform."""
-    entity_id = "fan.air_purifier"
+    entity_id = "fan.air_purifier_fan"
     state = hass.states.get(entity_id)
     assert state
     assert state.attributes["preset_modes"] == [
@@ -119,7 +119,7 @@ async def test_fan_turn_on_with_percentage(
     matter_node: MatterNode,
 ) -> None:
     """Test turning on the fan with a specific percentage."""
-    entity_id = "fan.air_purifier"
+    entity_id = "fan.air_purifier_fan"
     await hass.services.async_call(
         FAN_DOMAIN,
         SERVICE_TURN_ON,
@@ -157,7 +157,7 @@ async def test_fan_turn_on_with_preset_mode(
     matter_node: MatterNode,
 ) -> None:
     """Test turning on the fan with a specific preset mode."""
-    entity_id = "fan.mocked_fan_switch"
+    entity_id = "fan.mocked_fan_switch_fan"
     await hass.services.async_call(
         FAN_DOMAIN,
         SERVICE_TURN_ON,
@@ -233,7 +233,7 @@ async def test_fan_turn_off(
     matter_node: MatterNode,
 ) -> None:
     """Test turning off the fan."""
-    entity_id = "fan.air_purifier"
+    entity_id = "fan.air_purifier_fan"
     await hass.services.async_call(
         FAN_DOMAIN,
         SERVICE_TURN_OFF,
@@ -276,7 +276,7 @@ async def test_fan_oscillate(
     matter_node: MatterNode,
 ) -> None:
     """Test oscillating the fan."""
-    entity_id = "fan.air_purifier"
+    entity_id = "fan.air_purifier_fan"
     for oscillating, value in ((True, 1), (False, 0)):
         await hass.services.async_call(
             FAN_DOMAIN,
@@ -300,7 +300,7 @@ async def test_fan_set_direction(
     matter_node: MatterNode,
 ) -> None:
     """Test oscillating the fan."""
-    entity_id = "fan.air_purifier"
+    entity_id = "fan.air_purifier_fan"
     for direction, value in ((DIRECTION_FORWARD, 0), (DIRECTION_REVERSE, 1)):
         await hass.services.async_call(
             FAN_DOMAIN,
@@ -323,7 +323,7 @@ async def test_fan_set_direction(
     [
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {
                 "1/514/65532": 0,
             },
@@ -331,7 +331,7 @@ async def test_fan_set_direction(
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {
                 "1/514/65532": 1,
             },
@@ -343,7 +343,7 @@ async def test_fan_set_direction(
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {
                 "1/514/65532": 4,
             },
@@ -355,7 +355,7 @@ async def test_fan_set_direction(
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {
                 "1/514/65532": 36,
             },
@@ -387,7 +387,7 @@ async def test_fan_supported_features(
     [
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {"1/514/1": 0, "1/514/65532": 0},
             [
                 "low",
@@ -397,7 +397,7 @@ async def test_fan_supported_features(
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {"1/514/1": 1, "1/514/65532": 0},
             [
                 "low",
@@ -406,25 +406,25 @@ async def test_fan_supported_features(
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {"1/514/1": 2, "1/514/65532": 0},
             ["low", "medium", "high", "auto"],
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {"1/514/1": 4, "1/514/65532": 0},
             ["high", "auto"],
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {"1/514/1": 5, "1/514/65532": 0},
             ["high"],
         ),
         (
             "fan",
-            "fan.mocked_fan_switch",
+            "fan.mocked_fan_switch_fan",
             {"1/514/1": 5, "1/514/65532": 8, "1/514/9": 3},
             ["high", "natural_wind", "sleep_wind"],
         ),
diff --git a/tests/components/matter/test_init.py b/tests/components/matter/test_init.py
index f6576689413..da8b8f63d58 100644
--- a/tests/components/matter/test_init.py
+++ b/tests/components/matter/test_init.py
@@ -67,7 +67,7 @@ async def test_entry_setup_unload(
     assert matter_client.connect.call_count == 1
     assert matter_client.set_default_fabric_label.call_count == 1
     assert entry.state is ConfigEntryState.LOADED
-    entity_state = hass.states.get("light.mock_onoff_light")
+    entity_state = hass.states.get("light.mock_onoff_light_light")
     assert entity_state
     assert entity_state.state != STATE_UNAVAILABLE
 
@@ -75,7 +75,7 @@ async def test_entry_setup_unload(
 
     assert matter_client.disconnect.call_count == 1
     assert entry.state is ConfigEntryState.NOT_LOADED
-    entity_state = hass.states.get("light.mock_onoff_light")
+    entity_state = hass.states.get("light.mock_onoff_light_light")
     assert entity_state
     assert entity_state.state == STATE_UNAVAILABLE
 
@@ -676,7 +676,7 @@ async def test_remove_config_entry_device(
     device_entry = dr.async_entries_for_config_entry(
         device_registry, config_entry.entry_id
     )[0]
-    entity_id = "light.m5stamp_lighting_app"
+    entity_id = "light.m5stamp_lighting_app_light"
 
     assert device_entry
     assert entity_registry.async_get(entity_id)
diff --git a/tests/components/matter/test_light.py b/tests/components/matter/test_light.py
index c49b47c9106..8e23045a00c 100644
--- a/tests/components/matter/test_light.py
+++ b/tests/components/matter/test_light.py
@@ -34,17 +34,17 @@ async def test_lights(
     [
         (
             "extended_color_light",
-            "light.mock_extended_color_light",
+            "light.mock_extended_color_light_light",
             ["color_temp", "hs", "xy"],
         ),
         (
             "color_temperature_light",
-            "light.mock_color_temperature_light",
+            "light.mock_color_temperature_light_light",
             ["color_temp"],
         ),
-        ("dimmable_light", "light.mock_dimmable_light", ["brightness"]),
-        ("onoff_light", "light.mock_onoff_light", ["onoff"]),
-        ("onoff_light_with_levelcontrol_present", "light.d215s", ["onoff"]),
+        ("dimmable_light", "light.mock_dimmable_light_light", ["brightness"]),
+        ("onoff_light", "light.mock_onoff_light_light", ["onoff"]),
+        ("onoff_light_with_levelcontrol_present", "light.d215s_light", ["onoff"]),
     ],
 )
 async def test_light_turn_on_off(
@@ -117,10 +117,10 @@ async def test_light_turn_on_off(
 @pytest.mark.parametrize(
     ("node_fixture", "entity_id"),
     [
-        ("extended_color_light", "light.mock_extended_color_light"),
-        ("color_temperature_light", "light.mock_color_temperature_light"),
-        ("dimmable_light", "light.mock_dimmable_light"),
-        ("dimmable_plugin_unit", "light.dimmable_plugin_unit"),
+        ("extended_color_light", "light.mock_extended_color_light_light"),
+        ("color_temperature_light", "light.mock_color_temperature_light_light"),
+        ("dimmable_light", "light.mock_dimmable_light_light"),
+        ("dimmable_plugin_unit", "light.dimmable_plugin_unit_light"),
     ],
 )
 async def test_dimmable_light(
@@ -185,8 +185,8 @@ async def test_dimmable_light(
 @pytest.mark.parametrize(
     ("node_fixture", "entity_id"),
     [
-        ("extended_color_light", "light.mock_extended_color_light"),
-        ("color_temperature_light", "light.mock_color_temperature_light"),
+        ("extended_color_light", "light.mock_extended_color_light_light"),
+        ("color_temperature_light", "light.mock_color_temperature_light_light"),
     ],
 )
 async def test_color_temperature_light(
@@ -274,7 +274,7 @@ async def test_color_temperature_light(
 @pytest.mark.parametrize(
     ("node_fixture", "entity_id"),
     [
-        ("extended_color_light", "light.mock_extended_color_light"),
+        ("extended_color_light", "light.mock_extended_color_light_light"),
     ],
 )
 async def test_extended_color_light(
diff --git a/tests/components/matter/test_lock.py b/tests/components/matter/test_lock.py
index 7bcfd381d6c..2f8de6d94a4 100644
--- a/tests/components/matter/test_lock.py
+++ b/tests/components/matter/test_lock.py
@@ -41,7 +41,7 @@ async def test_lock(
         "lock",
         "unlock",
         {
-            "entity_id": "lock.mock_door_lock",
+            "entity_id": "lock.mock_door_lock_lock",
         },
         blocking=True,
     )
@@ -59,7 +59,7 @@ async def test_lock(
         "lock",
         "lock",
         {
-            "entity_id": "lock.mock_door_lock",
+            "entity_id": "lock.mock_door_lock_lock",
         },
         blocking=True,
     )
@@ -74,42 +74,42 @@ async def test_lock(
     matter_client.send_device_command.reset_mock()
 
     await hass.async_block_till_done()
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.LOCKING
 
     set_node_attribute(matter_node, 1, 257, 0, 0)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.UNLOCKED
 
     set_node_attribute(matter_node, 1, 257, 0, 2)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.UNLOCKED
 
     set_node_attribute(matter_node, 1, 257, 0, 1)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.LOCKED
 
     set_node_attribute(matter_node, 1, 257, 0, None)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == STATE_UNKNOWN
 
     # test featuremap update
     set_node_attribute(matter_node, 1, 257, 65532, 4096)
     await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state.attributes["supported_features"] & LockEntityFeature.OPEN
 
 
@@ -135,7 +135,7 @@ async def test_lock_requires_pin(
         await hass.services.async_call(
             "lock",
             "lock",
-            {"entity_id": "lock.mock_door_lock", ATTR_CODE: "1234"},
+            {"entity_id": "lock.mock_door_lock_lock", ATTR_CODE: "1234"},
             blocking=True,
         )
 
@@ -144,7 +144,7 @@ async def test_lock_requires_pin(
     await hass.services.async_call(
         "lock",
         "lock",
-        {"entity_id": "lock.mock_door_lock", ATTR_CODE: code},
+        {"entity_id": "lock.mock_door_lock_lock", ATTR_CODE: code},
         blocking=True,
     )
     assert matter_client.send_device_command.call_count == 1
@@ -158,13 +158,13 @@ async def test_lock_requires_pin(
     # Lock door using default code
     default_code = "7654321"
     entity_registry.async_update_entity_options(
-        "lock.mock_door_lock", "lock", {"default_code": default_code}
+        "lock.mock_door_lock_lock", "lock", {"default_code": default_code}
     )
     await trigger_subscription_callback(hass, matter_client)
     await hass.services.async_call(
         "lock",
         "lock",
-        {"entity_id": "lock.mock_door_lock"},
+        {"entity_id": "lock.mock_door_lock_lock"},
         blocking=True,
     )
     assert matter_client.send_device_command.call_count == 2
@@ -183,7 +183,7 @@ async def test_lock_with_unbolt(
     matter_node: MatterNode,
 ) -> None:
     """Test door lock."""
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.LOCKED
     assert state.attributes["supported_features"] & LockEntityFeature.OPEN
@@ -192,7 +192,7 @@ async def test_lock_with_unbolt(
         "lock",
         "unlock",
         {
-            "entity_id": "lock.mock_door_lock",
+            "entity_id": "lock.mock_door_lock_lock",
         },
         blocking=True,
     )
@@ -210,7 +210,7 @@ async def test_lock_with_unbolt(
         "lock",
         "open",
         {
-            "entity_id": "lock.mock_door_lock",
+            "entity_id": "lock.mock_door_lock_lock",
         },
         blocking=True,
     )
@@ -223,20 +223,20 @@ async def test_lock_with_unbolt(
     )
 
     await hass.async_block_till_done()
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.OPENING
 
     set_node_attribute(matter_node, 1, 257, 0, 0)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.UNLOCKED
 
     set_node_attribute(matter_node, 1, 257, 0, 3)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("lock.mock_door_lock")
+    state = hass.states.get("lock.mock_door_lock_lock")
     assert state
     assert state.state == LockState.OPEN
diff --git a/tests/components/matter/test_switch.py b/tests/components/matter/test_switch.py
index d7a6a700cde..6a18d403f10 100644
--- a/tests/components/matter/test_switch.py
+++ b/tests/components/matter/test_switch.py
@@ -35,7 +35,7 @@ async def test_turn_on(
     matter_node: MatterNode,
 ) -> None:
     """Test turning on a switch."""
-    state = hass.states.get("switch.mock_onoffpluginunit")
+    state = hass.states.get("switch.mock_onoffpluginunit_switch")
     assert state
     assert state.state == "off"
 
@@ -43,7 +43,7 @@ async def test_turn_on(
         "switch",
         "turn_on",
         {
-            "entity_id": "switch.mock_onoffpluginunit",
+            "entity_id": "switch.mock_onoffpluginunit_switch",
         },
         blocking=True,
     )
@@ -58,7 +58,7 @@ async def test_turn_on(
     set_node_attribute(matter_node, 1, 6, 0, True)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("switch.mock_onoffpluginunit")
+    state = hass.states.get("switch.mock_onoffpluginunit_switch")
     assert state
     assert state.state == "on"
 
@@ -70,7 +70,7 @@ async def test_turn_off(
     matter_node: MatterNode,
 ) -> None:
     """Test turning off a switch."""
-    state = hass.states.get("switch.mock_onoffpluginunit")
+    state = hass.states.get("switch.mock_onoffpluginunit_switch")
     assert state
     assert state.state == "off"
 
@@ -78,7 +78,7 @@ async def test_turn_off(
         "switch",
         "turn_off",
         {
-            "entity_id": "switch.mock_onoffpluginunit",
+            "entity_id": "switch.mock_onoffpluginunit_switch",
         },
         blocking=True,
     )
@@ -97,10 +97,10 @@ async def test_switch_unit(hass: HomeAssistant, matter_node: MatterNode) -> None
     # A switch entity should be discovered as fallback for ANY Matter device (endpoint)
     # that has the OnOff cluster and does not fall into an explicit discovery schema
     # by another platform (e.g. light, lock etc.).
-    state = hass.states.get("switch.mock_switchunit")
+    state = hass.states.get("switch.mock_switchunit_switch")
     assert state
     assert state.state == "off"
-    assert state.attributes["friendly_name"] == "Mock SwitchUnit"
+    assert state.attributes["friendly_name"] == "Mock SwitchUnit Switch"
 
 
 @pytest.mark.parametrize("node_fixture", ["room_airconditioner"])
diff --git a/tests/components/matter/test_vacuum.py b/tests/components/matter/test_vacuum.py
deleted file mode 100644
index 86f7542395a..00000000000
--- a/tests/components/matter/test_vacuum.py
+++ /dev/null
@@ -1,209 +0,0 @@
-"""Test Matter vacuum."""
-
-from unittest.mock import MagicMock, call
-
-from chip.clusters import Objects as clusters
-from matter_server.client.models.node import MatterNode
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant, HomeAssistantError
-from homeassistant.helpers import entity_registry as er
-
-from .common import (
-    set_node_attribute,
-    snapshot_matter_entities,
-    trigger_subscription_callback,
-)
-
-
-@pytest.mark.usefixtures("matter_devices")
-async def test_vacuum(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test that the correct entities get created for a vacuum device."""
-    snapshot_matter_entities(hass, entity_registry, snapshot, Platform.VACUUM)
-
-
-@pytest.mark.parametrize("node_fixture", ["vacuum_cleaner"])
-async def test_vacuum_actions(
-    hass: HomeAssistant,
-    matter_client: MagicMock,
-    matter_node: MatterNode,
-) -> None:
-    """Test vacuum entity actions."""
-    entity_id = "vacuum.mock_vacuum"
-    state = hass.states.get(entity_id)
-    assert state
-
-    # test return_to_base action
-    await hass.services.async_call(
-        "vacuum",
-        "return_to_base",
-        {
-            "entity_id": entity_id,
-        },
-        blocking=True,
-    )
-
-    assert matter_client.send_device_command.call_count == 1
-    assert matter_client.send_device_command.call_args == call(
-        node_id=matter_node.node_id,
-        endpoint_id=1,
-        command=clusters.RvcOperationalState.Commands.GoHome(),
-    )
-    matter_client.send_device_command.reset_mock()
-
-    # test start/resume action
-    await hass.services.async_call(
-        "vacuum",
-        "start",
-        {
-            "entity_id": entity_id,
-        },
-        blocking=True,
-    )
-
-    assert matter_client.send_device_command.call_count == 1
-    assert matter_client.send_device_command.call_args == call(
-        node_id=matter_node.node_id,
-        endpoint_id=1,
-        command=clusters.RvcOperationalState.Commands.Resume(),
-    )
-    matter_client.send_device_command.reset_mock()
-
-    # test pause action
-    await hass.services.async_call(
-        "vacuum",
-        "pause",
-        {
-            "entity_id": entity_id,
-        },
-        blocking=True,
-    )
-
-    assert matter_client.send_device_command.call_count == 1
-    assert matter_client.send_device_command.call_args == call(
-        node_id=matter_node.node_id,
-        endpoint_id=1,
-        command=clusters.OperationalState.Commands.Pause(),
-    )
-    matter_client.send_device_command.reset_mock()
-
-    # test stop action
-    # stop command is not supported by the vacuum fixture
-    with pytest.raises(
-        HomeAssistantError,
-        match="Entity vacuum.mock_vacuum does not support this service.",
-    ):
-        await hass.services.async_call(
-            "vacuum",
-            "stop",
-            {
-                "entity_id": entity_id,
-            },
-            blocking=True,
-        )
-
-    # update accepted command list to add support for stop command
-    set_node_attribute(
-        matter_node, 1, 97, 65529, [clusters.OperationalState.Commands.Stop.command_id]
-    )
-    await trigger_subscription_callback(hass, matter_client)
-    await hass.services.async_call(
-        "vacuum",
-        "stop",
-        {
-            "entity_id": entity_id,
-        },
-        blocking=True,
-    )
-    assert matter_client.send_device_command.call_count == 1
-    assert matter_client.send_device_command.call_args == call(
-        node_id=matter_node.node_id,
-        endpoint_id=1,
-        command=clusters.OperationalState.Commands.Stop(),
-    )
-    matter_client.send_device_command.reset_mock()
-
-
-@pytest.mark.parametrize("node_fixture", ["vacuum_cleaner"])
-async def test_vacuum_updates(
-    hass: HomeAssistant,
-    matter_client: MagicMock,
-    matter_node: MatterNode,
-) -> None:
-    """Test vacuum entity updates."""
-    entity_id = "vacuum.mock_vacuum"
-    state = hass.states.get(entity_id)
-    assert state
-    # confirm initial state is idle (as stored in the fixture)
-    assert state.state == "idle"
-
-    # confirm state is 'docked' by setting the operational state to 0x42
-    set_node_attribute(matter_node, 1, 97, 4, 0x42)
-    await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == "docked"
-
-    # confirm state is 'docked' by setting the operational state to 0x41
-    set_node_attribute(matter_node, 1, 97, 4, 0x41)
-    await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == "docked"
-
-    # confirm state is 'returning' by setting the operational state to 0x40
-    set_node_attribute(matter_node, 1, 97, 4, 0x40)
-    await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == "returning"
-
-    # confirm state is 'error' by setting the operational state to 0x01
-    set_node_attribute(matter_node, 1, 97, 4, 0x01)
-    await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == "error"
-
-    # confirm state is 'error' by setting the operational state to 0x02
-    set_node_attribute(matter_node, 1, 97, 4, 0x02)
-    await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == "error"
-
-    # confirm state is 'cleaning' by setting;
-    # - the operational state to 0x00
-    # - the run mode is set to a mode which has cleaning tag
-    set_node_attribute(matter_node, 1, 97, 4, 0)
-    set_node_attribute(matter_node, 1, 84, 1, 1)
-    await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == "cleaning"
-
-    # confirm state is 'idle' by setting;
-    # - the operational state to 0x00
-    # - the run mode is set to a mode which has idle tag
-    set_node_attribute(matter_node, 1, 97, 4, 0)
-    set_node_attribute(matter_node, 1, 84, 1, 0)
-    await trigger_subscription_callback(hass, matter_client)
-    state = hass.states.get(entity_id)
-    assert state
-    assert state.state == "idle"
-
-    # confirm state is 'unknown' by setting;
-    # - the operational state to 0x00
-    # - the run mode is set to a mode which has neither cleaning or idle tag
-    set_node_attribute(matter_node, 1, 97, 4, 0)
-    set_node_attribute(matter_node, 1, 84, 1, 2)
-    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_valve.py b/tests/components/matter/test_valve.py
index 9c4429dda65..412849f6e23 100644
--- a/tests/components/matter/test_valve.py
+++ b/tests/components/matter/test_valve.py
@@ -35,11 +35,11 @@ async def test_valve(
     matter_node: MatterNode,
 ) -> None:
     """Test valve entity is created for a Matter ValveConfigurationAndControl Cluster."""
-    entity_id = "valve.valve"
+    entity_id = "valve.valve_valve"
     state = hass.states.get(entity_id)
     assert state
     assert state.state == "closed"
-    assert state.attributes["friendly_name"] == "Valve"
+    assert state.attributes["friendly_name"] == "Valve Valve"
 
     # test close_valve action
     await hass.services.async_call(
diff --git a/tests/components/mealie/conftest.py b/tests/components/mealie/conftest.py
index 8e724e4d8ea..ba42d16e56e 100644
--- a/tests/components/mealie/conftest.py
+++ b/tests/components/mealie/conftest.py
@@ -1,7 +1,7 @@
 """Mealie tests configuration."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 from aiomealie import (
     About,
@@ -20,6 +20,7 @@ from homeassistant.components.mealie.const import DOMAIN
 from homeassistant.const import CONF_API_TOKEN, CONF_HOST
 
 from tests.common import MockConfigEntry, load_fixture
+from tests.components.smhi.common import AsyncMock
 
 SHOPPING_LIST_ID = "list-id-1"
 SHOPPING_ITEM_NOTE = "Shopping Item 1"
diff --git a/tests/components/media_player/test_browse_media.py b/tests/components/media_player/test_browse_media.py
index ea684ea2bc2..2b7e40923bf 100644
--- a/tests/components/media_player/test_browse_media.py
+++ b/tests/components/media_player/test_browse_media.py
@@ -7,8 +7,8 @@ import pytest
 from homeassistant.components.media_player.browse_media import (
     async_process_play_media_url,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.network import NoURLAvailableError
 
diff --git a/tests/components/media_source/test_local_source.py b/tests/components/media_source/test_local_source.py
index d3ae95736a5..de90f229a85 100644
--- a/tests/components/media_source/test_local_source.py
+++ b/tests/components/media_source/test_local_source.py
@@ -11,8 +11,8 @@ import pytest
 
 from homeassistant.components import media_source, websocket_api
 from homeassistant.components.media_source import const
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockUser
diff --git a/tests/components/met/test_config_flow.py b/tests/components/met/test_config_flow.py
index 1a2485615d7..c7f0311edef 100644
--- a/tests/components/met/test_config_flow.py
+++ b/tests/components/met/test_config_flow.py
@@ -8,9 +8,9 @@ import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.met.const import DOMAIN, HOME_LOCATION_NAME
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 
 from . import init_integration
diff --git a/tests/components/met/test_init.py b/tests/components/met/test_init.py
index 54f6930513b..b329e2ff01c 100644
--- a/tests/components/met/test_init.py
+++ b/tests/components/met/test_init.py
@@ -7,9 +7,9 @@ from homeassistant.components.met.const import (
     DEFAULT_HOME_LONGITUDE,
     DOMAIN,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import device_registry as dr
 
 from . import init_integration
diff --git a/tests/components/microsoft/test_tts.py b/tests/components/microsoft/test_tts.py
index e10ec589113..0f11501843e 100644
--- a/tests/components/microsoft/test_tts.py
+++ b/tests/components/microsoft/test_tts.py
@@ -10,8 +10,8 @@ import pytest
 from homeassistant.components import tts
 from homeassistant.components.media_player import ATTR_MEDIA_CONTENT_ID
 from homeassistant.components.microsoft.tts import SUPPORTED_LANGUAGES
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.exceptions import ServiceNotFound
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/mikrotik/test_config_flow.py b/tests/components/mikrotik/test_config_flow.py
index f65c7f0dfc5..d95a6488fc7 100644
--- a/tests/components/mikrotik/test_config_flow.py
+++ b/tests/components/mikrotik/test_config_flow.py
@@ -14,7 +14,6 @@ from homeassistant.components.mikrotik.const import (
 )
 from homeassistant.const import (
     CONF_HOST,
-    CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_USERNAME,
@@ -180,10 +179,7 @@ async def test_reauth_success(hass: HomeAssistant, api) -> None:
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
-    assert result["description_placeholders"] == {
-        CONF_NAME: "Mock Title",
-        CONF_USERNAME: "username",
-    }
+    assert result["description_placeholders"] == {CONF_USERNAME: "username"}
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
diff --git a/tests/components/mobile_app/test_init.py b/tests/components/mobile_app/test_init.py
index a4edbea6ecf..e1c7ed27cf9 100644
--- a/tests/components/mobile_app/test_init.py
+++ b/tests/components/mobile_app/test_init.py
@@ -226,37 +226,3 @@ async def test_delete_cloud_hook(
         await hass.async_block_till_done()
         assert config_entry.state is ConfigEntryState.LOADED
         assert (CONF_CLOUDHOOK_URL in config_entry.data) == should_cloudhook_exist
-
-
-async def test_remove_entry_on_user_remove(
-    hass: HomeAssistant,
-    hass_admin_user: MockUser,
-) -> None:
-    """Test removing related config entry, when a user gets removed from HA."""
-
-    config_entry = MockConfigEntry(
-        data={
-            **REGISTER_CLEARTEXT,
-            CONF_WEBHOOK_ID: "test-webhook-id",
-            ATTR_DEVICE_NAME: "Test",
-            ATTR_DEVICE_ID: "Test",
-            CONF_USER_ID: hass_admin_user.id,
-            CONF_CLOUDHOOK_URL: "https://hook-url-already-exists",
-        },
-        domain=DOMAIN,
-        title="Test",
-    )
-    config_entry.add_to_hass(hass)
-
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(entries) == 1
-
-    await hass.auth.async_remove_user(hass_admin_user)
-    await hass.async_block_till_done()
-
-    entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(entries) == 0
diff --git a/tests/components/modbus/conftest.py b/tests/components/modbus/conftest.py
index cdea046ceea..5c612f9f8ad 100644
--- a/tests/components/modbus/conftest.py
+++ b/tests/components/modbus/conftest.py
@@ -57,7 +57,7 @@ def check_config_loaded_fixture():
 @pytest.fixture(name="register_words")
 def register_words_fixture():
     """Set default for register_words."""
-    return [0x00]
+    return [0x00, 0x00]
 
 
 @pytest.fixture(name="config_addon")
diff --git a/tests/components/modbus/test_binary_sensor.py b/tests/components/modbus/test_binary_sensor.py
index 24293377174..6aae0e7feae 100644
--- a/tests/components/modbus/test_binary_sensor.py
+++ b/tests/components/modbus/test_binary_sensor.py
@@ -3,7 +3,6 @@
 import pytest
 
 from homeassistant.components.binary_sensor import DOMAIN as SENSOR_DOMAIN
-from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.modbus.const import (
     CALL_TYPE_COIL,
     CALL_TYPE_DISCRETE,
@@ -16,12 +15,10 @@ from homeassistant.components.modbus.const import (
     MODBUS_DOMAIN,
 )
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ADDRESS,
     CONF_BINARY_SENSORS,
     CONF_DEVICE_CLASS,
     CONF_NAME,
-    CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
     CONF_UNIQUE_ID,
@@ -29,7 +26,7 @@ from homeassistant.const import (
     STATE_ON,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
+from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
@@ -215,20 +212,14 @@ async def test_service_binary_sensor_update(
     """Run test for service homeassistant.update_entity."""
 
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
 
     mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_ON
@@ -437,7 +428,7 @@ async def test_no_discovery_info_binary_sensor(
     assert await async_setup_component(
         hass,
         SENSOR_DOMAIN,
-        {SENSOR_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {SENSOR_DOMAIN: {"platform": MODBUS_DOMAIN}},
     )
     await hass.async_block_till_done()
     assert SENSOR_DOMAIN in hass.config.components
diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py
index d34846639b5..5578234ee6e 100644
--- a/tests/components/modbus/test_climate.py
+++ b/tests/components/modbus/test_climate.py
@@ -20,10 +20,6 @@ from homeassistant.components.climate import (
     FAN_OFF,
     FAN_ON,
     FAN_TOP,
-    SERVICE_SET_FAN_MODE,
-    SERVICE_SET_HVAC_MODE,
-    SERVICE_SET_SWING_MODE,
-    SERVICE_SET_TEMPERATURE,
     SWING_BOTH,
     SWING_HORIZONTAL,
     SWING_OFF,
@@ -31,7 +27,6 @@ from homeassistant.components.climate import (
     SWING_VERTICAL,
     HVACMode,
 )
-from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.modbus.const import (
     CONF_CLIMATES,
     CONF_DATA_TYPE,
@@ -71,17 +66,15 @@ from homeassistant.components.modbus.const import (
     DataType,
 )
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     ATTR_TEMPERATURE,
     CONF_ADDRESS,
     CONF_NAME,
-    CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
+from homeassistant.core import HomeAssistant, State
 from homeassistant.setup import async_setup_component
 
 from .conftest import TEST_ENTITY_NAME, ReadResult
@@ -159,13 +152,13 @@ ENTITY_ID = f"{CLIMATE_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
                     CONF_HVAC_MODE_REGISTER: {
                         CONF_ADDRESS: 11,
                         CONF_HVAC_MODE_VALUES: {
-                            CONF_HVAC_MODE_OFF: 0,
-                            CONF_HVAC_MODE_HEAT: 1,
-                            CONF_HVAC_MODE_COOL: 2,
-                            CONF_HVAC_MODE_HEAT_COOL: 3,
-                            CONF_HVAC_MODE_DRY: 4,
-                            CONF_HVAC_MODE_FAN_ONLY: 5,
-                            CONF_HVAC_MODE_AUTO: 6,
+                            "state_off": 0,
+                            "state_heat": 1,
+                            "state_cool": 2,
+                            "state_heat_cool": 3,
+                            "state_dry": 4,
+                            "state_fan_only": 5,
+                            "state_auto": 6,
                         },
                     },
                 }
@@ -183,13 +176,13 @@ ENTITY_ID = f"{CLIMATE_DOMAIN}.{TEST_ENTITY_NAME}".replace(" ", "_")
                         CONF_ADDRESS: 11,
                         CONF_WRITE_REGISTERS: True,
                         CONF_HVAC_MODE_VALUES: {
-                            CONF_HVAC_MODE_OFF: 0,
-                            CONF_HVAC_MODE_HEAT: 1,
-                            CONF_HVAC_MODE_COOL: 2,
-                            CONF_HVAC_MODE_HEAT_COOL: 3,
-                            CONF_HVAC_MODE_DRY: 4,
-                            CONF_HVAC_MODE_FAN_ONLY: 5,
-                            CONF_HVAC_MODE_AUTO: 6,
+                            "state_off": 0,
+                            "state_heat": 1,
+                            "state_cool": 2,
+                            "state_heat_cool": 3,
+                            "state_dry": 4,
+                            "state_fan_only": 5,
+                            "state_auto": 6,
                         },
                     },
                 }
@@ -508,10 +501,7 @@ async def test_service_climate_update(
     """Run test for service homeassistant.update_entity."""
     mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == result
@@ -626,10 +616,7 @@ async def test_service_climate_fan_update(
     """Run test for service homeassistant.update_entity."""
     mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).attributes[ATTR_FAN_MODE] == result
@@ -769,10 +756,7 @@ async def test_service_climate_swing_update(
     """Run test for service homeassistant.update_entity."""
     mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words)
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).attributes[ATTR_SWING_MODE] == result
@@ -866,9 +850,9 @@ async def test_service_climate_set_temperature(
     mock_modbus_ha.read_holding_registers.return_value = ReadResult(result)
     await hass.services.async_call(
         CLIMATE_DOMAIN,
-        SERVICE_SET_TEMPERATURE,
+        "set_temperature",
         {
-            ATTR_ENTITY_ID: ENTITY_ID,
+            "entity_id": ENTITY_ID,
             ATTR_TEMPERATURE: temperature,
         },
         blocking=True,
@@ -977,9 +961,9 @@ async def test_service_set_hvac_mode(
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
-        SERVICE_SET_HVAC_MODE,
+        "set_hvac_mode",
         {
-            ATTR_ENTITY_ID: ENTITY_ID,
+            "entity_id": ENTITY_ID,
             ATTR_HVAC_MODE: hvac_mode,
         },
         blocking=True,
@@ -1040,9 +1024,9 @@ async def test_service_set_fan_mode(
     mock_modbus_ha.read_holding_registers.return_value = ReadResult(result)
     await hass.services.async_call(
         CLIMATE_DOMAIN,
-        SERVICE_SET_FAN_MODE,
+        "set_fan_mode",
         {
-            ATTR_ENTITY_ID: ENTITY_ID,
+            "entity_id": ENTITY_ID,
             ATTR_FAN_MODE: fan_mode,
         },
         blocking=True,
@@ -1103,9 +1087,9 @@ async def test_service_set_swing_mode(
     mock_modbus_ha.read_holding_registers.return_value = ReadResult(result)
     await hass.services.async_call(
         CLIMATE_DOMAIN,
-        SERVICE_SET_SWING_MODE,
+        "set_swing_mode",
         {
-            ATTR_ENTITY_ID: ENTITY_ID,
+            "entity_id": ENTITY_ID,
             ATTR_SWING_MODE: swing_mode,
         },
         blocking=True,
@@ -1190,7 +1174,7 @@ async def test_no_discovery_info_climate(
     assert await async_setup_component(
         hass,
         CLIMATE_DOMAIN,
-        {CLIMATE_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {CLIMATE_DOMAIN: {"platform": MODBUS_DOMAIN}},
     )
     await hass.async_block_till_done()
     assert CLIMATE_DOMAIN in hass.config.components
diff --git a/tests/components/modbus/test_cover.py b/tests/components/modbus/test_cover.py
index ae709f483e1..e2b4d658f7d 100644
--- a/tests/components/modbus/test_cover.py
+++ b/tests/components/modbus/test_cover.py
@@ -4,7 +4,6 @@ from pymodbus.exceptions import ModbusException
 import pytest
 
 from homeassistant.components.cover import DOMAIN as COVER_DOMAIN, CoverState
-from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.modbus.const import (
     CALL_TYPE_COIL,
     CALL_TYPE_REGISTER_HOLDING,
@@ -19,18 +18,14 @@ from homeassistant.components.modbus.const import (
     MODBUS_DOMAIN,
 )
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ADDRESS,
     CONF_COVERS,
     CONF_NAME,
-    CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
-    SERVICE_CLOSE_COVER,
-    SERVICE_OPEN_COVER,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
+from homeassistant.core import HomeAssistant, State
 from homeassistant.setup import async_setup_component
 
 from .conftest import TEST_ENTITY_NAME, ReadResult
@@ -186,18 +181,12 @@ async def test_register_cover(hass: HomeAssistant, expected, mock_do_cycle) -> N
 async def test_service_cover_update(hass: HomeAssistant, mock_modbus_ha) -> None:
     """Run test for service homeassistant.update_entity."""
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        "update_entity",
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == CoverState.CLOSED
     mock_modbus_ha.read_holding_registers.return_value = ReadResult([0x01])
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == CoverState.OPEN
 
@@ -267,27 +256,27 @@ async def test_service_cover_move(hass: HomeAssistant, mock_modbus_ha) -> None:
 
     mock_modbus_ha.read_holding_registers.return_value = ReadResult([0x01])
     await hass.services.async_call(
-        COVER_DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+        "cover", "open_cover", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == CoverState.OPEN
 
     mock_modbus_ha.read_holding_registers.return_value = ReadResult([0x00])
     await hass.services.async_call(
-        COVER_DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+        "cover", "close_cover", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == CoverState.CLOSED
 
     await mock_modbus_ha.reset()
     mock_modbus_ha.read_holding_registers.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        COVER_DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+        "cover", "close_cover", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert mock_modbus_ha.read_holding_registers.called
     assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
 
     mock_modbus_ha.read_coils.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        COVER_DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: ENTITY_ID2}, blocking=True
+        "cover", "close_cover", {"entity_id": ENTITY_ID2}, blocking=True
     )
     assert hass.states.get(ENTITY_ID2).state == STATE_UNAVAILABLE
 
@@ -300,7 +289,7 @@ async def test_no_discovery_info_cover(
     assert await async_setup_component(
         hass,
         COVER_DOMAIN,
-        {COVER_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {COVER_DOMAIN: {"platform": MODBUS_DOMAIN}},
     )
     await hass.async_block_till_done()
     assert COVER_DOMAIN in hass.config.components
diff --git a/tests/components/modbus/test_fan.py b/tests/components/modbus/test_fan.py
index 2afc6314048..d52b9dc309a 100644
--- a/tests/components/modbus/test_fan.py
+++ b/tests/components/modbus/test_fan.py
@@ -4,7 +4,6 @@ from pymodbus.exceptions import ModbusException
 import pytest
 
 from homeassistant.components.fan import DOMAIN as FAN_DOMAIN
-from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.modbus.const import (
     CALL_TYPE_COIL,
     CALL_TYPE_DISCRETE,
@@ -20,21 +19,17 @@ from homeassistant.components.modbus.const import (
     MODBUS_DOMAIN,
 )
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ADDRESS,
     CONF_COMMAND_OFF,
     CONF_COMMAND_ON,
     CONF_NAME,
-    CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
+from homeassistant.core import HomeAssistant, State
 from homeassistant.setup import async_setup_component
 
 from .conftest import TEST_ENTITY_NAME, ReadResult
@@ -274,12 +269,12 @@ async def test_fan_service_turn(
 
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     await hass.services.async_call(
-        FAN_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "fan", "turn_on", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_ON
     await hass.services.async_call(
-        FAN_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "fan", "turn_off", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
@@ -287,26 +282,26 @@ async def test_fan_service_turn(
     mock_modbus.read_holding_registers.return_value = ReadResult([0x01])
     assert hass.states.get(ENTITY_ID2).state == STATE_OFF
     await hass.services.async_call(
-        FAN_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "fan", "turn_on", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_ON
     mock_modbus.read_holding_registers.return_value = ReadResult([0x00])
     await hass.services.async_call(
-        FAN_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "fan", "turn_off", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_OFF
 
     mock_modbus.write_register.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        FAN_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "fan", "turn_on", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_UNAVAILABLE
     mock_modbus.write_coil.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        FAN_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "fan", "turn_off", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
@@ -330,18 +325,12 @@ async def test_fan_service_turn(
 async def test_service_fan_update(hass: HomeAssistant, mock_modbus_ha) -> None:
     """Run test for service homeassistant.update_entity."""
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == STATE_ON
 
@@ -354,7 +343,7 @@ async def test_no_discovery_info_fan(
     assert await async_setup_component(
         hass,
         FAN_DOMAIN,
-        {FAN_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {FAN_DOMAIN: {"platform": MODBUS_DOMAIN}},
     )
     await hass.async_block_till_done()
     assert FAN_DOMAIN in hass.config.components
diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
index 3b8a76f5606..728c2c37ccd 100644
--- a/tests/components/modbus/test_init.py
+++ b/tests/components/modbus/test_init.py
@@ -52,6 +52,7 @@ from homeassistant.components.modbus.const import (
     CONF_INPUT_TYPE,
     CONF_MSG_WAIT,
     CONF_PARITY,
+    CONF_RETRIES,
     CONF_SLAVE_COUNT,
     CONF_STOPBITS,
     CONF_SWAP,
@@ -571,6 +572,18 @@ async def test_no_duplicate_names(hass: HomeAssistant, do_config) -> None:
                 }
             ],
         },
+        {
+            CONF_TYPE: TCP,
+            CONF_HOST: TEST_MODBUS_HOST,
+            CONF_PORT: TEST_PORT_TCP,
+            CONF_RETRIES: 3,
+            CONF_SENSORS: [
+                {
+                    CONF_NAME: "dummy",
+                    CONF_ADDRESS: 9999,
+                }
+            ],
+        },
         {
             CONF_TYPE: TCP,
             CONF_HOST: TEST_MODBUS_HOST,
diff --git a/tests/components/modbus/test_light.py b/tests/components/modbus/test_light.py
index 745249ff866..e74da085180 100644
--- a/tests/components/modbus/test_light.py
+++ b/tests/components/modbus/test_light.py
@@ -3,7 +3,6 @@
 from pymodbus.exceptions import ModbusException
 import pytest
 
-from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 from homeassistant.components.modbus.const import (
     CALL_TYPE_COIL,
@@ -19,22 +18,18 @@ from homeassistant.components.modbus.const import (
     MODBUS_DOMAIN,
 )
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ADDRESS,
     CONF_COMMAND_OFF,
     CONF_COMMAND_ON,
     CONF_LIGHTS,
     CONF_NAME,
-    CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
+from homeassistant.core import HomeAssistant, State
 from homeassistant.setup import async_setup_component
 
 from .conftest import TEST_ENTITY_NAME, ReadResult
@@ -274,12 +269,12 @@ async def test_light_service_turn(
 
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "light", "turn_on", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_ON
     await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "light", "turn_off", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
@@ -287,20 +282,20 @@ async def test_light_service_turn(
     mock_modbus.read_holding_registers.return_value = ReadResult([0x01])
     assert hass.states.get(ENTITY_ID2).state == STATE_OFF
     await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "light", "turn_on", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_ON
     mock_modbus.read_holding_registers.return_value = ReadResult([0x00])
     await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "light", "turn_off", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_OFF
 
     mock_modbus.write_register.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "light", "turn_on", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_UNAVAILABLE
@@ -324,18 +319,12 @@ async def test_light_service_turn(
 async def test_service_light_update(hass: HomeAssistant, mock_modbus_ha) -> None:
     """Run test for service homeassistant.update_entity."""
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == STATE_ON
 
@@ -348,7 +337,7 @@ async def test_no_discovery_info_light(
     assert await async_setup_component(
         hass,
         LIGHT_DOMAIN,
-        {LIGHT_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {LIGHT_DOMAIN: {"platform": MODBUS_DOMAIN}},
     )
     await hass.async_block_till_done()
     assert LIGHT_DOMAIN in hass.config.components
diff --git a/tests/components/modbus/test_sensor.py b/tests/components/modbus/test_sensor.py
index fc63a300c5c..87015fa634c 100644
--- a/tests/components/modbus/test_sensor.py
+++ b/tests/components/modbus/test_sensor.py
@@ -4,13 +4,13 @@ import struct
 
 import pytest
 
-from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.modbus.const import (
     CALL_TYPE_REGISTER_HOLDING,
     CALL_TYPE_REGISTER_INPUT,
     CONF_DATA_TYPE,
     CONF_DEVICE_ADDRESS,
     CONF_INPUT_TYPE,
+    CONF_LAZY_ERROR,
     CONF_MAX_VALUE,
     CONF_MIN_VALUE,
     CONF_NAN_VALUE,
@@ -32,13 +32,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ADDRESS,
     CONF_COUNT,
     CONF_DEVICE_CLASS,
     CONF_NAME,
     CONF_OFFSET,
-    CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SENSORS,
     CONF_SLAVE,
@@ -47,7 +45,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
+from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
@@ -168,6 +166,17 @@ SLAVE_UNIQUE_ID = "ground_floor_sensor"
                 }
             ]
         },
+        {
+            CONF_SENSORS: [
+                {
+                    CONF_NAME: TEST_ENTITY_NAME,
+                    CONF_ADDRESS: 51,
+                    CONF_DATA_TYPE: DataType.INT32,
+                    CONF_VIRTUAL_COUNT: 5,
+                    CONF_LAZY_ERROR: 3,
+                }
+            ]
+        },
         {
             CONF_SENSORS: [
                 {
@@ -1386,18 +1395,12 @@ async def test_service_sensor_update(hass: HomeAssistant, mock_modbus_ha) -> Non
     """Run test for service homeassistant.update_entity."""
     mock_modbus_ha.read_input_registers.return_value = ReadResult([27])
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == "27"
     mock_modbus_ha.read_input_registers.return_value = ReadResult([32])
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == "32"
 
@@ -1410,7 +1413,7 @@ async def test_no_discovery_info_sensor(
     assert await async_setup_component(
         hass,
         SENSOR_DOMAIN,
-        {SENSOR_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {SENSOR_DOMAIN: {"platform": MODBUS_DOMAIN}},
     )
     await hass.async_block_till_done()
     assert SENSOR_DOMAIN in hass.config.components
diff --git a/tests/components/modbus/test_switch.py b/tests/components/modbus/test_switch.py
index 4e0ad0841ea..999983a5e30 100644
--- a/tests/components/modbus/test_switch.py
+++ b/tests/components/modbus/test_switch.py
@@ -6,7 +6,6 @@ from unittest import mock
 from pymodbus.exceptions import ModbusException
 import pytest
 
-from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.modbus.const import (
     CALL_TYPE_COIL,
     CALL_TYPE_DISCRETE,
@@ -22,24 +21,20 @@ from homeassistant.components.modbus.const import (
 )
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ADDRESS,
     CONF_COMMAND_OFF,
     CONF_COMMAND_ON,
     CONF_DELAY,
     CONF_DEVICE_CLASS,
     CONF_NAME,
-    CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
     CONF_SWITCHES,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
+from homeassistant.core import HomeAssistant, State
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
@@ -80,7 +75,7 @@ ENTITY_ID3 = f"{ENTITY_ID}_3"
                     CONF_SLAVE: 1,
                     CONF_COMMAND_OFF: 0x00,
                     CONF_COMMAND_ON: 0x01,
-                    CONF_DEVICE_CLASS: SWITCH_DOMAIN,
+                    CONF_DEVICE_CLASS: "switch",
                     CONF_VERIFY: {
                         CONF_INPUT_TYPE: CALL_TYPE_REGISTER_HOLDING,
                         CONF_ADDRESS: 1235,
@@ -98,7 +93,7 @@ ENTITY_ID3 = f"{ENTITY_ID}_3"
                     CONF_DEVICE_ADDRESS: 1,
                     CONF_COMMAND_OFF: 0x00,
                     CONF_COMMAND_ON: 0x01,
-                    CONF_DEVICE_CLASS: SWITCH_DOMAIN,
+                    CONF_DEVICE_CLASS: "switch",
                     CONF_VERIFY: {
                         CONF_INPUT_TYPE: CALL_TYPE_REGISTER_HOLDING,
                         CONF_ADDRESS: 1235,
@@ -116,7 +111,7 @@ ENTITY_ID3 = f"{ENTITY_ID}_3"
                     CONF_SLAVE: 1,
                     CONF_COMMAND_OFF: 0x00,
                     CONF_COMMAND_ON: 0x01,
-                    CONF_DEVICE_CLASS: SWITCH_DOMAIN,
+                    CONF_DEVICE_CLASS: "switch",
                     CONF_VERIFY: {
                         CONF_INPUT_TYPE: CALL_TYPE_REGISTER_INPUT,
                         CONF_ADDRESS: 1235,
@@ -135,7 +130,7 @@ ENTITY_ID3 = f"{ENTITY_ID}_3"
                     CONF_SLAVE: 1,
                     CONF_COMMAND_OFF: 0x00,
                     CONF_COMMAND_ON: 0x01,
-                    CONF_DEVICE_CLASS: SWITCH_DOMAIN,
+                    CONF_DEVICE_CLASS: "switch",
                     CONF_VERIFY: {
                         CONF_INPUT_TYPE: CALL_TYPE_DISCRETE,
                         CONF_ADDRESS: 1235,
@@ -153,7 +148,7 @@ ENTITY_ID3 = f"{ENTITY_ID}_3"
                     CONF_SLAVE: 1,
                     CONF_COMMAND_OFF: 0x00,
                     CONF_COMMAND_ON: 0x01,
-                    CONF_DEVICE_CLASS: SWITCH_DOMAIN,
+                    CONF_DEVICE_CLASS: "switch",
                     CONF_SCAN_INTERVAL: 0,
                     CONF_VERIFY: None,
                 }
@@ -167,7 +162,7 @@ ENTITY_ID3 = f"{ENTITY_ID}_3"
                     CONF_DEVICE_ADDRESS: 10,
                     CONF_COMMAND_OFF: 0x00,
                     CONF_COMMAND_ON: 0x01,
-                    CONF_DEVICE_CLASS: SWITCH_DOMAIN,
+                    CONF_DEVICE_CLASS: "switch",
                     CONF_VERIFY: {
                         CONF_INPUT_TYPE: CALL_TYPE_REGISTER_HOLDING,
                         CONF_ADDRESS: 1235,
@@ -185,7 +180,7 @@ ENTITY_ID3 = f"{ENTITY_ID}_3"
                     CONF_DEVICE_ADDRESS: 10,
                     CONF_COMMAND_OFF: 0x00,
                     CONF_COMMAND_ON: 0x01,
-                    CONF_DEVICE_CLASS: SWITCH_DOMAIN,
+                    CONF_DEVICE_CLASS: "switch",
                     CONF_VERIFY: {
                         CONF_INPUT_TYPE: CALL_TYPE_REGISTER_HOLDING,
                         CONF_ADDRESS: 1235,
@@ -344,12 +339,12 @@ async def test_switch_service_turn(
 
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "switch", "turn_on", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_ON
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "switch", "turn_off", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
@@ -357,45 +352,45 @@ async def test_switch_service_turn(
     mock_modbus.read_holding_registers.return_value = ReadResult([0x01])
     assert hass.states.get(ENTITY_ID2).state == STATE_OFF
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "switch", "turn_on", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_ON
     mock_modbus.read_holding_registers.return_value = ReadResult([0x00])
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "switch", "turn_off", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_OFF
     mock_modbus.read_holding_registers.return_value = ReadResult([0x03])
     assert hass.states.get(ENTITY_ID3).state == STATE_OFF
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID3}
+        "switch", "turn_on", service_data={"entity_id": ENTITY_ID3}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID3).state == STATE_ON
     mock_modbus.read_holding_registers.return_value = ReadResult([0x00])
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID3}
+        "switch", "turn_off", service_data={"entity_id": ENTITY_ID3}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID3).state == STATE_OFF
 
     mock_modbus.write_register.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID2}
+        "switch", "turn_on", service_data={"entity_id": ENTITY_ID2}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID2).state == STATE_UNAVAILABLE
     mock_modbus.write_coil.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_OFF, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "switch", "turn_off", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
     mock_modbus.write_register.side_effect = ModbusException("fail write_")
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID3}
+        "switch", "turn_on", service_data={"entity_id": ENTITY_ID3}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID3).state == STATE_UNAVAILABLE
@@ -439,18 +434,12 @@ async def test_switch_service_turn(
 async def test_service_switch_update(hass: HomeAssistant, mock_modbus_ha) -> None:
     """Run test for service homeassistant.update_entity."""
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
     mock_modbus_ha.read_coils.return_value = ReadResult([0x01])
     await hass.services.async_call(
-        HOMEASSISTANT_DOMAIN,
-        SERVICE_UPDATE_ENTITY,
-        {ATTR_ENTITY_ID: ENTITY_ID},
-        blocking=True,
+        "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True
     )
     assert hass.states.get(ENTITY_ID).state == STATE_ON
 
@@ -478,7 +467,7 @@ async def test_delay_switch(hass: HomeAssistant, mock_modbus) -> None:
     mock_modbus.read_holding_registers.return_value = ReadResult([0x01])
     now = dt_util.utcnow()
     await hass.services.async_call(
-        SWITCH_DOMAIN, SERVICE_TURN_ON, service_data={ATTR_ENTITY_ID: ENTITY_ID}
+        "switch", "turn_on", service_data={"entity_id": ENTITY_ID}
     )
     await hass.async_block_till_done()
     assert hass.states.get(ENTITY_ID).state == STATE_OFF
@@ -497,7 +486,7 @@ async def test_no_discovery_info_switch(
     assert await async_setup_component(
         hass,
         SWITCH_DOMAIN,
-        {SWITCH_DOMAIN: {CONF_PLATFORM: MODBUS_DOMAIN}},
+        {SWITCH_DOMAIN: {"platform": MODBUS_DOMAIN}},
     )
     await hass.async_block_till_done()
     assert SWITCH_DOMAIN in hass.config.components
diff --git a/tests/components/motioneye/__init__.py b/tests/components/motioneye/__init__.py
index 842d862a222..3a80e6dc63d 100644
--- a/tests/components/motioneye/__init__.py
+++ b/tests/components/motioneye/__init__.py
@@ -9,10 +9,10 @@ from motioneye_client.const import DEFAULT_PORT
 
 from homeassistant.components.motioneye.const import DOMAIN
 from homeassistant.components.motioneye.entity import get_motioneye_entity_unique_id
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import entity_registry as er
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/motioneye/test_config_flow.py b/tests/components/motioneye/test_config_flow.py
index 8d942e7a2a1..d2ec91b08e3 100644
--- a/tests/components/motioneye/test_config_flow.py
+++ b/tests/components/motioneye/test_config_flow.py
@@ -9,6 +9,7 @@ from motioneye_client.client import (
 )
 
 from homeassistant import config_entries
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.components.motioneye.const import (
     CONF_ADMIN_PASSWORD,
     CONF_ADMIN_USERNAME,
@@ -22,7 +23,6 @@ from homeassistant.components.motioneye.const import (
 from homeassistant.const import CONF_URL, CONF_WEBHOOK_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from . import TEST_URL, create_mock_motioneye_client, create_mock_motioneye_config_entry
 
diff --git a/tests/components/mqtt/conftest.py b/tests/components/mqtt/conftest.py
index 22f0416a2c6..7395767aeae 100644
--- a/tests/components/mqtt/conftest.py
+++ b/tests/components/mqtt/conftest.py
@@ -4,7 +4,7 @@ import asyncio
 from collections.abc import AsyncGenerator, Generator
 from random import getrandbits
 from typing import Any
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 
@@ -87,8 +87,7 @@ async def setup_with_birth_msg_client_mock(
         patch("homeassistant.components.mqtt.client.SUBSCRIBE_COOLDOWN", 0.0),
     ):
         entry = MockConfigEntry(
-            domain=mqtt.DOMAIN,
-            data=mqtt_config_entry_data or {mqtt.CONF_BROKER: "test-broker"},
+            domain=mqtt.DOMAIN, data={mqtt.CONF_BROKER: "test-broker"}
         )
         entry.add_to_hass(hass)
         hass.config.components.add(mqtt.DOMAIN)
@@ -122,10 +121,3 @@ def record_calls(recorded_calls: list[ReceiveMessage]) -> MessageCallbackType:
         recorded_calls.append(msg)
 
     return record_calls
-
-
-@pytest.fixture
-def tag_mock() -> Generator[AsyncMock]:
-    """Fixture to mock tag."""
-    with patch("homeassistant.components.tag.async_scan_tag") as mock_tag:
-        yield mock_tag
diff --git a/tests/components/mqtt/test_alarm_control_panel.py b/tests/components/mqtt/test_alarm_control_panel.py
index b46829650f6..07ebb671e37 100644
--- a/tests/components/mqtt/test_alarm_control_panel.py
+++ b/tests/components/mqtt/test_alarm_control_panel.py
@@ -9,10 +9,7 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant.components import alarm_control_panel, mqtt
-from homeassistant.components.alarm_control_panel import (
-    AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import AlarmControlPanelEntityFeature
 from homeassistant.components.mqtt.alarm_control_panel import (
     MQTT_ALARM_ATTRIBUTES_BLOCKED,
 )
@@ -28,6 +25,16 @@ from homeassistant.const import (
     SERVICE_ALARM_DISARM,
     SERVICE_ALARM_TRIGGER,
     SERVICE_RELOAD,
+    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,
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
@@ -50,7 +57,6 @@ from .test_common import (
     help_test_entity_device_info_update,
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_id_update_subscriptions,
     help_test_entity_name,
@@ -207,23 +213,23 @@ async def test_update_state_via_state_topic(
     assert hass.states.get(entity_id).state == STATE_UNKNOWN
 
     for state in (
-        AlarmControlPanelState.DISARMED,
-        AlarmControlPanelState.ARMED_HOME,
-        AlarmControlPanelState.ARMED_AWAY,
-        AlarmControlPanelState.ARMED_NIGHT,
-        AlarmControlPanelState.ARMED_VACATION,
-        AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        AlarmControlPanelState.PENDING,
-        AlarmControlPanelState.ARMING,
-        AlarmControlPanelState.DISARMING,
-        AlarmControlPanelState.TRIGGERED,
+        STATE_ALARM_DISARMED,
+        STATE_ALARM_ARMED_HOME,
+        STATE_ALARM_ARMED_AWAY,
+        STATE_ALARM_ARMED_NIGHT,
+        STATE_ALARM_ARMED_VACATION,
+        STATE_ALARM_ARMED_CUSTOM_BYPASS,
+        STATE_ALARM_PENDING,
+        STATE_ALARM_ARMING,
+        STATE_ALARM_DISARMING,
+        STATE_ALARM_TRIGGERED,
     ):
         async_fire_mqtt_message(hass, "alarm/state", state)
         assert hass.states.get(entity_id).state == state
 
-    # Ignore empty payload (last state is AlarmControlPanelState.TRIGGERED)
+    # Ignore empty payload (last state is STATE_ALARM_TRIGGERED)
     async_fire_mqtt_message(hass, "alarm/state", "")
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     # Reset state on `None` payload
     async_fire_mqtt_message(hass, "alarm/state", "None")
@@ -763,7 +769,7 @@ async def test_update_state_via_state_topic_template(
     async_fire_mqtt_message(hass, "test-topic", "100")
 
     state = hass.states.get("alarm_control_panel.test")
-    assert state.state == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMED_AWAY
 
 
 @pytest.mark.parametrize(
@@ -1281,18 +1287,6 @@ async def test_entity_name(
     )
 
 
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity icon or picture setup."""
-    domain = alarm_control_panel.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
-
-
 @pytest.mark.parametrize(
     "hass_config",
     [
@@ -1312,11 +1306,7 @@ async def test_entity_icon_and_entity_picture(
 @pytest.mark.parametrize(
     ("topic", "payload1", "payload2"),
     [
-        (
-            "test-topic",
-            AlarmControlPanelState.DISARMED,
-            AlarmControlPanelState.ARMED_HOME,
-        ),
+        ("test-topic", STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME),
         ("availability-topic", "online", "offline"),
         ("json-attributes-topic", '{"attr1": "val1"}', '{"attr1": "val2"}'),
     ],
diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py
index d27163c3423..79a32169818 100644
--- a/tests/components/mqtt/test_binary_sensor.py
+++ b/tests/components/mqtt/test_binary_sensor.py
@@ -40,7 +40,6 @@ from .test_common import (
     help_test_entity_device_info_update,
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_id_update_subscriptions,
     help_test_entity_name,
@@ -1194,18 +1193,6 @@ async def test_entity_name(
     )
 
 
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity icon or picture setup."""
-    domain = binary_sensor.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
-
-
 @pytest.mark.parametrize(
     "hass_config",
     [
diff --git a/tests/components/mqtt/test_button.py b/tests/components/mqtt/test_button.py
index f147b33c88b..d85ead6ecee 100644
--- a/tests/components/mqtt/test_button.py
+++ b/tests/components/mqtt/test_button.py
@@ -25,7 +25,6 @@ from .test_common import (
     help_test_entity_device_info_update,
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_name,
     help_test_publishing_with_custom_encoding,
@@ -535,15 +534,3 @@ async def test_entity_name(
     await help_test_entity_name(
         hass, mqtt_mock_entry, domain, config, expected_friendly_name, device_class
     )
-
-
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity icon or picture setup."""
-    domain = button.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
diff --git a/tests/components/mqtt/test_client.py b/tests/components/mqtt/test_client.py
index 164c164cdfc..e02719991f8 100644
--- a/tests/components/mqtt/test_client.py
+++ b/tests/components/mqtt/test_client.py
@@ -1716,97 +1716,6 @@ async def test_mqtt_subscribes_topics_on_connect(
     assert ("still/pending", 1) in subscribe_calls
 
 
-@pytest.mark.parametrize("mqtt_config_entry_data", [ENTRY_DEFAULT_BIRTH_MESSAGE])
-async def test_mqtt_subscribes_wildcard_topics_in_correct_order(
-    hass: HomeAssistant,
-    mock_debouncer: asyncio.Event,
-    setup_with_birth_msg_client_mock: MqttMockPahoClient,
-    record_calls: MessageCallbackType,
-) -> None:
-    """Test subscription to wildcard topics on connect in the order of subscription."""
-    mqtt_client_mock = setup_with_birth_msg_client_mock
-
-    mock_debouncer.clear()
-    await mqtt.async_subscribe(hass, "integration/test#", record_calls)
-    await mqtt.async_subscribe(hass, "integration/kitchen_sink#", record_calls)
-    await mock_debouncer.wait()
-
-    def _assert_subscription_order():
-        discovery_subscribes = [
-            f"homeassistant/{platform}/+/config" for platform in SUPPORTED_COMPONENTS
-        ]
-        discovery_subscribes.extend(
-            [
-                f"homeassistant/{platform}/+/+/config"
-                for platform in SUPPORTED_COMPONENTS
-            ]
-        )
-        discovery_subscribes.extend(
-            ["homeassistant/device/+/config", "homeassistant/device/+/+/config"]
-        )
-        discovery_subscribes.extend(["integration/test#", "integration/kitchen_sink#"])
-
-        expected_discovery_subscribes = discovery_subscribes.copy()
-
-        # Assert we see the expected subscribes and in the correct order
-        actual_subscribes = [
-            discovery_subscribes.pop(0)
-            for call in help_all_subscribe_calls(mqtt_client_mock)
-            if discovery_subscribes and discovery_subscribes[0] == call[0]
-        ]
-
-        # Assert we have processed all items and that they are in the correct order
-        assert len(discovery_subscribes) == 0
-        assert actual_subscribes == expected_discovery_subscribes
-
-    # Assert the initial wildcard topic subscription order
-    _assert_subscription_order()
-
-    mqtt_client_mock.on_disconnect(Mock(), None, 0)
-
-    mqtt_client_mock.reset_mock()
-
-    mock_debouncer.clear()
-    mqtt_client_mock.on_connect(Mock(), None, 0, 0)
-    await mock_debouncer.wait()
-
-    # Assert the wildcard topic subscription order after a reconnect
-    _assert_subscription_order()
-
-
-@pytest.mark.parametrize(
-    "mqtt_config_entry_data",
-    [ENTRY_DEFAULT_BIRTH_MESSAGE | {mqtt.CONF_DISCOVERY: False}],
-)
-async def test_mqtt_discovery_not_subscribes_when_disabled(
-    hass: HomeAssistant,
-    mock_debouncer: asyncio.Event,
-    setup_with_birth_msg_client_mock: MqttMockPahoClient,
-) -> None:
-    """Test discovery subscriptions not performend when discovery is disabled."""
-    mqtt_client_mock = setup_with_birth_msg_client_mock
-
-    await mock_debouncer.wait()
-
-    subscribe_calls = help_all_subscribe_calls(mqtt_client_mock)
-    for component in SUPPORTED_COMPONENTS:
-        assert (f"homeassistant/{component}/+/config", 0) not in subscribe_calls
-        assert (f"homeassistant/{component}/+/+/config", 0) not in subscribe_calls
-
-    mqtt_client_mock.on_disconnect(Mock(), None, 0)
-
-    mqtt_client_mock.reset_mock()
-
-    mock_debouncer.clear()
-    mqtt_client_mock.on_connect(Mock(), None, 0, 0)
-    await mock_debouncer.wait()
-
-    subscribe_calls = help_all_subscribe_calls(mqtt_client_mock)
-    for component in SUPPORTED_COMPONENTS:
-        assert (f"homeassistant/{component}/+/config", 0) not in subscribe_calls
-        assert (f"homeassistant/{component}/+/+/config", 0) not in subscribe_calls
-
-
 @pytest.mark.parametrize(
     "mqtt_config_entry_data",
     [ENTRY_DEFAULT_BIRTH_MESSAGE],
diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py
index 5edd73e3f5a..ab650224416 100644
--- a/tests/components/mqtt/test_climate.py
+++ b/tests/components/mqtt/test_climate.py
@@ -53,7 +53,6 @@ from .test_common import (
     help_test_entity_device_info_update,
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_id_update_subscriptions,
     help_test_publishing_with_custom_encoding,
@@ -2449,15 +2448,3 @@ async def test_value_template_fails(
         "TypeError: unsupported operand type(s) for *: 'NoneType' and 'int' rendering template"
         in caplog.text
     )
-
-
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity name setup."""
-    domain = climate.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
diff --git a/tests/components/mqtt/test_common.py b/tests/components/mqtt/test_common.py
index 95a26daf562..f35c3f2a523 100644
--- a/tests/components/mqtt/test_common.py
+++ b/tests/components/mqtt/test_common.py
@@ -69,7 +69,6 @@ DEFAULT_CONFIG_DEVICE_INFO_MAC = {
 _SENTINEL = object()
 
 DISCOVERY_COUNT = len(MQTT)
-DEVICE_DISCOVERY_COUNT = 2
 
 type _MqttMessageType = list[tuple[str, str]]
 type _AttributesType = list[tuple[str, Any]]
@@ -1190,10 +1189,7 @@ async def help_test_entity_id_update_subscriptions(
     assert state is not None
     assert (
         mqtt_mock.async_subscribe.call_count
-        == len(topics)
-        + 2 * len(SUPPORTED_COMPONENTS)
-        + DISCOVERY_COUNT
-        + DEVICE_DISCOVERY_COUNT
+        == len(topics) + 2 * len(SUPPORTED_COMPONENTS) + DISCOVERY_COUNT
     )
     for topic in topics:
         mqtt_mock.async_subscribe.assert_any_call(
@@ -1672,61 +1668,6 @@ async def help_test_entity_category(
     assert not ent_registry.async_get_entity_id(domain, mqtt.DOMAIN, unique_id)
 
 
-async def help_test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    domain: str,
-    config: ConfigType,
-    default_entity_picture: str | None = None,
-) -> None:
-    """Test entity picture and icon."""
-    await mqtt_mock_entry()
-    # Add device settings to config
-    config = copy.deepcopy(config[mqtt.DOMAIN][domain])
-    config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
-
-    ent_registry = er.async_get(hass)
-
-    # Discover an entity without entity icon or picture
-    unique_id = "veryunique1"
-    config["unique_id"] = unique_id
-    data = json.dumps(config)
-    async_fire_mqtt_message(hass, f"homeassistant/{domain}/{unique_id}/config", data)
-    await hass.async_block_till_done()
-    entity_id = ent_registry.async_get_entity_id(domain, mqtt.DOMAIN, unique_id)
-    state = hass.states.get(entity_id)
-    assert entity_id is not None and state
-    assert state.attributes.get("icon") is None
-    assert state.attributes.get("entity_picture") == default_entity_picture
-
-    # Discover an entity with an entity picture set
-    unique_id = "veryunique2"
-    config["entity_picture"] = "https://example.com/mypicture.png"
-    config["unique_id"] = unique_id
-    data = json.dumps(config)
-    async_fire_mqtt_message(hass, f"homeassistant/{domain}/{unique_id}/config", data)
-    await hass.async_block_till_done()
-    entity_id = ent_registry.async_get_entity_id(domain, mqtt.DOMAIN, unique_id)
-    state = hass.states.get(entity_id)
-    assert entity_id is not None and state
-    assert state.attributes.get("icon") is None
-    assert state.attributes.get("entity_picture") == "https://example.com/mypicture.png"
-    config.pop("entity_picture")
-
-    # Discover an entity with an entity icon set
-    unique_id = "veryunique3"
-    config["icon"] = "mdi:emoji-happy-outline"
-    config["unique_id"] = unique_id
-    data = json.dumps(config)
-    async_fire_mqtt_message(hass, f"homeassistant/{domain}/{unique_id}/config", data)
-    await hass.async_block_till_done()
-    entity_id = ent_registry.async_get_entity_id(domain, mqtt.DOMAIN, unique_id)
-    state = hass.states.get(entity_id)
-    assert entity_id is not None and state
-    assert state.attributes.get("icon") == "mdi:emoji-happy-outline"
-    assert state.attributes.get("entity_picture") == default_entity_picture
-
-
 async def help_test_publishing_with_custom_encoding(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
diff --git a/tests/components/mqtt/test_config_flow.py b/tests/components/mqtt/test_config_flow.py
index e99063b088b..f714bb745cd 100644
--- a/tests/components/mqtt/test_config_flow.py
+++ b/tests/components/mqtt/test_config_flow.py
@@ -9,13 +9,12 @@ from unittest.mock import AsyncMock, MagicMock, patch
 from uuid import uuid4
 
 from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import Discovery
 import pytest
 import voluptuous as vol
 
 from homeassistant import config_entries
 from homeassistant.components import mqtt
-from homeassistant.components.hassio import AddonError
+from homeassistant.components.hassio import AddonError, HassioServiceInfo
 from homeassistant.components.mqtt.config_flow import PWD_NOT_CHANGED
 from homeassistant.const import (
     CONF_CLIENT_ID,
@@ -26,7 +25,6 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from tests.common import MockConfigEntry
 from tests.typing import MqttMockHAClientGenerator, MqttMockPahoClient
@@ -444,7 +442,7 @@ async def test_hassio_ignored(hass: HomeAssistant) -> None:
     )
     assert result
     assert result.get("type") is FlowResultType.ABORT
-    assert result.get("reason") == "single_instance_allowed"
+    assert result.get("reason") == "already_configured"
 
 
 async def test_hassio_confirm(
@@ -530,19 +528,7 @@ async def test_hassio_cannot_connect(
 @pytest.mark.usefixtures(
     "mqtt_client_mock", "supervisor", "addon_info", "addon_running"
 )
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_mosquitto",
-                service="mqtt",
-                uuid=uuid4(),
-                config=ADD_ON_DISCOVERY_INFO.copy(),
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADD_ON_DISCOVERY_INFO.copy()}])
 async def test_addon_flow_with_supervisor_addon_running(
     hass: HomeAssistant,
     mock_try_connection_success: MagicMock,
@@ -584,19 +570,7 @@ async def test_addon_flow_with_supervisor_addon_running(
 @pytest.mark.usefixtures(
     "mqtt_client_mock", "supervisor", "addon_info", "addon_installed", "start_addon"
 )
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_mosquitto",
-                service="mqtt",
-                uuid=uuid4(),
-                config=ADD_ON_DISCOVERY_INFO.copy(),
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADD_ON_DISCOVERY_INFO.copy()}])
 async def test_addon_flow_with_supervisor_addon_installed(
     hass: HomeAssistant,
     mock_try_connection_success: MagicMock,
@@ -651,19 +625,7 @@ async def test_addon_flow_with_supervisor_addon_installed(
 @pytest.mark.usefixtures(
     "mqtt_client_mock", "supervisor", "addon_info", "addon_running"
 )
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_mosquitto",
-                service="mqtt",
-                uuid=uuid4(),
-                config=ADD_ON_DISCOVERY_INFO.copy(),
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADD_ON_DISCOVERY_INFO.copy()}])
 async def test_addon_flow_with_supervisor_addon_running_connection_fails(
     hass: HomeAssistant,
     mock_try_connection: MagicMock,
@@ -818,19 +780,7 @@ async def test_addon_info_error(
     "install_addon",
     "start_addon",
 )
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_mosquitto",
-                service="mqtt",
-                uuid=uuid4(),
-                config=ADD_ON_DISCOVERY_INFO.copy(),
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADD_ON_DISCOVERY_INFO.copy()}])
 async def test_addon_flow_with_supervisor_addon_not_installed(
     hass: HomeAssistant,
     mock_try_connection_success: MagicMock,
@@ -1626,19 +1576,7 @@ async def test_step_reauth(
     await hass.async_block_till_done()
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_mosquitto",
-                service="mqtt",
-                uuid=uuid4(),
-                config=ADD_ON_DISCOVERY_INFO.copy(),
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADD_ON_DISCOVERY_INFO.copy()}])
 @pytest.mark.usefixtures(
     "mqtt_client_mock", "mock_reload_after_entry_update", "supervisor", "addon_running"
 )
@@ -1687,30 +1625,8 @@ async def test_step_hassio_reauth(
 @pytest.mark.parametrize(
     ("discovery_info", "discovery_info_side_effect", "broker"),
     [
-        (
-            [
-                Discovery(
-                    addon="core_mosquitto",
-                    service="mqtt",
-                    uuid=uuid4(),
-                    config=ADD_ON_DISCOVERY_INFO.copy(),
-                )
-            ],
-            AddonError,
-            "core-mosquitto",
-        ),
-        (
-            [
-                Discovery(
-                    addon="core_mosquitto",
-                    service="mqtt",
-                    uuid=uuid4(),
-                    config=ADD_ON_DISCOVERY_INFO.copy(),
-                )
-            ],
-            None,
-            "broker-not-addon",
-        ),
+        ({"config": ADD_ON_DISCOVERY_INFO.copy()}, AddonError, "core-mosquitto"),
+        ({"config": ADD_ON_DISCOVERY_INFO.copy()}, None, "broker-not-addon"),
     ],
 )
 @pytest.mark.usefixtures(
diff --git a/tests/components/mqtt/test_cover.py b/tests/components/mqtt/test_cover.py
index ee74b78be81..fddfb18db18 100644
--- a/tests/components/mqtt/test_cover.py
+++ b/tests/components/mqtt/test_cover.py
@@ -62,7 +62,6 @@ from .test_common import (
     help_test_entity_device_info_update,
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_id_update_subscriptions,
     help_test_publishing_with_custom_encoding,
@@ -3549,15 +3548,3 @@ async def test_value_template_fails(
         "TypeError: unsupported operand type(s) for *: 'NoneType' and 'int' rendering template"
         in caplog.text
     )
-
-
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity name setup."""
-    domain = cover.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
diff --git a/tests/components/mqtt/test_device_trigger.py b/tests/components/mqtt/test_device_trigger.py
index 009a0315029..fd2bf46f828 100644
--- a/tests/components/mqtt/test_device_trigger.py
+++ b/tests/components/mqtt/test_device_trigger.py
@@ -26,42 +26,22 @@ def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
     """Stub copying the blueprints to the config folder."""
 
 
-@pytest.mark.parametrize(
-    ("discovery_topic", "data"),
-    [
-        (
-            "homeassistant/device_automation/0AFFD2/bla/config",
-            '{ "automation_type":"trigger",'
-            '  "device":{"identifiers":["0AFFD2"]},'
-            '  "payload": "short_press",'
-            '  "topic": "foobar/triggers/button1",'
-            '  "type": "button_short_press",'
-            '  "subtype": "button_1" }',
-        ),
-        (
-            "homeassistant/device/0AFFD2/config",
-            '{ "device":{"identifiers":["0AFFD2"]},'
-            '  "o": {"name": "foobar"}, "cmps": '
-            '{ "bla": {'
-            '  "automation_type":"trigger", '
-            '  "payload": "short_press",'
-            '  "topic": "foobar/triggers/button1",'
-            '  "type": "button_short_press",'
-            '  "subtype": "button_1",'
-            '  "platform":"device_automation"}}}',
-        ),
-    ],
-)
 async def test_get_triggers(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
     mqtt_mock_entry: MqttMockHAClientGenerator,
-    discovery_topic: str,
-    data: str,
 ) -> None:
     """Test we get the expected triggers from a discovered mqtt device."""
     await mqtt_mock_entry()
-    async_fire_mqtt_message(hass, discovery_topic, data)
+    data1 = (
+        '{ "automation_type":"trigger",'
+        '  "device":{"identifiers":["0AFFD2"]},'
+        '  "payload": "short_press",'
+        '  "topic": "foobar/triggers/button1",'
+        '  "type": "button_short_press",'
+        '  "subtype": "button_1" }'
+    )
+    async_fire_mqtt_message(hass, "homeassistant/device_automation/bla/config", data1)
     await hass.async_block_till_done()
 
     device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index e49e7a27c8d..cc7142236d0 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -6,14 +6,12 @@ import json
 import logging
 from pathlib import Path
 import re
-from typing import Any
-from unittest.mock import ANY, AsyncMock, call, patch
+from unittest.mock import AsyncMock, call, patch
 
 import pytest
 
 from homeassistant import config_entries
 from homeassistant.components import mqtt
-from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.mqtt.abbreviations import (
     ABBREVIATIONS,
     DEVICE_ABBREVIATIONS,
@@ -36,7 +34,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant, callback
-from homeassistant.data_entry_flow import AbortFlow, FlowResult
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
@@ -48,14 +46,12 @@ from homeassistant.util.signal_type import SignalTypeFormat
 
 from .conftest import ENTRY_DEFAULT_BIRTH_MESSAGE
 from .test_common import help_all_subscribe_calls, help_test_unload_config_entry
-from .test_tag import DEFAULT_TAG_ID, DEFAULT_TAG_SCAN
 
 from tests.common import (
     MockConfigEntry,
     MockModule,
     async_capture_events,
     async_fire_mqtt_message,
-    async_get_device_automations,
     mock_config_flow,
     mock_integration,
     mock_platform,
@@ -66,133 +62,6 @@ from tests.typing import (
     WebSocketGenerator,
 )
 
-TEST_SINGLE_CONFIGS = [
-    (
-        "homeassistant/device_automation/0AFFD2/bla1/config",
-        {
-            "device": {"identifiers": ["0AFFD2"], "name": "test_device"},
-            "o": {"name": "Foo2Mqtt", "sw": "1.40.2", "url": "https://www.foo2mqtt.io"},
-            "automation_type": "trigger",
-            "payload": "short_press",
-            "topic": "foobar/triggers/button1",
-            "type": "button_short_press",
-            "subtype": "button_1",
-        },
-    ),
-    (
-        "homeassistant/sensor/0AFFD2/bla2/config",
-        {
-            "device": {"identifiers": ["0AFFD2"], "name": "test_device"},
-            "o": {"name": "Foo2Mqtt", "sw": "1.40.2", "url": "https://www.foo2mqtt.io"},
-            "state_topic": "foobar/sensors/bla2/state",
-            "unique_id": "bla002",
-        },
-    ),
-    (
-        "homeassistant/tag/0AFFD2/bla3/config",
-        {
-            "device": {"identifiers": ["0AFFD2"], "name": "test_device"},
-            "o": {"name": "Foo2Mqtt", "sw": "1.40.2", "url": "https://www.foo2mqtt.io"},
-            "topic": "foobar/tags/bla3/see",
-        },
-    ),
-]
-TEST_DEVICE_CONFIG = {
-    "device": {"identifiers": ["0AFFD2"], "name": "test_device"},
-    "o": {"name": "Foo2Mqtt", "sw": "1.50.0", "url": "https://www.foo2mqtt.io"},
-    "cmps": {
-        "bla1": {
-            "platform": "device_automation",
-            "automation_type": "trigger",
-            "payload": "short_press",
-            "topic": "foobar/triggers/button1",
-            "type": "button_short_press",
-            "subtype": "button_1",
-        },
-        "bla2": {
-            "platform": "sensor",
-            "state_topic": "foobar/sensors/bla2/state",
-            "unique_id": "bla002",
-            "name": "mqtt_sensor",
-        },
-        "bla3": {
-            "platform": "tag",
-            "topic": "foobar/tags/bla3/see",
-        },
-    },
-}
-TEST_DEVICE_DISCOVERY_TOPIC = "homeassistant/device/0AFFD2/config"
-
-
-async def help_check_discovered_items(
-    hass: HomeAssistant, device_registry: dr.DeviceRegistry, tag_mock: AsyncMock
-) -> None:
-    """Help checking discovered test items are still available."""
-
-    # Check the device_trigger was discovered
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    assert device_entry is not None
-    triggers = await async_get_device_automations(
-        hass, DeviceAutomationType.TRIGGER, device_entry.id
-    )
-    assert len(triggers) == 1
-    # Check the sensor was discovered
-    state = hass.states.get("sensor.test_device_mqtt_sensor")
-    assert state is not None
-
-    # Check the tag works
-    async_fire_mqtt_message(hass, "foobar/tags/bla3/see", DEFAULT_TAG_SCAN)
-    await hass.async_block_till_done()
-    tag_mock.assert_called_once_with(ANY, DEFAULT_TAG_ID, device_entry.id)
-    tag_mock.reset_mock()
-
-
-@pytest.fixture
-def mqtt_data_flow_calls() -> list[MqttServiceInfo]:
-    """Return list to capture MQTT data data flow calls."""
-    return []
-
-
-@pytest.fixture
-async def mock_mqtt_flow(
-    hass: HomeAssistant, mqtt_data_flow_calls: list[MqttServiceInfo]
-) -> config_entries.ConfigFlow:
-    """Test fixure for mqtt integration flow.
-
-    The topic is used as a unique ID.
-    The component test domain used is: `comp`.
-
-    Creates an entry if does not exist.
-    Updates an entry if it exists, and there is an updated payload.
-    """
-
-    class TestFlow(config_entries.ConfigFlow):
-        """Test flow."""
-
-        async def async_step_mqtt(self, discovery_info: MqttServiceInfo) -> FlowResult:
-            """Test mqtt step."""
-            await asyncio.sleep(0)
-            mqtt_data_flow_calls.append(discovery_info)
-            # Abort a flow if there is an update for the existing entry
-            if entry := self.hass.config_entries.async_entry_for_domain_unique_id(
-                "comp", discovery_info.topic
-            ):
-                hass.config_entries.async_update_entry(
-                    entry,
-                    data={
-                        "name": discovery_info.topic,
-                        "payload": discovery_info.payload,
-                    },
-                )
-                raise AbortFlow("already_configured")
-            await self.async_set_unique_id(discovery_info.topic)
-            return self.async_create_entry(
-                title="Test",
-                data={"name": discovery_info.topic, "payload": discovery_info.payload},
-            )
-
-    return TestFlow
-
 
 @pytest.mark.parametrize(
     "mqtt_config_entry_data",
@@ -219,8 +88,6 @@ async def test_subscribing_config_topic(
     [
         ("homeassistant/binary_sensor/bla/not_config", False),
         ("homeassistant/binary_sensor/rörkrökare/config", True),
-        ("homeassistant/device/bla/not_config", False),
-        ("homeassistant/device/rörkrökare/config", True),
     ],
 )
 async def test_invalid_topic(
@@ -249,15 +116,10 @@ async def test_invalid_topic(
         caplog.clear()
 
 
-@pytest.mark.parametrize(
-    "discovery_topic",
-    ["homeassistant/binary_sensor/bla/config", "homeassistant/device/bla/config"],
-)
 async def test_invalid_json(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
     caplog: pytest.LogCaptureFixture,
-    discovery_topic: str,
 ) -> None:
     """Test sending in invalid JSON."""
     await mqtt_mock_entry()
@@ -266,7 +128,9 @@ async def test_invalid_json(
     ) as mock_dispatcher_send:
         mock_dispatcher_send = AsyncMock(return_value=None)
 
-        async_fire_mqtt_message(hass, discovery_topic, "not json")
+        async_fire_mqtt_message(
+            hass, "homeassistant/binary_sensor/bla/config", "not json"
+        )
         await hass.async_block_till_done()
         assert "Unable to parse JSON" in caplog.text
         assert not mock_dispatcher_send.called
@@ -315,56 +179,6 @@ async def test_invalid_config(
     assert "Error 'expected int for dictionary value @ data['qos']'" in caplog.text
 
 
-async def test_invalid_device_discovery_config(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test sending in JSON that violates the discovery schema if device or platform key is missing."""
-    await mqtt_mock_entry()
-    async_fire_mqtt_message(
-        hass,
-        "homeassistant/device/bla/config",
-        '{ "o": {"name": "foobar"}, "cmps": '
-        '{ "acp1": {"name": "abc", "state_topic": "home/alarm", '
-        '"unique_id": "very_unique",'
-        '"command_topic": "home/alarm/set", '
-        '"platform":"alarm_control_panel"}}}',
-    )
-    await hass.async_block_till_done()
-    assert (
-        "Invalid MQTT device discovery payload for bla, "
-        "required key not provided @ data['device']" in caplog.text
-    )
-
-    caplog.clear()
-    async_fire_mqtt_message(
-        hass,
-        "homeassistant/device/bla/config",
-        '{ "o": {"name": "foobar"}, "dev": {"identifiers": ["ABDE03"]}, '
-        '"cmps": { "acp1": {"name": "abc", "state_topic": "home/alarm", '
-        '"command_topic": "home/alarm/set" }}}',
-    )
-    await hass.async_block_till_done()
-    assert (
-        "Invalid MQTT device discovery payload for bla, "
-        "required key not provided @ data['components']['acp1']['platform']"
-        in caplog.text
-    )
-
-    caplog.clear()
-    async_fire_mqtt_message(
-        hass,
-        "homeassistant/device/bla/config",
-        '{ "o": {"name": "foobar"}, "dev": {"identifiers": ["ABDE03"]}, ' '"cmps": ""}',
-    )
-    await hass.async_block_till_done()
-    assert (
-        "Invalid MQTT device discovery payload for bla, "
-        "expected a dictionary for dictionary value @ data['components']" in caplog.text
-    )
-
-
 async def test_only_valid_components(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
@@ -407,70 +221,27 @@ async def test_correct_config_discovery(
     assert ("binary_sensor", "bla") in hass.data["mqtt"].discovery_already_discovered
 
 
-@pytest.mark.parametrize(
-    ("discovery_topic", "payloads", "discovery_id"),
-    [
-        (
-            "homeassistant/binary_sensor/bla/config",
-            (
-                '{"name":"Beer","state_topic": "test-topic",'
-                '"unique_id": "very_unique1",'
-                '"o":{"name":"bla2mqtt","sw":"1.0"},'
-                '"dev":{"identifiers":["bla"],"name": "bla"}}',
-                '{"name":"Milk","state_topic": "test-topic",'
-                '"unique_id": "very_unique1",'
-                '"o":{"name":"bla2mqtt","sw":"1.1",'
-                '"url":"https://bla2mqtt.example.com/support"},'
-                '"dev":{"identifiers":["bla"],"name": "bla"}}',
-            ),
-            "bla",
-        ),
-        (
-            "homeassistant/device/bla/config",
-            (
-                '{"cmps":{"bin_sens1":{"platform":"binary_sensor",'
-                '"unique_id": "very_unique1",'
-                '"name":"Beer","state_topic": "test-topic"}},'
-                '"o":{"name":"bla2mqtt","sw":"1.0"},'
-                '"dev":{"identifiers":["bla"],"name": "bla"}}',
-                '{"cmps":{"bin_sens1":{"platform":"binary_sensor",'
-                '"unique_id": "very_unique1",'
-                '"name":"Milk","state_topic": "test-topic"}},'
-                '"o":{"name":"bla2mqtt","sw":"1.1",'
-                '"url":"https://bla2mqtt.example.com/support"},'
-                '"dev":{"identifiers":["bla"],"name": "bla"}}',
-            ),
-            "bla bin_sens1",
-        ),
-    ],
-)
 async def test_discovery_integration_info(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
     caplog: pytest.LogCaptureFixture,
-    discovery_topic: str,
-    payloads: tuple[str, str],
-    discovery_id: str,
 ) -> None:
-    """Test discovery of integration info."""
+    """Test logging discovery of new and updated items."""
     await mqtt_mock_entry()
     async_fire_mqtt_message(
         hass,
-        discovery_topic,
-        payloads[0],
+        "homeassistant/binary_sensor/bla/config",
+        '{ "name": "Beer", "state_topic": "test-topic", "o": {"name": "bla2mqtt", "sw": "1.0" } }',
     )
     await hass.async_block_till_done()
 
-    state = hass.states.get("binary_sensor.bla_beer")
+    state = hass.states.get("binary_sensor.beer")
 
     assert state is not None
-    assert state.name == "bla Beer"
+    assert state.name == "Beer"
 
     assert (
-        "Processing device discovery for 'bla' from external "
-        "application bla2mqtt, version: 1.0"
-        in caplog.text
-        or f"Found new component: binary_sensor {discovery_id} from external application bla2mqtt, version: 1.0"
+        "Found new component: binary_sensor bla from external application bla2mqtt, version: 1.0"
         in caplog.text
     )
     caplog.clear()
@@ -478,635 +249,47 @@ async def test_discovery_integration_info(
     # Send an update and add support url
     async_fire_mqtt_message(
         hass,
-        discovery_topic,
-        payloads[1],
+        "homeassistant/binary_sensor/bla/config",
+        '{ "name": "Milk", "state_topic": "test-topic", "o": {"name": "bla2mqtt", "sw": "1.1", "url": "https://bla2mqtt.example.com/support" } }',
     )
     await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.bla_beer")
+    state = hass.states.get("binary_sensor.beer")
 
     assert state is not None
-    assert state.name == "bla Milk"
+    assert state.name == "Milk"
 
     assert (
-        f"Component has already been discovered: binary_sensor {discovery_id}"
+        "Component has already been discovered: binary_sensor bla, sending update from external application bla2mqtt, version: 1.1, support URL: https://bla2mqtt.example.com/support"
         in caplog.text
     )
 
 
 @pytest.mark.parametrize(
-    ("single_configs", "device_discovery_topic", "device_config"),
-    [(TEST_SINGLE_CONFIGS, TEST_DEVICE_DISCOVERY_TOPIC, TEST_DEVICE_CONFIG)],
-)
-async def test_discovery_migration_to_device_base(
-    hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    entity_registry: er.EntityRegistry,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    tag_mock: AsyncMock,
-    caplog: pytest.LogCaptureFixture,
-    single_configs: list[tuple[str, dict[str, Any]]],
-    device_discovery_topic: str,
-    device_config: dict[str, Any],
-) -> None:
-    """Test the migration of single discovery to device discovery."""
-    await mqtt_mock_entry()
-
-    # Discovery single config schema
-    for discovery_topic, config in single_configs:
-        payload = json.dumps(config)
-        async_fire_mqtt_message(
-            hass,
-            discovery_topic,
-            payload,
-        )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    # Try to migrate to device based discovery without migrate_discovery flag
-    payload = json.dumps(device_config)
-    async_fire_mqtt_message(
-        hass,
-        device_discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    assert (
-        "Received a conflicting MQTT discovery message for device_automation "
-        "'0AFFD2 bla1' which was previously discovered on topic homeassistant/"
-        "device_automation/0AFFD2/bla1/config from external application Foo2Mqtt, "
-        "version: 1.40.2; the conflicting discovery message was received on topic "
-        "homeassistant/device/0AFFD2/config from external application Foo2Mqtt, "
-        "version: 1.50.0; for support visit https://www.foo2mqtt.io" in caplog.text
-    )
-    assert (
-        "Received a conflicting MQTT discovery message for entity sensor."
-        "test_device_mqtt_sensor; the entity was previously discovered on topic "
-        "homeassistant/sensor/0AFFD2/bla2/config from external application Foo2Mqtt, "
-        "version: 1.40.2; the conflicting discovery message was received on topic "
-        "homeassistant/device/0AFFD2/config from external application Foo2Mqtt, "
-        "version: 1.50.0; for support visit https://www.foo2mqtt.io" in caplog.text
-    )
-    assert (
-        "Received a conflicting MQTT discovery message for tag '0AFFD2 bla3' which "
-        "was previously discovered on topic homeassistant/tag/0AFFD2/bla3/config "
-        "from external application Foo2Mqtt, version: 1.40.2; the conflicting "
-        "discovery message was received on topic homeassistant/device/0AFFD2/config "
-        "from external application Foo2Mqtt, version: 1.50.0; for support visit "
-        "https://www.foo2mqtt.io" in caplog.text
-    )
-
-    # Check we still have our mqtt items
-    await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    # Test Enable discovery migration
-    # Discovery single config schema
-    caplog.clear()
-    for discovery_topic, _ in single_configs:
-        # migr_discvry is abbreviation for migrate_discovery
-        payload = json.dumps({"migr_discvry": True})
-        async_fire_mqtt_message(
-            hass,
-            discovery_topic,
-            payload,
-        )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    # Assert we still have our device entry
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    assert device_entry is not None
-    # Check our trigger was unloaden
-    triggers = await async_get_device_automations(
-        hass, DeviceAutomationType.TRIGGER, device_entry.id
-    )
-    assert len(triggers) == 0
-    # Check the sensor was unloaded
-    state = hass.states.get("sensor.test_device_mqtt_sensor")
-    assert state is None
-    # Check the entity registry entry is retained
-    assert entity_registry.async_is_registered("sensor.test_device_mqtt_sensor")
-
-    assert (
-        "Migration to MQTT device discovery schema started for device_automation "
-        "'0AFFD2 bla1' from external application Foo2Mqtt, version: 1.40.2 on topic "
-        "homeassistant/device_automation/0AFFD2/bla1/config. To complete migration, "
-        "publish a device discovery message with device_automation '0AFFD2 bla1'. "
-        "After completed migration, publish an empty (retained) payload to "
-        "homeassistant/device_automation/0AFFD2/bla1/config" in caplog.text
-    )
-    assert (
-        "Migration to MQTT device discovery schema started for entity sensor."
-        "test_device_mqtt_sensor from external application Foo2Mqtt, version: 1.40.2 "
-        "on topic homeassistant/sensor/0AFFD2/bla2/config. To complete migration, "
-        "publish a device discovery message with sensor entity '0AFFD2 bla2'. After "
-        "completed migration, publish an empty (retained) payload to "
-        "homeassistant/sensor/0AFFD2/bla2/config" in caplog.text
-    )
-
-    # Migrate to device based discovery
-    caplog.clear()
-    payload = json.dumps(device_config)
-    async_fire_mqtt_message(
-        hass,
-        device_discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-
-    caplog.clear()
-    for _ in range(2):
-        # Test publishing an empty payload twice to the migrated discovery topics
-        # does not remove the migrated items
-        for discovery_topic, _ in single_configs:
-            async_fire_mqtt_message(
-                hass,
-                discovery_topic,
-                "",
-            )
-        await hass.async_block_till_done()
-        await hass.async_block_till_done()
-
-        # Check we still have our mqtt items after publishing an
-        # empty payload to the old discovery topics
-        await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    # Check we cannot accidentally migrate back and remove the items
-    caplog.clear()
-    for discovery_topic, config in single_configs:
-        payload = json.dumps(config)
-        async_fire_mqtt_message(
-            hass,
-            discovery_topic,
-            payload,
-        )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    assert (
-        "Received a conflicting MQTT discovery message for device_automation "
-        "'0AFFD2 bla1' which was previously discovered on topic homeassistant/device"
-        "/0AFFD2/config from external application Foo2Mqtt, version: 1.50.0; the "
-        "conflicting discovery message was received on topic homeassistant/"
-        "device_automation/0AFFD2/bla1/config from external application Foo2Mqtt, "
-        "version: 1.40.2; for support visit https://www.foo2mqtt.io" in caplog.text
-    )
-    assert (
-        "Received a conflicting MQTT discovery message for entity sensor."
-        "test_device_mqtt_sensor; the entity was previously discovered on topic "
-        "homeassistant/device/0AFFD2/config from external application Foo2Mqtt, "
-        "version: 1.50.0; the conflicting discovery message was received on topic "
-        "homeassistant/sensor/0AFFD2/bla2/config from external application Foo2Mqtt, "
-        "version: 1.40.2; for support visit https://www.foo2mqtt.io" in caplog.text
-    )
-    assert (
-        "Received a conflicting MQTT discovery message for tag '0AFFD2 bla3' which was "
-        "previously discovered on topic homeassistant/device/0AFFD2/config from "
-        "external application Foo2Mqtt, version: 1.50.0; the conflicting discovery "
-        "message was received on topic homeassistant/tag/0AFFD2/bla3/config from "
-        "external application Foo2Mqtt, version: 1.40.2; for support visit "
-        "https://www.foo2mqtt.io" in caplog.text
-    )
-
-    caplog.clear()
-    for discovery_topic, config in single_configs:
-        payload = json.dumps(config)
-        async_fire_mqtt_message(
-            hass,
-            discovery_topic,
-            "",
-        )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    # Check we still have our mqtt items after publishing an
-    # empty payload to the old discovery topics
-    await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    # Check we can remove the config using the new discovery topic
-    async_fire_mqtt_message(
-        hass,
-        device_discovery_topic,
-        "",
-    )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-    # Check the device was removed as all device components were removed
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    assert device_entry is None
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-
-@pytest.mark.parametrize(
-    "config",
+    "config_message",
     [
-        {"state_topic": "foobar/sensors/bla2/state", "name": "none_test"},
-        {
-            "state_topic": "foobar/sensors/bla2/state",
-            "name": "none_test",
-            "unique_id": "very_unique",
-        },
-        {
-            "state_topic": "foobar/sensors/bla2/state",
-            "device": {"identifiers": ["0AFFD2"], "name": "none_test"},
-        },
-    ],
-)
-async def test_discovery_migration_unique_id(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-    config: dict[str, Any],
-) -> None:
-    """Test entity has a unique_id and device context when migrating."""
-    await mqtt_mock_entry()
-
-    discovery_topic = "homeassistant/sensor/0AFFD2/bla2/config"
-
-    # Discovery with single config schema
-    payload = json.dumps(config)
-    async_fire_mqtt_message(
-        hass,
-        discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    # Try discovery migration
-    payload = json.dumps({"migr_discvry": True})
-    async_fire_mqtt_message(
-        hass,
-        discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    # Assert the migration attempt fails
-    assert "Discovery migration is not possible" in caplog.text
-
-
-@pytest.mark.parametrize(
-    ("single_configs", "device_discovery_topic", "device_config"),
-    [(TEST_SINGLE_CONFIGS, TEST_DEVICE_DISCOVERY_TOPIC, TEST_DEVICE_CONFIG)],
-)
-async def test_discovery_rollback_to_single_base(
-    hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    entity_registry: er.EntityRegistry,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    tag_mock: AsyncMock,
-    caplog: pytest.LogCaptureFixture,
-    single_configs: list[tuple[str, dict[str, Any]]],
-    device_discovery_topic: str,
-    device_config: dict[str, Any],
-) -> None:
-    """Test the rollback of device discovery to a single component discovery."""
-    await mqtt_mock_entry()
-
-    # Start device based discovery
-    # any single component discovery will be migrated
-    payload = json.dumps(device_config)
-    async_fire_mqtt_message(
-        hass,
-        device_discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    # Migrate to single component discovery
-    # Test the schema
-    caplog.clear()
-    payload = json.dumps({"migrate_discovery": "invalid"})
-    async_fire_mqtt_message(
-        hass,
-        device_discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    assert "Invalid MQTT device discovery payload for 0AFFD2" in caplog.text
-
-    # Set the correct migrate_discovery flag in the device payload
-    # to allow rollback
-    payload = json.dumps({"migrate_discovery": True})
-    async_fire_mqtt_message(
-        hass,
-        device_discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-
-    # Check the log messages
-    assert (
-        "Rollback to MQTT platform discovery schema started for entity sensor."
-        "test_device_mqtt_sensor from external application Foo2Mqtt, version: 1.50.0 "
-        "on topic homeassistant/device/0AFFD2/config. To complete rollback, publish a "
-        "platform discovery message with sensor entity '0AFFD2 bla2'. After completed "
-        "rollback, publish an empty (retained) payload to "
-        "homeassistant/device/0AFFD2/config" in caplog.text
-    )
-    assert (
-        "Rollback to MQTT platform discovery schema started for device_automation "
-        "'0AFFD2 bla1' from external application Foo2Mqtt, version: 1.50.0 on topic "
-        "homeassistant/device/0AFFD2/config. To complete rollback, publish a platform "
-        "discovery message with device_automation '0AFFD2 bla1'. After completed "
-        "rollback, publish an empty (retained) payload to "
-        "homeassistant/device/0AFFD2/config" in caplog.text
-    )
-
-    # Assert we still have our device entry
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    assert device_entry is not None
-    # Check our trigger was unloaded
-    triggers = await async_get_device_automations(
-        hass, DeviceAutomationType.TRIGGER, device_entry.id
-    )
-    assert len(triggers) == 0
-    # Check the sensor was unloaded
-    state = hass.states.get("sensor.test_device_mqtt_sensor")
-    assert state is None
-    # Check the entity registry entry is retained
-    assert entity_registry.async_is_registered("sensor.test_device_mqtt_sensor")
-
-    # Publish the new component based payloads
-    # to switch back to component based discovery
-    for discovery_topic, config in single_configs:
-        payload = json.dumps(config)
-        async_fire_mqtt_message(
-            hass,
-            discovery_topic,
-            payload,
-        )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    # Check we still have our mqtt items
-    # await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    for _ in range(2):
-        # Test publishing an empty payload twice to the migrated discovery topic
-        # does not remove the migrated items
-        async_fire_mqtt_message(
-            hass,
-            device_discovery_topic,
-            "",
-        )
-        await hass.async_block_till_done()
-        await hass.async_block_till_done()
-
-        # Check we still have our mqtt items after publishing an
-        # empty payload to the old discovery topics
-        await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    # Check we cannot accidentally migrate back and remove the items
-    payload = json.dumps(device_config)
-    async_fire_mqtt_message(
-        hass,
-        device_discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-
-    # Check we still have our mqtt items after publishing an
-    # empty payload to the old discovery topics
-    await help_check_discovered_items(hass, device_registry, tag_mock)
-
-    # Check we can remove the the config using the new discovery topics
-    for discovery_topic, config in single_configs:
-        payload = json.dumps(config)
-        async_fire_mqtt_message(
-            hass,
-            discovery_topic,
-            "",
-        )
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-    # Check the device was removed as all device components were removed
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    assert device_entry is None
-
-
-@pytest.mark.parametrize(
-    ("discovery_topic", "payload"),
-    [
-        (
-            "homeassistant/binary_sensor/bla/config",
-            '{"state_topic": "test-topic",'
-            '"name":"bla","unique_id":"very_unique1",'
-            '"avty": {"topic": "avty-topic"},'
-            '"o":{"name":"bla2mqtt","sw":"1.0"},'
-            '"dev":{"identifiers":["bla"],"name":"Beer"}}',
-        ),
-        (
-            "homeassistant/device/bla/config",
-            '{"cmps":{"bin_sens1":{"platform":"binary_sensor",'
-            '"name":"bla","unique_id":"very_unique1",'
-            '"state_topic": "test-topic"}},'
-            '"avty": {"topic": "avty-topic"},'
-            '"o":{"name":"bla2mqtt","sw":"1.0"},'
-            '"dev":{"identifiers":["bla"],"name":"Beer"}}',
-        ),
-    ],
-    ids=["component", "device"],
-)
-async def test_discovery_availability(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    discovery_topic: str,
-    payload: str,
-) -> None:
-    """Test device discovery with shared availability mapping."""
-    await mqtt_mock_entry()
-    async_fire_mqtt_message(
-        hass,
-        discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.beer_bla")
-    assert state is not None
-    assert state.name == "Beer bla"
-    assert state.state == STATE_UNAVAILABLE
-
-    async_fire_mqtt_message(
-        hass,
-        "avty-topic",
-        "online",
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.beer_bla")
-    assert state is not None
-    assert state.state == STATE_UNKNOWN
-
-    async_fire_mqtt_message(
-        hass,
-        "test-topic",
-        "ON",
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.beer_bla")
-    assert state is not None
-    assert state.state == STATE_ON
-
-
-@pytest.mark.parametrize(
-    ("discovery_topic", "payload"),
-    [
-        (
-            "homeassistant/device/bla/config",
-            '{"cmps":{"bin_sens1":{"platform":"binary_sensor",'
-            '"unique_id":"very_unique",'
-            '"avty": {"topic": "avty-topic-component"},'
-            '"name":"Beer","state_topic": "test-topic"}},'
-            '"avty": {"topic": "avty-topic-device"},'
-            '"o":{"name":"bla2mqtt","sw":"1.0"},"dev":{"identifiers":["bla"]}}',
-        ),
-        (
-            "homeassistant/device/bla/config",
-            '{"cmps":{"bin_sens1":{"platform":"binary_sensor",'
-            '"unique_id":"very_unique",'
-            '"availability_topic": "avty-topic-component",'
-            '"name":"Beer","state_topic": "test-topic"}},'
-            '"availability_topic": "avty-topic-device",'
-            '"o":{"name":"bla2mqtt","sw":"1.0"},"dev":{"identifiers":["bla"]}}',
-        ),
-    ],
-    ids=["test1", "test2"],
-)
-async def test_discovery_component_availability_overridden(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    discovery_topic: str,
-    payload: str,
-) -> None:
-    """Test device discovery with overridden shared availability mapping."""
-    await mqtt_mock_entry()
-    async_fire_mqtt_message(
-        hass,
-        discovery_topic,
-        payload,
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.none_beer")
-    assert state is not None
-    assert state.name == "Beer"
-    assert state.state == STATE_UNAVAILABLE
-
-    async_fire_mqtt_message(
-        hass,
-        "avty-topic-device",
-        "online",
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.none_beer")
-    assert state is not None
-    assert state.state == STATE_UNAVAILABLE
-
-    async_fire_mqtt_message(
-        hass,
-        "avty-topic-component",
-        "online",
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.none_beer")
-    assert state is not None
-    assert state.state == STATE_UNKNOWN
-
-    async_fire_mqtt_message(
-        hass,
-        "test-topic",
-        "ON",
-    )
-    await hass.async_block_till_done()
-    state = hass.states.get("binary_sensor.none_beer")
-    assert state is not None
-    assert state.state == STATE_ON
-
-
-@pytest.mark.parametrize(
-    ("discovery_topic", "config_message", "error_message"),
-    [
-        (
-            "homeassistant/binary_sensor/bla/config",
-            '{ "name": "Beer", "unique_id": "very_unique", '
-            '"state_topic": "test-topic", "o": "bla2mqtt" }',
-            "Unable to parse origin information from discovery message",
-        ),
-        (
-            "homeassistant/binary_sensor/bla/config",
-            '{ "name": "Beer", "unique_id": "very_unique", '
-            '"state_topic": "test-topic", "o": 2.0 }',
-            "Unable to parse origin information from discovery message",
-        ),
-        (
-            "homeassistant/binary_sensor/bla/config",
-            '{ "name": "Beer", "unique_id": "very_unique", '
-            '"state_topic": "test-topic", "o": null }',
-            "Unable to parse origin information from discovery message",
-        ),
-        (
-            "homeassistant/binary_sensor/bla/config",
-            '{ "name": "Beer", "unique_id": "very_unique", '
-            '"state_topic": "test-topic", "o": {"sw": "bla2mqtt"} }',
-            "Unable to parse origin information from discovery message",
-        ),
-        (
-            "homeassistant/device/bla/config",
-            '{"dev":{"identifiers":["bs1"]},"cmps":{"bs1":'
-            '{"platform":"binary_sensor","name":"Beer","unique_id": "very_unique",'
-            '"state_topic":"test-topic"}},"o": "bla2mqtt"}',
-            "Invalid MQTT device discovery payload for bla, "
-            "expected a dictionary for dictionary value @ data['origin']",
-        ),
-        (
-            "homeassistant/device/bla/config",
-            '{"dev":{"identifiers":["bs1"]},"cmps":{"bs1":'
-            '{"platform":"binary_sensor","name":"Beer","unique_id": "very_unique",'
-            '"state_topic":"test-topic"}},"o": 2.0}',
-            "Invalid MQTT device discovery payload for bla, "
-            "expected a dictionary for dictionary value @ data['origin']",
-        ),
-        (
-            "homeassistant/device/bla/config",
-            '{"dev":{"identifiers":["bs1"]},"cmps":{"bs1":'
-            '{"platform":"binary_sensor","name":"Beer","unique_id": "very_unique",'
-            '"state_topic":"test-topic"}},"o": null}',
-            "Invalid MQTT device discovery payload for bla, "
-            "expected a dictionary for dictionary value @ data['origin']",
-        ),
-        (
-            "homeassistant/device/bla/config",
-            '{"dev":{"identifiers":["bs1"]},"cmps":{"bs1":'
-            '{"platform":"binary_sensor","name":"Beer","unique_id": "very_unique",'
-            '"state_topic":"test-topic"}},"o": {"sw": "bla2mqtt"}}',
-            "Invalid MQTT device discovery payload for bla, "
-            "required key not provided @ data['origin']['name']",
-        ),
+        '{ "name": "Beer", "state_topic": "test-topic", "o": "bla2mqtt" }',
+        '{ "name": "Beer", "state_topic": "test-topic", "o": 2.0 }',
+        '{ "name": "Beer", "state_topic": "test-topic", "o": null }',
+        '{ "name": "Beer", "state_topic": "test-topic", "o": {"sw": "bla2mqtt"} }',
     ],
 )
 async def test_discovery_with_invalid_integration_info(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
     caplog: pytest.LogCaptureFixture,
-    discovery_topic: str,
     config_message: str,
-    error_message: str,
 ) -> None:
     """Test sending in correct JSON."""
     await mqtt_mock_entry()
-    async_fire_mqtt_message(hass, discovery_topic, config_message)
+    async_fire_mqtt_message(
+        hass, "homeassistant/binary_sensor/bla/config", config_message
+    )
     await hass.async_block_till_done()
 
-    state = hass.states.get("binary_sensor.none_beer")
+    state = hass.states.get("binary_sensor.beer")
 
     assert state is None
-    assert error_message in caplog.text
+    assert "Unable to parse origin information from discovery message" in caplog.text
 
 
 async def test_discover_fan(
@@ -1625,86 +808,43 @@ async def test_duplicate_removal(
     assert "Component has already been discovered: binary_sensor bla" not in caplog.text
 
 
-@pytest.mark.parametrize(
-    ("discovery_payloads", "entity_ids"),
-    [
-        (
-            {
-                "homeassistant/sensor/sens1/config": "{"
-                '"device":{"identifiers":["0AFFD2"]},'
-                '"state_topic": "foobar/sensor1",'
-                '"unique_id": "unique1",'
-                '"name": "sensor1"'
-                "}",
-                "homeassistant/sensor/sens2/config": "{"
-                '"device":{"identifiers":["0AFFD2"]},'
-                '"state_topic": "foobar/sensor2",'
-                '"unique_id": "unique2",'
-                '"name": "sensor2"'
-                "}",
-            },
-            ["sensor.none_sensor1", "sensor.none_sensor2"],
-        ),
-        (
-            {
-                "homeassistant/device/bla/config": "{"
-                '"device":{"identifiers":["0AFFD2"]},'
-                '"o": {"name": "foobar"},'
-                '"cmps": {"sens1": {'
-                '"platform": "sensor",'
-                '"name": "sensor1",'
-                '"state_topic": "foobar/sensor1",'
-                '"unique_id": "unique1"'
-                '},"sens2": {'
-                '"platform": "sensor",'
-                '"name": "sensor2",'
-                '"state_topic": "foobar/sensor2",'
-                '"unique_id": "unique2"'
-                "}}}"
-            },
-            ["sensor.none_sensor1", "sensor.none_sensor2"],
-        ),
-    ],
-)
 async def test_cleanup_device_manual(
     hass: HomeAssistant,
-    mock_debouncer: asyncio.Event,
     hass_ws_client: WebSocketGenerator,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
     mqtt_mock_entry: MqttMockHAClientGenerator,
-    discovery_payloads: dict[str, str],
-    entity_ids: list[str],
 ) -> None:
     """Test discovered device is cleaned up when entry removed from device."""
     mqtt_mock = await mqtt_mock_entry()
     assert await async_setup_component(hass, "config", {})
     ws_client = await hass_ws_client(hass)
 
-    mock_debouncer.clear()
-    for discovery_topic, discovery_payload in discovery_payloads.items():
-        async_fire_mqtt_message(hass, discovery_topic, discovery_payload)
-    await mock_debouncer.wait()
+    data = (
+        '{ "device":{"identifiers":["0AFFD2"]},'
+        '  "state_topic": "foobar/sensor",'
+        '  "unique_id": "unique" }'
+    )
+
+    async_fire_mqtt_message(hass, "homeassistant/sensor/bla/config", data)
+    await hass.async_block_till_done()
 
     # Verify device and registry entries are created
     device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
     assert device_entry is not None
+    entity_entry = entity_registry.async_get("sensor.none_mqtt_sensor")
+    assert entity_entry is not None
 
-    for entity_id in entity_ids:
-        entity_entry = entity_registry.async_get(entity_id)
-        assert entity_entry is not None
-
-        state = hass.states.get(entity_id)
-        assert state is not None
+    state = hass.states.get("sensor.none_mqtt_sensor")
+    assert state is not None
 
     # Remove MQTT from the device
     mqtt_config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    mock_debouncer.clear()
     response = await ws_client.remove_device(
         device_entry.id, mqtt_config_entry.entry_id
     )
     assert response["success"]
-    await mock_debouncer.wait()
+    await hass.async_block_till_done()
     await hass.async_block_till_done()
 
     # Verify device and registry entries are cleared
@@ -1714,224 +854,60 @@ async def test_cleanup_device_manual(
     assert entity_entry is None
 
     # Verify state is removed
-    for entity_id in entity_ids:
-        state = hass.states.get(entity_id)
-        assert state is None
+    state = hass.states.get("sensor.none_mqtt_sensor")
+    assert state is None
+    await hass.async_block_till_done()
 
-    # Verify retained discovery topics have been cleared
-    mqtt_mock.async_publish.assert_has_calls(
-        [call(discovery_topic, None, 0, True) for discovery_topic in discovery_payloads]
+    # Verify retained discovery topic has been cleared
+    mqtt_mock.async_publish.assert_called_once_with(
+        "homeassistant/sensor/bla/config", None, 0, True
     )
 
-    await hass.async_block_till_done(wait_background_tasks=True)
 
-
-@pytest.mark.parametrize(
-    ("discovery_topic", "discovery_payload", "entity_ids"),
-    [
-        (
-            "homeassistant/sensor/bla/config",
-            '{ "device":{"identifiers":["0AFFD2"]},'
-            '  "state_topic": "foobar/sensor",'
-            '  "unique_id": "unique" }',
-            ["sensor.none_mqtt_sensor"],
-        ),
-        (
-            "homeassistant/device/bla/config",
-            '{ "device":{"identifiers":["0AFFD2"]},'
-            '  "o": {"name": "foobar"},'
-            '  "cmps": {"sens1": {'
-            '  "platform": "sensor",'
-            '  "name": "sensor1",'
-            '  "state_topic": "foobar/sensor1",'
-            '  "unique_id": "unique1"'
-            ' },"sens2": {'
-            '  "platform": "sensor",'
-            '  "name": "sensor2",'
-            '  "state_topic": "foobar/sensor2",'
-            '  "unique_id": "unique2"'
-            "}}}",
-            ["sensor.none_sensor1", "sensor.none_sensor2"],
-        ),
-    ],
-)
 async def test_cleanup_device_mqtt(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
     mqtt_mock_entry: MqttMockHAClientGenerator,
-    discovery_topic: str,
-    discovery_payload: str,
-    entity_ids: list[str],
 ) -> None:
-    """Test discovered device is cleaned up when removed through MQTT."""
+    """Test discvered device is cleaned up when removed through MQTT."""
     mqtt_mock = await mqtt_mock_entry()
-
-    # set up an existing sensor first
     data = (
-        '{ "device":{"identifiers":["0AFFD3"]},'
-        '  "name": "sensor_base",'
+        '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
-        '  "unique_id": "unique_base" }'
+        '  "unique_id": "unique" }'
     )
-    base_discovery_topic = "homeassistant/sensor/bla_base/config"
-    base_entity_id = "sensor.none_sensor_base"
-    async_fire_mqtt_message(hass, base_discovery_topic, data)
-    await hass.async_block_till_done()
 
-    # Verify the base entity has been created and it has a state
-    base_device_entry = device_registry.async_get_device(
-        identifiers={("mqtt", "0AFFD3")}
-    )
-    assert base_device_entry is not None
-    entity_entry = entity_registry.async_get(base_entity_id)
-    assert entity_entry is not None
-    state = hass.states.get(base_entity_id)
-    assert state is not None
-
-    async_fire_mqtt_message(hass, discovery_topic, discovery_payload)
+    async_fire_mqtt_message(hass, "homeassistant/sensor/bla/config", data)
     await hass.async_block_till_done()
 
     # Verify device and registry entries are created
     device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
     assert device_entry is not None
-    for entity_id in entity_ids:
-        entity_entry = entity_registry.async_get(entity_id)
-        assert entity_entry is not None
+    entity_entry = entity_registry.async_get("sensor.none_mqtt_sensor")
+    assert entity_entry is not None
 
-        state = hass.states.get(entity_id)
-        assert state is not None
+    state = hass.states.get("sensor.none_mqtt_sensor")
+    assert state is not None
 
-    async_fire_mqtt_message(hass, discovery_topic, "")
+    async_fire_mqtt_message(hass, "homeassistant/sensor/bla/config", "")
     await hass.async_block_till_done()
     await hass.async_block_till_done()
 
     # Verify device and registry entries are cleared
     device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
     assert device_entry is None
+    entity_entry = entity_registry.async_get("sensor.none_mqtt_sensor")
+    assert entity_entry is None
 
-    for entity_id in entity_ids:
-        entity_entry = entity_registry.async_get(entity_id)
-        assert entity_entry is None
-
-        # Verify state is removed
-        state = hass.states.get(entity_id)
-        assert state is None
-        await hass.async_block_till_done()
+    # Verify state is removed
+    state = hass.states.get("sensor.none_mqtt_sensor")
+    assert state is None
+    await hass.async_block_till_done()
 
     # Verify retained discovery topics have not been cleared again
     mqtt_mock.async_publish.assert_not_called()
 
-    # Verify the base entity still exists and it has a state
-    base_device_entry = device_registry.async_get_device(
-        identifiers={("mqtt", "0AFFD3")}
-    )
-    assert base_device_entry is not None
-    entity_entry = entity_registry.async_get(base_entity_id)
-    assert entity_entry is not None
-    state = hass.states.get(base_entity_id)
-    assert state is not None
-
-
-async def test_cleanup_device_mqtt_device_discovery(
-    hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    entity_registry: er.EntityRegistry,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test discovered device is cleaned up partly when removed through MQTT."""
-    await mqtt_mock_entry()
-
-    discovery_topic = "homeassistant/device/bla/config"
-    discovery_payload = (
-        '{ "device":{"identifiers":["0AFFD2"]},'
-        '  "o": {"name": "foobar"},'
-        '  "cmps": {"sens1": {'
-        '  "p": "sensor",'
-        '  "name": "sensor1",'
-        '  "state_topic": "foobar/sensor1",'
-        '  "unique_id": "unique1"'
-        ' },"sens2": {'
-        '  "p": "sensor",'
-        '  "name": "sensor2",'
-        '  "state_topic": "foobar/sensor2",'
-        '  "unique_id": "unique2"'
-        "}}}"
-    )
-    entity_ids = ["sensor.none_sensor1", "sensor.none_sensor2"]
-    async_fire_mqtt_message(hass, discovery_topic, discovery_payload)
-    await hass.async_block_till_done()
-
-    # Verify device and registry entries are created
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    assert device_entry is not None
-    for entity_id in entity_ids:
-        entity_entry = entity_registry.async_get(entity_id)
-        assert entity_entry is not None
-
-        state = hass.states.get(entity_id)
-        assert state is not None
-
-    # Do update and remove sensor 2 from device
-    discovery_payload_update1 = (
-        '{ "device":{"identifiers":["0AFFD2"]},'
-        '  "o": {"name": "foobar"},'
-        '  "cmps": {"sens1": {'
-        '  "p": "sensor",'
-        '  "name": "sensor1",'
-        '  "state_topic": "foobar/sensor1",'
-        '  "unique_id": "unique1"'
-        ' },"sens2": {'
-        '  "p": "sensor"'
-        "}}}"
-    )
-    async_fire_mqtt_message(hass, discovery_topic, discovery_payload_update1)
-    await hass.async_block_till_done()
-    state = hass.states.get(entity_ids[0])
-    assert state is not None
-    state = hass.states.get(entity_ids[1])
-    assert state is None
-
-    # Repeating the update
-    async_fire_mqtt_message(hass, discovery_topic, discovery_payload_update1)
-    await hass.async_block_till_done()
-    state = hass.states.get(entity_ids[0])
-    assert state is not None
-    state = hass.states.get(entity_ids[1])
-    assert state is None
-
-    # Removing last sensor
-    discovery_payload_update2 = (
-        '{ "device":{"identifiers":["0AFFD2"]},'
-        '  "o": {"name": "foobar"},'
-        '  "cmps": {"sens1": {'
-        '  "p": "sensor"'
-        ' },"sens2": {'
-        '  "p": "sensor"'
-        "}}}"
-    )
-    async_fire_mqtt_message(hass, discovery_topic, discovery_payload_update2)
-    await hass.async_block_till_done()
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    # Verify the device entry was removed with the last sensor
-    assert device_entry is None
-    for entity_id in entity_ids:
-        entity_entry = entity_registry.async_get(entity_id)
-        assert entity_entry is None
-
-        state = hass.states.get(entity_id)
-        assert state is None
-
-    # Repeating the update
-    async_fire_mqtt_message(hass, discovery_topic, discovery_payload_update2)
-    await hass.async_block_till_done()
-
-    # Clear the empty discovery payload and verify there was nothing to cleanup
-    async_fire_mqtt_message(hass, discovery_topic, "")
-    await hass.async_block_till_done()
-    assert "No device components to cleanup" in caplog.text
-
 
 async def test_cleanup_device_multiple_config_entries(
     hass: HomeAssistant,
@@ -2542,14 +1518,20 @@ async def test_mqtt_discovery_flow_starts_once(
     hass: HomeAssistant,
     mqtt_client_mock: MqttMockPahoClient,
     caplog: pytest.LogCaptureFixture,
-    mock_mqtt_flow: config_entries.ConfigFlow,
-    mqtt_data_flow_calls: list[MqttServiceInfo],
 ) -> None:
-    """Check MQTT integration discovery starts a flow once.
+    """Check MQTT integration discovery starts a flow once."""
+
+    flow_calls: list[MqttServiceInfo] = []
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        async def async_step_mqtt(self, discovery_info: MqttServiceInfo) -> FlowResult:
+            """Test mqtt step."""
+            await asyncio.sleep(0)
+            flow_calls.append(discovery_info)
+            return self.async_create_entry(title="Test", data={})
 
-    A flow should be started once after discovery,
-    and after an entry was removed, to trigger re-discovery.
-    """
     mock_integration(
         hass, MockModule(domain="comp", async_setup_entry=AsyncMock(return_value=True))
     )
@@ -2570,7 +1552,7 @@ async def test_mqtt_discovery_flow_starts_once(
             "homeassistant.components.mqtt.discovery.async_get_mqtt",
             return_value={"comp": ["comp/discovery/#"]},
         ),
-        mock_config_flow("comp", mock_mqtt_flow),
+        mock_config_flow("comp", TestFlow),
     ):
         assert await hass.config_entries.async_setup(entry.entry_id)
         await mqtt.async_subscribe(hass, "homeassistant/status", wait_birth)
@@ -2579,82 +1561,41 @@ async def test_mqtt_discovery_flow_starts_once(
 
         assert ("comp/discovery/#", 0) in help_all_subscribe_calls(mqtt_client_mock)
 
-        # Test the initial flow
         async_fire_mqtt_message(hass, "comp/discovery/bla/config1", "initial message")
         await hass.async_block_till_done(wait_background_tasks=True)
-        assert len(mqtt_data_flow_calls) == 1
-        assert mqtt_data_flow_calls[0].topic == "comp/discovery/bla/config1"
-        assert mqtt_data_flow_calls[0].payload == "initial message"
+        assert len(flow_calls) == 1
+        assert flow_calls[0].topic == "comp/discovery/bla/config1"
+        assert flow_calls[0].payload == "initial message"
 
-        # Test we can ignore updates if they are the same
         with caplog.at_level(logging.DEBUG):
             async_fire_mqtt_message(
                 hass, "comp/discovery/bla/config1", "initial message"
             )
             await hass.async_block_till_done(wait_background_tasks=True)
             assert "Ignoring already processed discovery message" in caplog.text
-            assert len(mqtt_data_flow_calls) == 1
+            assert len(flow_calls) == 1
 
-        # Test we can apply updates
-        async_fire_mqtt_message(hass, "comp/discovery/bla/config1", "update message")
-        await hass.async_block_till_done(wait_background_tasks=True)
-
-        assert len(mqtt_data_flow_calls) == 2
-        assert mqtt_data_flow_calls[1].topic == "comp/discovery/bla/config1"
-        assert mqtt_data_flow_calls[1].payload == "update message"
-
-        # Test we set up multiple entries
         async_fire_mqtt_message(hass, "comp/discovery/bla/config2", "initial message")
         await hass.async_block_till_done(wait_background_tasks=True)
 
-        assert len(mqtt_data_flow_calls) == 3
-        assert mqtt_data_flow_calls[2].topic == "comp/discovery/bla/config2"
-        assert mqtt_data_flow_calls[2].payload == "initial message"
+        assert len(flow_calls) == 2
+        assert flow_calls[1].topic == "comp/discovery/bla/config2"
+        assert flow_calls[1].payload == "initial message"
 
-        # Test we update multiple entries
         async_fire_mqtt_message(hass, "comp/discovery/bla/config2", "update message")
         await hass.async_block_till_done(wait_background_tasks=True)
 
-        assert len(mqtt_data_flow_calls) == 4
-        assert mqtt_data_flow_calls[3].topic == "comp/discovery/bla/config2"
-        assert mqtt_data_flow_calls[3].payload == "update message"
+        assert len(flow_calls) == 3
+        assert flow_calls[2].topic == "comp/discovery/bla/config2"
+        assert flow_calls[2].payload == "update message"
 
-        # Test an empty message triggers a flow to allow cleanup (if needed)
+        # An empty message triggers a flow to allow cleanup
         async_fire_mqtt_message(hass, "comp/discovery/bla/config2", "")
         await hass.async_block_till_done(wait_background_tasks=True)
 
-        assert len(mqtt_data_flow_calls) == 5
-        assert mqtt_data_flow_calls[4].topic == "comp/discovery/bla/config2"
-        assert mqtt_data_flow_calls[4].payload == ""
-
-        # Cleanup the the second entry
-        assert (
-            entry := hass.config_entries.async_entry_for_domain_unique_id(
-                "comp", "comp/discovery/bla/config2"
-            )
-        ) is not None
-        await hass.config_entries.async_remove(entry.entry_id)
-        assert len(hass.config_entries.async_entries(domain="comp")) == 1
-
-        # Remove remaining entry1 and assert this triggers an
-        # automatic re-discovery flow with latest config
-        assert (
-            entry := hass.config_entries.async_entry_for_domain_unique_id(
-                "comp", "comp/discovery/bla/config1"
-            )
-        ) is not None
-        assert entry.unique_id == "comp/discovery/bla/config1"
-        await hass.config_entries.async_remove(entry.entry_id)
-        assert len(hass.config_entries.async_entries(domain="comp")) == 0
-
-        # Wait for re-discovery flow to complete
-        await hass.async_block_till_done(wait_background_tasks=True)
-        assert len(mqtt_data_flow_calls) == 6
-        assert mqtt_data_flow_calls[5].topic == "comp/discovery/bla/config1"
-        assert mqtt_data_flow_calls[5].payload == "update message"
-
-        # Re-discovery triggered the config flow
-        assert len(hass.config_entries.async_entries(domain="comp")) == 1
+        assert len(flow_calls) == 4
+        assert flow_calls[3].topic == "comp/discovery/bla/config2"
+        assert flow_calls[3].payload == ""
 
         assert not mqtt_client_mock.unsubscribe.called
 
@@ -2913,77 +1854,3 @@ async def test_discovery_dispatcher_signal_type_messages(
     assert len(calls) == 1
     assert calls[0] == test_data
     unsub()
-
-
-@pytest.mark.parametrize(
-    ("discovery_topic", "discovery_payload", "entity_ids"),
-    [
-        (
-            "homeassistant/device/bla/config",
-            '{ "device":{"identifiers":["0AFFD2"]},'
-            '  "o": {"name": "foobar"},'
-            '  "state_topic": "foobar/sensor-shared",'
-            '  "cmps": {"sens1": {'
-            '  "platform": "sensor",'
-            '  "name": "sensor1",'
-            '  "unique_id": "unique1"'
-            ' },"sens2": {'
-            '  "platform": "sensor",'
-            '  "name": "sensor2",'
-            '  "unique_id": "unique2"'
-            ' },"sens3": {'
-            '  "platform": "sensor",'
-            '  "name": "sensor3",'
-            '  "state_topic": "foobar/sensor3",'
-            '  "unique_id": "unique3"'
-            "}}}",
-            ["sensor.none_sensor1", "sensor.none_sensor2", "sensor.none_sensor3"],
-        ),
-    ],
-)
-async def test_shared_state_topic(
-    hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    entity_registry: er.EntityRegistry,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    discovery_topic: str,
-    discovery_payload: str,
-    entity_ids: list[str],
-) -> None:
-    """Test a shared state_topic can be used."""
-    await mqtt_mock_entry()
-
-    async_fire_mqtt_message(hass, discovery_topic, discovery_payload)
-    await hass.async_block_till_done()
-
-    # Verify device and registry entries are created
-    device_entry = device_registry.async_get_device(identifiers={("mqtt", "0AFFD2")})
-    assert device_entry is not None
-    for entity_id in entity_ids:
-        entity_entry = entity_registry.async_get(entity_id)
-        assert entity_entry is not None
-
-        state = hass.states.get(entity_id)
-        assert state is not None
-        assert state.state == STATE_UNKNOWN
-
-    async_fire_mqtt_message(hass, "foobar/sensor-shared", "New state")
-
-    entity_id = entity_ids[0]
-    state = hass.states.get(entity_id)
-    assert state is not None
-    assert state.state == "New state"
-    entity_id = entity_ids[1]
-    state = hass.states.get(entity_id)
-    assert state is not None
-    assert state.state == "New state"
-    entity_id = entity_ids[2]
-    state = hass.states.get(entity_id)
-    assert state is not None
-    assert state.state == STATE_UNKNOWN
-
-    async_fire_mqtt_message(hass, "foobar/sensor3", "New state3")
-    entity_id = entity_ids[2]
-    state = hass.states.get(entity_id)
-    assert state is not None
-    assert state.state == "New state3"
diff --git a/tests/components/mqtt/test_event.py b/tests/components/mqtt/test_event.py
index 41049ed0887..ea46f514d3d 100644
--- a/tests/components/mqtt/test_event.py
+++ b/tests/components/mqtt/test_event.py
@@ -37,7 +37,6 @@ from .test_common import (
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
     help_test_entity_disabled_by_default,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_id_update_subscriptions,
     help_test_entity_name,
@@ -706,18 +705,6 @@ async def test_entity_name(
     )
 
 
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity icon or picture setup."""
-    domain = event.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
-
-
 @pytest.mark.parametrize(
     "hass_config",
     [
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index 145016751e7..396d3477bad 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -1197,6 +1197,7 @@ async def test_mqtt_ws_get_device_debug_info(
     }
     data_sensor = json.dumps(config_sensor)
     data_trigger = json.dumps(config_trigger)
+    config_sensor["platform"] = config_trigger["platform"] = mqtt.DOMAIN
 
     async_fire_mqtt_message(hass, "homeassistant/sensor/bla/config", data_sensor)
     async_fire_mqtt_message(
@@ -1253,6 +1254,7 @@ async def test_mqtt_ws_get_device_debug_info_binary(
         "unique_id": "unique",
     }
     data = json.dumps(config)
+    config["platform"] = mqtt.DOMAIN
 
     async_fire_mqtt_message(hass, "homeassistant/camera/bla/config", data)
     await hass.async_block_till_done()
diff --git a/tests/components/mqtt/test_number.py b/tests/components/mqtt/test_number.py
index 48aaa11f672..44652681fc3 100644
--- a/tests/components/mqtt/test_number.py
+++ b/tests/components/mqtt/test_number.py
@@ -47,7 +47,6 @@ from .test_common import (
     help_test_entity_device_info_update,
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_id_update_subscriptions,
     help_test_entity_name,
@@ -1101,18 +1100,6 @@ async def test_entity_name(
     )
 
 
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity icon or picture setup."""
-    domain = number.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
-
-
 @pytest.mark.parametrize(
     "hass_config",
     [
diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py
index 7f418864872..b708d4a9ef1 100644
--- a/tests/components/mqtt/test_sensor.py
+++ b/tests/components/mqtt/test_sensor.py
@@ -53,7 +53,6 @@ from .test_common import (
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
     help_test_entity_disabled_by_default,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_entity_id_update_subscriptions,
     help_test_entity_name,
@@ -1584,18 +1583,6 @@ async def test_entity_name(
     )
 
 
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity name setup."""
-    domain = sensor.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass, mqtt_mock_entry, domain, config
-    )
-
-
 @pytest.mark.parametrize(
     "hass_config",
     [
diff --git a/tests/components/mqtt/test_tag.py b/tests/components/mqtt/test_tag.py
index 41c417fe3e9..ff407d29e1e 100644
--- a/tests/components/mqtt/test_tag.py
+++ b/tests/components/mqtt/test_tag.py
@@ -1,9 +1,10 @@
 """The tests for MQTT tag scanner."""
 
+from collections.abc import Generator
 import copy
 import json
 from typing import Any
-from unittest.mock import ANY, AsyncMock
+from unittest.mock import ANY, AsyncMock, patch
 
 import pytest
 
@@ -46,6 +47,13 @@ DEFAULT_TAG_SCAN_JSON = (
 )
 
 
+@pytest.fixture
+def tag_mock() -> Generator[AsyncMock]:
+    """Fixture to mock tag."""
+    with patch("homeassistant.components.tag.async_scan_tag") as mock_tag:
+        yield mock_tag
+
+
 @pytest.mark.no_fail_on_log_exception
 async def test_discover_bad_tag(
     hass: HomeAssistant,
diff --git a/tests/components/mqtt/test_update.py b/tests/components/mqtt/test_update.py
index 4ca10cbe8b2..937b8cdebd0 100644
--- a/tests/components/mqtt/test_update.py
+++ b/tests/components/mqtt/test_update.py
@@ -25,7 +25,6 @@ from .test_common import (
     help_test_entity_device_info_update,
     help_test_entity_device_info_with_connection,
     help_test_entity_device_info_with_identifier,
-    help_test_entity_icon_and_entity_picture,
     help_test_entity_id_update_discovery_update,
     help_test_reloadable,
     help_test_setting_attribute_via_mqtt_json_message,
@@ -314,60 +313,6 @@ async def test_empty_json_state_message(
         }
     ],
 )
-async def test_invalid_json_state_message(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test an empty JSON payload."""
-    state_topic = "test/state-topic"
-    await mqtt_mock_entry()
-
-    async_fire_mqtt_message(
-        hass,
-        state_topic,
-        '{"installed_version":"1.9.0","latest_version":"1.9.0",'
-        '"title":"Test Update 1 Title","release_url":"https://example.com/release1",'
-        '"release_summary":"Test release summary 1",'
-        '"entity_picture": "https://example.com/icon1.png"}',
-    )
-
-    await hass.async_block_till_done()
-
-    state = hass.states.get("update.test_update")
-    assert state.state == STATE_OFF
-    assert state.attributes.get("installed_version") == "1.9.0"
-    assert state.attributes.get("latest_version") == "1.9.0"
-    assert state.attributes.get("release_summary") == "Test release summary 1"
-    assert state.attributes.get("release_url") == "https://example.com/release1"
-    assert state.attributes.get("title") == "Test Update 1 Title"
-    assert state.attributes.get("entity_picture") == "https://example.com/icon1.png"
-
-    # Test update schema validation with invalid value in JSON update
-    async_fire_mqtt_message(hass, state_topic, '{"update_percentage":101}')
-
-    await hass.async_block_till_done()
-    assert (
-        "Schema violation after processing payload '{\"update_percentage\":101}' on "
-        "topic 'test/state-topic' for entity 'update.test_update': value must be at "
-        "most 100 for dictionary value @ data['update_percentage']" in caplog.text
-    )
-
-
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        {
-            mqtt.DOMAIN: {
-                update.DOMAIN: {
-                    "state_topic": "test/state-topic",
-                    "name": "Test Update",
-                    "display_precision": 1,
-                }
-            }
-        }
-    ],
-)
 async def test_json_state_message(
     hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
 ) -> None:
@@ -409,45 +354,6 @@ async def test_json_state_message(
     assert state.attributes.get("installed_version") == "1.9.0"
     assert state.attributes.get("latest_version") == "2.0.0"
     assert state.attributes.get("entity_picture") == "https://example.com/icon2.png"
-    assert state.attributes.get("in_progress") is False
-    assert state.attributes.get("update_percentage") is None
-
-    # Test in_progress status
-    async_fire_mqtt_message(hass, state_topic, '{"in_progress":true}')
-    await hass.async_block_till_done()
-
-    state = hass.states.get("update.test_update")
-    assert state.state == STATE_ON
-    assert state.attributes.get("installed_version") == "1.9.0"
-    assert state.attributes.get("latest_version") == "2.0.0"
-    assert state.attributes.get("entity_picture") == "https://example.com/icon2.png"
-    assert state.attributes.get("in_progress") is True
-    assert state.attributes.get("update_percentage") is None
-
-    async_fire_mqtt_message(hass, state_topic, '{"in_progress":false}')
-    await hass.async_block_till_done()
-    state = hass.states.get("update.test_update")
-    assert state.attributes.get("in_progress") is False
-
-    # Test update_percentage status
-    async_fire_mqtt_message(hass, state_topic, '{"update_percentage":51.75}')
-    await hass.async_block_till_done()
-    state = hass.states.get("update.test_update")
-    assert state.attributes.get("in_progress") is True
-    assert state.attributes.get("update_percentage") == 51.75
-    assert state.attributes.get("display_precision") == 1
-
-    async_fire_mqtt_message(hass, state_topic, '{"update_percentage":100}')
-    await hass.async_block_till_done()
-    state = hass.states.get("update.test_update")
-    assert state.attributes.get("in_progress") is True
-    assert state.attributes.get("update_percentage") == 100
-
-    async_fire_mqtt_message(hass, state_topic, '{"update_percentage":null}')
-    await hass.async_block_till_done()
-    state = hass.states.get("update.test_update")
-    assert state.attributes.get("in_progress") is False
-    assert state.attributes.get("update_percentage") is None
 
 
 @pytest.mark.parametrize(
@@ -818,10 +724,6 @@ async def test_reloadable(
             '{"entity_picture": "https://example.com/icon1.png"}',
             '{"entity_picture": "https://example.com/icon2.png"}',
         ),
-        ("test-topic", '{"in_progress": true}', '{"in_progress": false}'),
-        ("test-topic", '{"update_percentage": 0}', '{"update_percentage": 50}'),
-        ("test-topic", '{"update_percentage": 50}', '{"update_percentage": 100}'),
-        ("test-topic", '{"update_percentage": 100}', '{"update_percentage": null}'),
         ("availability-topic", "online", "offline"),
         ("json-attributes-topic", '{"attr1": "val1"}', '{"attr1": "val2"}'),
     ],
@@ -873,19 +775,3 @@ async def test_value_template_fails(
         "TypeError: unsupported operand type(s) for *: 'NoneType' and 'int' rendering template"
         in caplog.text
     )
-
-
-async def test_entity_icon_and_entity_picture(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the entity icon or picture setup."""
-    domain = update.DOMAIN
-    config = DEFAULT_CONFIG
-    await help_test_entity_icon_and_entity_picture(
-        hass,
-        mqtt_mock_entry,
-        domain,
-        config,
-        default_entity_picture="https://brands.home-assistant.io/_/mqtt/icon.png",
-    )
diff --git a/tests/components/music_assistant/__init__.py b/tests/components/music_assistant/__init__.py
deleted file mode 100644
index 6893b862e2d..00000000000
--- a/tests/components/music_assistant/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""The tests for the Music Assistant component."""
diff --git a/tests/components/music_assistant/conftest.py b/tests/components/music_assistant/conftest.py
deleted file mode 100644
index b03a56ab4a6..00000000000
--- a/tests/components/music_assistant/conftest.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""Music Assistant test fixtures."""
-
-from collections.abc import Generator
-from unittest.mock import patch
-
-from music_assistant_models.api import ServerInfoMessage
-import pytest
-
-from homeassistant.components.music_assistant.config_flow import CONF_URL
-from homeassistant.components.music_assistant.const import DOMAIN
-
-from tests.common import AsyncMock, MockConfigEntry, load_fixture
-
-
-@pytest.fixture
-def mock_get_server_info() -> Generator[AsyncMock]:
-    """Mock the function to get server info."""
-    with patch(
-        "homeassistant.components.music_assistant.config_flow.get_server_info"
-    ) as mock_get_server_info:
-        mock_get_server_info.return_value = ServerInfoMessage.from_json(
-            load_fixture("server_info_message.json", DOMAIN)
-        )
-        yield mock_get_server_info
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Mock a config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        title="Music Assistant",
-        data={CONF_URL: "http://localhost:8095"},
-        unique_id="1234",
-    )
diff --git a/tests/components/music_assistant/fixtures/server_info_message.json b/tests/components/music_assistant/fixtures/server_info_message.json
deleted file mode 100644
index 907ec8af820..00000000000
--- a/tests/components/music_assistant/fixtures/server_info_message.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "server_id": "1234",
-  "server_version": "0.0.0",
-  "schema_version": 23,
-  "min_supported_schema_version": 23,
-  "base_url": "http://localhost:8095",
-  "homeassistant_addon": false,
-  "onboard_done": false
-}
diff --git a/tests/components/music_assistant/test_config_flow.py b/tests/components/music_assistant/test_config_flow.py
deleted file mode 100644
index c700060889c..00000000000
--- a/tests/components/music_assistant/test_config_flow.py
+++ /dev/null
@@ -1,217 +0,0 @@
-"""Define tests for the Music Assistant Integration config flow."""
-
-from copy import deepcopy
-from ipaddress import ip_address
-from unittest import mock
-from unittest.mock import AsyncMock
-
-from music_assistant_client.exceptions import (
-    CannotConnect,
-    InvalidServerVersion,
-    MusicAssistantClientException,
-)
-from music_assistant_models.api import ServerInfoMessage
-import pytest
-
-from homeassistant.components.music_assistant.config_flow import CONF_URL
-from homeassistant.components.music_assistant.const import DEFAULT_NAME, DOMAIN
-from homeassistant.components.zeroconf import ZeroconfServiceInfo
-from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from tests.common import MockConfigEntry, load_fixture
-
-SERVER_INFO = {
-    "server_id": "1234",
-    "base_url": "http://localhost:8095",
-    "server_version": "0.0.0",
-    "schema_version": 23,
-    "min_supported_schema_version": 23,
-    "homeassistant_addon": True,
-}
-
-ZEROCONF_DATA = ZeroconfServiceInfo(
-    ip_address=ip_address("127.0.0.1"),
-    ip_addresses=[ip_address("127.0.0.1")],
-    hostname="mock_hostname",
-    port=None,
-    type=mock.ANY,
-    name=mock.ANY,
-    properties=SERVER_INFO,
-)
-
-
-async def test_full_flow(
-    hass: HomeAssistant,
-    mock_get_server_info: AsyncMock,
-) -> None:
-    """Test full flow."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_URL: "http://localhost:8095"},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == DEFAULT_NAME
-    assert result["data"] == {
-        CONF_URL: "http://localhost:8095",
-    }
-    assert result["result"].unique_id == "1234"
-
-
-async def test_zero_conf_flow(
-    hass: HomeAssistant,
-    mock_get_server_info: AsyncMock,
-) -> None:
-    """Test zeroconf flow."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data=ZEROCONF_DATA,
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "discovery_confirm"
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == DEFAULT_NAME
-    assert result["data"] == {
-        CONF_URL: "http://localhost:8095",
-    }
-    assert result["result"].unique_id == "1234"
-
-
-async def test_zero_conf_missing_server_id(
-    hass: HomeAssistant,
-    mock_get_server_info: AsyncMock,
-) -> None:
-    """Test zeroconf flow with missing server id."""
-    bad_zero_conf_data = deepcopy(ZEROCONF_DATA)
-    bad_zero_conf_data.properties.pop("server_id")
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data=bad_zero_conf_data,
-    )
-    await hass.async_block_till_done()
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "missing_server_id"
-
-
-async def test_duplicate_user(
-    hass: HomeAssistant,
-    mock_get_server_info: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test duplicate user flow."""
-    mock_config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-    await hass.async_block_till_done()
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_URL: "http://localhost:8095"},
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_duplicate_zeroconf(
-    hass: HomeAssistant,
-    mock_get_server_info: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test duplicate zeroconf flow."""
-    mock_config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data=ZEROCONF_DATA,
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-@pytest.mark.parametrize(
-    ("exception", "error_message"),
-    [
-        (InvalidServerVersion("invalid_server_version"), "invalid_server_version"),
-        (CannotConnect("cannot_connect"), "cannot_connect"),
-        (MusicAssistantClientException("unknown"), "unknown"),
-    ],
-)
-async def test_flow_user_server_version_invalid(
-    hass: HomeAssistant,
-    mock_get_server_info: AsyncMock,
-    exception: MusicAssistantClientException,
-    error_message: str,
-) -> None:
-    """Test user flow when server url is invalid."""
-    mock_get_server_info.side_effect = exception
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-    await hass.async_block_till_done()
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_URL: "http://localhost:8095"},
-    )
-    await hass.async_block_till_done()
-    assert result["errors"] == {"base": error_message}
-
-    mock_get_server_info.side_effect = None
-    mock_get_server_info.return_value = ServerInfoMessage.from_json(
-        load_fixture("server_info_message.json", DOMAIN)
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_URL: "http://localhost:8095"},
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-
-
-async def test_flow_zeroconf_connect_issue(
-    hass: HomeAssistant,
-    mock_get_server_info: AsyncMock,
-) -> None:
-    """Test zeroconf flow when server connect be reached."""
-    mock_get_server_info.side_effect = CannotConnect("cannot_connect")
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data=ZEROCONF_DATA,
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "cannot_connect"
diff --git a/tests/components/myuplink/fixtures/device_points_nibe_f730.json b/tests/components/myuplink/fixtures/device_points_nibe_f730.json
index 99dd9c857e6..9ec5db0ea3b 100644
--- a/tests/components/myuplink/fixtures/device_points_nibe_f730.json
+++ b/tests/components/myuplink/fixtures/device_points_nibe_f730.json
@@ -989,56 +989,5 @@
     ],
     "scaleValue": "1",
     "zoneId": null
-  },
-  {
-    "category": "F730 CU 3x400V",
-    "parameterId": "147641",
-    "parameterName": "Start Wednesday",
-    "parameterUnit": "",
-    "writable": true,
-    "timestamp": "2024-10-18T09:52:01+00:00",
-    "value": 0,
-    "strVal": "0",
-    "smartHomeCategories": [],
-    "minValue": 0,
-    "maxValue": 86400,
-    "stepValue": 900,
-    "enumValues": [],
-    "scaleValue": "1",
-    "zoneId": null
-  },
-  {
-    "category": "F730 CU 3x400V",
-    "parameterId": "148072",
-    "parameterName": "start diff additional heat",
-    "parameterUnit": "DM",
-    "writable": true,
-    "timestamp": "2024-10-18T09:51:39+00:00",
-    "value": 700,
-    "strVal": "700DM",
-    "smartHomeCategories": [],
-    "minValue": 100,
-    "maxValue": 2000,
-    "stepValue": 10,
-    "enumValues": [],
-    "scaleValue": "1",
-    "zoneId": null
-  },
-  {
-    "category": "F730 CU 3x400V",
-    "parameterId": "47011",
-    "parameterName": "Heating offset climate system 1",
-    "parameterUnit": "",
-    "writable": true,
-    "timestamp": "2024-10-18T09:51:39+00:00",
-    "value": 1,
-    "strVal": "1",
-    "smartHomeCategories": ["sh-indoorSpOffsHeat"],
-    "minValue": -10,
-    "maxValue": 10,
-    "stepValue": 1,
-    "enumValues": [],
-    "scaleValue": "1",
-    "zoneId": null
   }
 ]
diff --git a/tests/components/myuplink/snapshots/test_diagnostics.ambr b/tests/components/myuplink/snapshots/test_diagnostics.ambr
index 1b3502c1f04..9160fd3b365 100644
--- a/tests/components/myuplink/snapshots/test_diagnostics.ambr
+++ b/tests/components/myuplink/snapshots/test_diagnostics.ambr
@@ -1050,57 +1050,6 @@
                     ],
                     "scaleValue": "1",
                     "zoneId": null
-                  },
-                  {
-                    "category": "F730 CU 3x400V",
-                    "parameterId": "147641",
-                    "parameterName": "Start Wednesday",
-                    "parameterUnit": "",
-                    "writable": true,
-                    "timestamp": "2024-10-18T09:52:01+00:00",
-                    "value": 0,
-                    "strVal": "0",
-                    "smartHomeCategories": [],
-                    "minValue": 0,
-                    "maxValue": 86400,
-                    "stepValue": 900,
-                    "enumValues": [],
-                    "scaleValue": "1",
-                    "zoneId": null
-                  },
-                  {
-                    "category": "F730 CU 3x400V",
-                    "parameterId": "148072",
-                    "parameterName": "start diff additional heat",
-                    "parameterUnit": "DM",
-                    "writable": true,
-                    "timestamp": "2024-10-18T09:51:39+00:00",
-                    "value": 700,
-                    "strVal": "700DM",
-                    "smartHomeCategories": [],
-                    "minValue": 100,
-                    "maxValue": 2000,
-                    "stepValue": 10,
-                    "enumValues": [],
-                    "scaleValue": "1",
-                    "zoneId": null
-                  },
-                  {
-                    "category": "F730 CU 3x400V",
-                    "parameterId": "47011",
-                    "parameterName": "Heating offset climate system 1",
-                    "parameterUnit": "",
-                    "writable": true,
-                    "timestamp": "2024-10-18T09:51:39+00:00",
-                    "value": 1,
-                    "strVal": "1",
-                    "smartHomeCategories": ["sh-indoorSpOffsHeat"],
-                    "minValue": -10,
-                    "maxValue": 10,
-                    "stepValue": 1,
-                    "enumValues": [],
-                    "scaleValue": "1",
-                    "zoneId": null
                   }
                 ]
   
@@ -2144,57 +2093,6 @@
                     ],
                     "scaleValue": "1",
                     "zoneId": null
-                  },
-                  {
-                    "category": "F730 CU 3x400V",
-                    "parameterId": "147641",
-                    "parameterName": "Start Wednesday",
-                    "parameterUnit": "",
-                    "writable": true,
-                    "timestamp": "2024-10-18T09:52:01+00:00",
-                    "value": 0,
-                    "strVal": "0",
-                    "smartHomeCategories": [],
-                    "minValue": 0,
-                    "maxValue": 86400,
-                    "stepValue": 900,
-                    "enumValues": [],
-                    "scaleValue": "1",
-                    "zoneId": null
-                  },
-                  {
-                    "category": "F730 CU 3x400V",
-                    "parameterId": "148072",
-                    "parameterName": "start diff additional heat",
-                    "parameterUnit": "DM",
-                    "writable": true,
-                    "timestamp": "2024-10-18T09:51:39+00:00",
-                    "value": 700,
-                    "strVal": "700DM",
-                    "smartHomeCategories": [],
-                    "minValue": 100,
-                    "maxValue": 2000,
-                    "stepValue": 10,
-                    "enumValues": [],
-                    "scaleValue": "1",
-                    "zoneId": null
-                  },
-                  {
-                    "category": "F730 CU 3x400V",
-                    "parameterId": "47011",
-                    "parameterName": "Heating offset climate system 1",
-                    "parameterUnit": "",
-                    "writable": true,
-                    "timestamp": "2024-10-18T09:51:39+00:00",
-                    "value": 1,
-                    "strVal": "1",
-                    "smartHomeCategories": ["sh-indoorSpOffsHeat"],
-                    "minValue": -10,
-                    "maxValue": 10,
-                    "stepValue": 1,
-                    "enumValues": [],
-                    "scaleValue": "1",
-                    "zoneId": null
                   }
                 ]
   
diff --git a/tests/components/myuplink/test_number.py b/tests/components/myuplink/test_number.py
index 4106af1b5b9..273c35ab749 100644
--- a/tests/components/myuplink/test_number.py
+++ b/tests/components/myuplink/test_number.py
@@ -14,9 +14,9 @@ from homeassistant.helpers import entity_registry as er
 TEST_PLATFORM = Platform.NUMBER
 pytestmark = pytest.mark.parametrize("platforms", [(TEST_PLATFORM,)])
 
-ENTITY_ID = "number.gotham_city_heating_offset_climate_system_1"
-ENTITY_FRIENDLY_NAME = "Gotham City Heating offset climate system 1"
-ENTITY_UID = "robin-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff-47011"
+ENTITY_ID = "number.gotham_city_degree_minutes"
+ENTITY_FRIENDLY_NAME = "Gotham City Degree minutes"
+ENTITY_UID = "robin-r-1234-20240201-123456-aa-bb-cc-dd-ee-ff-40940"
 
 
 async def test_entity_registry(
@@ -36,16 +36,17 @@ async def test_attributes(
     mock_myuplink_client: MagicMock,
     setup_platform: None,
 ) -> None:
-    """Test the entity attributes are correct."""
+    """Test the switch attributes are correct."""
 
     state = hass.states.get(ENTITY_ID)
-    assert state.state == "1.0"
+    assert state.state == "-875.0"
     assert state.attributes == {
         "friendly_name": ENTITY_FRIENDLY_NAME,
-        "min": -10.0,
-        "max": 10.0,
+        "min": -3000,
+        "max": 3000,
         "mode": "auto",
         "step": 1.0,
+        "unit_of_measurement": "DM",
     }
 
 
@@ -59,7 +60,7 @@ async def test_set_value(
     await hass.services.async_call(
         TEST_PLATFORM,
         SERVICE_SET_VALUE,
-        {ATTR_ENTITY_ID: ENTITY_ID, "value": 1},
+        {ATTR_ENTITY_ID: ENTITY_ID, "value": -125},
         blocking=True,
     )
     await hass.async_block_till_done()
@@ -78,7 +79,7 @@ async def test_api_failure(
         await hass.services.async_call(
             TEST_PLATFORM,
             SERVICE_SET_VALUE,
-            {ATTR_ENTITY_ID: ENTITY_ID, "value": 1},
+            {ATTR_ENTITY_ID: ENTITY_ID, "value": -125},
             blocking=True,
         )
     mock_myuplink_client.async_set_device_points.assert_called_once()
diff --git a/tests/components/nasweb/__init__.py b/tests/components/nasweb/__init__.py
deleted file mode 100644
index d4906d710d5..00000000000
--- a/tests/components/nasweb/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests for the NASweb integration."""
diff --git a/tests/components/nasweb/conftest.py b/tests/components/nasweb/conftest.py
deleted file mode 100644
index 7757f40ee44..00000000000
--- a/tests/components/nasweb/conftest.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""Common fixtures for the NASweb tests."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.nasweb.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-BASE_CONFIG_FLOW = "homeassistant.components.nasweb.config_flow."
-BASE_NASWEB_DATA = "homeassistant.components.nasweb.nasweb_data."
-BASE_COORDINATOR = "homeassistant.components.nasweb.coordinator."
-TEST_SERIAL_NUMBER = "0011223344556677"
-
-
-@pytest.fixture
-def validate_input_all_ok() -> Generator[dict[str, AsyncMock | MagicMock]]:
-    """Yield dictionary of mocked functions required for successful test_form execution."""
-    with (
-        patch(
-            BASE_CONFIG_FLOW + "WebioAPI.check_connection",
-            return_value=True,
-        ) as check_connection,
-        patch(
-            BASE_CONFIG_FLOW + "WebioAPI.refresh_device_info",
-            return_value=True,
-        ) as refresh_device_info,
-        patch(
-            BASE_NASWEB_DATA + "NASwebData.get_webhook_url",
-            return_value="http://127.0.0.1:8123/api/webhook/de705e77291402afa0dd961426e9f19bb53631a9f2a106c52cfd2d2266913c04",
-        ) as get_webhook_url,
-        patch(
-            BASE_CONFIG_FLOW + "WebioAPI.get_serial_number",
-            return_value=TEST_SERIAL_NUMBER,
-        ) as get_serial,
-        patch(
-            BASE_CONFIG_FLOW + "WebioAPI.status_subscription",
-            return_value=True,
-        ) as status_subscription,
-        patch(
-            BASE_NASWEB_DATA + "NotificationCoordinator.check_connection",
-            return_value=True,
-        ) as check_status_confirmation,
-    ):
-        yield {
-            BASE_CONFIG_FLOW + "WebioAPI.check_connection": check_connection,
-            BASE_CONFIG_FLOW + "WebioAPI.refresh_device_info": refresh_device_info,
-            BASE_NASWEB_DATA + "NASwebData.get_webhook_url": get_webhook_url,
-            BASE_CONFIG_FLOW + "WebioAPI.get_serial_number": get_serial,
-            BASE_CONFIG_FLOW + "WebioAPI.status_subscription": status_subscription,
-            BASE_NASWEB_DATA
-            + "NotificationCoordinator.check_connection": check_status_confirmation,
-        }
diff --git a/tests/components/nasweb/test_config_flow.py b/tests/components/nasweb/test_config_flow.py
deleted file mode 100644
index a5f2dca680d..00000000000
--- a/tests/components/nasweb/test_config_flow.py
+++ /dev/null
@@ -1,208 +0,0 @@
-"""Test the NASweb config flow."""
-
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from webio_api.api_client import AuthError
-
-from homeassistant import config_entries
-from homeassistant.components.nasweb.const import DOMAIN
-from homeassistant.config_entries import ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.network import NoURLAvailableError
-
-from .conftest import (
-    BASE_CONFIG_FLOW,
-    BASE_COORDINATOR,
-    BASE_NASWEB_DATA,
-    TEST_SERIAL_NUMBER,
-)
-
-pytestmark = pytest.mark.usefixtures("mock_setup_entry")
-
-
-TEST_USER_INPUT = {
-    CONF_HOST: "1.1.1.1",
-    CONF_USERNAME: "test-username",
-    CONF_PASSWORD: "test-password",
-}
-
-
-async def _add_test_config_entry(hass: HomeAssistant) -> ConfigFlowResult:
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result.get("type") == FlowResultType.FORM
-    assert not result.get("errors")
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"], TEST_USER_INPUT
-    )
-    await hass.async_block_till_done()
-    return result2
-
-
-async def test_form(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test the form."""
-    result = await _add_test_config_entry(hass)
-
-    assert result.get("type") == FlowResultType.CREATE_ENTRY
-    assert result.get("title") == "1.1.1.1"
-    assert result.get("data") == TEST_USER_INPUT
-
-    config_entry = result.get("result")
-    assert config_entry is not None
-    assert config_entry.unique_id == TEST_SERIAL_NUMBER
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_cannot_connect(
-    hass: HomeAssistant,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test cannot connect error."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with patch(BASE_CONFIG_FLOW + "WebioAPI.check_connection", return_value=False):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], TEST_USER_INPUT
-        )
-
-    assert result2.get("type") == FlowResultType.FORM
-    assert result2.get("errors") == {"base": "cannot_connect"}
-
-
-async def test_form_invalid_auth(
-    hass: HomeAssistant,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test invalid auth."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with patch(
-        BASE_CONFIG_FLOW + "WebioAPI.refresh_device_info",
-        side_effect=AuthError,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], TEST_USER_INPUT
-        )
-
-    assert result2.get("type") == FlowResultType.FORM
-    assert result2.get("errors") == {"base": "invalid_auth"}
-
-
-async def test_form_missing_internal_url(
-    hass: HomeAssistant,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test missing internal url."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with patch(
-        BASE_NASWEB_DATA + "NASwebData.get_webhook_url", side_effect=NoURLAvailableError
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], TEST_USER_INPUT
-        )
-        assert result2.get("type") == FlowResultType.FORM
-        assert result2.get("errors") == {"base": "missing_internal_url"}
-
-
-async def test_form_missing_nasweb_data(
-    hass: HomeAssistant,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test invalid auth."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with patch(
-        BASE_CONFIG_FLOW + "WebioAPI.get_serial_number",
-        return_value=None,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], TEST_USER_INPUT
-        )
-        assert result2.get("type") == FlowResultType.FORM
-        assert result2.get("errors") == {"base": "missing_nasweb_data"}
-    with patch(BASE_CONFIG_FLOW + "WebioAPI.status_subscription", return_value=False):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], TEST_USER_INPUT
-        )
-        assert result2.get("type") == FlowResultType.FORM
-        assert result2.get("errors") == {"base": "missing_nasweb_data"}
-
-
-async def test_missing_status(
-    hass: HomeAssistant,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test missing status update."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with patch(
-        BASE_COORDINATOR + "NotificationCoordinator.check_connection",
-        return_value=False,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], TEST_USER_INPUT
-        )
-        assert result2.get("type") == FlowResultType.FORM
-        assert result2.get("errors") == {"base": "missing_status"}
-
-
-async def test_form_exception(
-    hass: HomeAssistant,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test other exceptions."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    with patch(
-        "homeassistant.components.nasweb.config_flow.validate_input",
-        side_effect=Exception,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], TEST_USER_INPUT
-        )
-        assert result2.get("type") == FlowResultType.FORM
-        assert result2.get("errors") == {"base": "unknown"}
-
-
-async def test_form_already_configured(
-    hass: HomeAssistant,
-    validate_input_all_ok: dict[str, AsyncMock | MagicMock],
-) -> None:
-    """Test already configured device."""
-    result = await _add_test_config_entry(hass)
-    config_entry = result.get("result")
-    assert config_entry is not None
-    assert config_entry.unique_id == TEST_SERIAL_NUMBER
-
-    result2_1 = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    result2_2 = await hass.config_entries.flow.async_configure(
-        result2_1["flow_id"], TEST_USER_INPUT
-    )
-    await hass.async_block_till_done()
-
-    assert result2_2.get("type") == FlowResultType.ABORT
-    assert result2_2.get("reason") == "already_configured"
diff --git a/tests/components/ness_alarm/test_init.py b/tests/components/ness_alarm/test_init.py
index 48821d3e68d..fb003d253de 100644
--- a/tests/components/ness_alarm/test_init.py
+++ b/tests/components/ness_alarm/test_init.py
@@ -6,7 +6,6 @@ from nessclient import ArmingMode, ArmingState
 import pytest
 
 from homeassistant.components import alarm_control_panel
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.components.ness_alarm import (
     ATTR_CODE,
     ATTR_OUTPUT_ID,
@@ -25,6 +24,13 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_DISARM,
     SERVICE_ALARM_TRIGGER,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
@@ -84,9 +90,7 @@ async def test_dispatch_state_change(hass: HomeAssistant, mock_nessclient) -> No
     on_state_change(ArmingState.ARMING, None)
 
     await hass.async_block_till_done()
-    assert hass.states.is_state(
-        "alarm_control_panel.alarm_panel", AlarmControlPanelState.ARMING
-    )
+    assert hass.states.is_state("alarm_control_panel.alarm_panel", STATE_ALARM_ARMING)
 
 
 async def test_alarm_disarm(hass: HomeAssistant, mock_nessclient) -> None:
@@ -174,27 +178,15 @@ async def test_arming_state_change(hass: HomeAssistant, mock_nessclient) -> None
     """Test arming state change handing."""
     states = [
         (ArmingState.UNKNOWN, None, STATE_UNKNOWN),
-        (ArmingState.DISARMED, None, AlarmControlPanelState.DISARMED),
-        (ArmingState.ARMING, None, AlarmControlPanelState.ARMING),
-        (ArmingState.EXIT_DELAY, None, AlarmControlPanelState.ARMING),
-        (ArmingState.ARMED, None, AlarmControlPanelState.ARMED_AWAY),
-        (
-            ArmingState.ARMED,
-            ArmingMode.ARMED_AWAY,
-            AlarmControlPanelState.ARMED_AWAY,
-        ),
-        (
-            ArmingState.ARMED,
-            ArmingMode.ARMED_HOME,
-            AlarmControlPanelState.ARMED_HOME,
-        ),
-        (
-            ArmingState.ARMED,
-            ArmingMode.ARMED_NIGHT,
-            AlarmControlPanelState.ARMED_NIGHT,
-        ),
-        (ArmingState.ENTRY_DELAY, None, AlarmControlPanelState.PENDING),
-        (ArmingState.TRIGGERED, None, AlarmControlPanelState.TRIGGERED),
+        (ArmingState.DISARMED, None, STATE_ALARM_DISARMED),
+        (ArmingState.ARMING, None, STATE_ALARM_ARMING),
+        (ArmingState.EXIT_DELAY, None, STATE_ALARM_ARMING),
+        (ArmingState.ARMED, None, STATE_ALARM_ARMED_AWAY),
+        (ArmingState.ARMED, ArmingMode.ARMED_AWAY, STATE_ALARM_ARMED_AWAY),
+        (ArmingState.ARMED, ArmingMode.ARMED_HOME, STATE_ALARM_ARMED_HOME),
+        (ArmingState.ARMED, ArmingMode.ARMED_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (ArmingState.ENTRY_DELAY, None, STATE_ALARM_PENDING),
+        (ArmingState.TRIGGERED, None, STATE_ALARM_TRIGGERED),
     ]
 
     await async_setup_component(hass, DOMAIN, VALID_CONFIG)
diff --git a/tests/components/nest/common.py b/tests/components/nest/common.py
index f34c40e09f9..9c8de0224f0 100644
--- a/tests/components/nest/common.py
+++ b/tests/components/nest/common.py
@@ -30,7 +30,6 @@ CLIENT_ID = "some-client-id"
 CLIENT_SECRET = "some-client-secret"
 CLOUD_PROJECT_ID = "cloud-id-9876"
 SUBSCRIBER_ID = "projects/cloud-id-9876/subscriptions/subscriber-id-9876"
-SUBSCRIPTION_NAME = "projects/cloud-id-9876/subscriptions/subscriber-id-9876"
 
 
 @dataclass
@@ -87,17 +86,6 @@ TEST_CONFIG_ENTRY_LEGACY = NestTestConfig(
     },
 )
 
-TEST_CONFIG_NEW_SUBSCRIPTION = NestTestConfig(
-    config_entry_data={
-        "sdm": {},
-        "project_id": PROJECT_ID,
-        "cloud_project_id": CLOUD_PROJECT_ID,
-        "subscription_name": SUBSCRIPTION_NAME,
-        "auth_implementation": "imported-cred",
-    },
-    credential=ClientCredential(CLIENT_ID, CLIENT_SECRET),
-)
-
 
 class FakeSubscriber(GoogleNestSubscriber):
     """Fake subscriber that supplies a FakeDeviceManager."""
@@ -107,7 +95,6 @@ class FakeSubscriber(GoogleNestSubscriber):
     def __init__(self) -> None:  # pylint: disable=super-init-not-called
         """Initialize Fake Subscriber."""
         self._device_manager = DeviceManager()
-        self._subscriber_name = "fake-name"
 
     def set_update_callback(self, target: Callable[[EventMessage], Awaitable[None]]):
         """Capture the callback set by Home Assistant."""
diff --git a/tests/components/nest/conftest.py b/tests/components/nest/conftest.py
index b070d025612..85c64aff379 100644
--- a/tests/components/nest/conftest.py
+++ b/tests/components/nest/conftest.py
@@ -22,7 +22,6 @@ from homeassistant.components.application_credentials import (
 )
 from homeassistant.components.nest import DOMAIN
 from homeassistant.components.nest.const import CONF_SUBSCRIBER_ID, SDM_SCOPES
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -288,8 +287,6 @@ async def setup_base_platform(
             await hass.async_block_till_done()
 
         yield _setup_func
-        if config_entry and config_entry.state == ConfigEntryState.LOADED:
-            await hass.config_entries.async_unload(config_entry.entry_id)
 
 
 @pytest.fixture
diff --git a/tests/components/nest/test_camera.py b/tests/components/nest/test_camera.py
index 029879f1413..dda7bcfa093 100644
--- a/tests/components/nest/test_camera.py
+++ b/tests/components/nest/test_camera.py
@@ -28,7 +28,7 @@ from .common import DEVICE_ID, CreateDevice, FakeSubscriber, PlatformSetup
 from .conftest import FakeAuth
 
 from tests.common import async_fire_time_changed
-from tests.typing import MockHAClientWebSocket, WebSocketGenerator
+from tests.typing import WebSocketGenerator
 
 PLATFORM = "camera"
 CAMERA_DEVICE_TYPE = "sdm.devices.types.CAMERA"
@@ -176,30 +176,6 @@ async def async_get_image(
     return image.content
 
 
-def get_frontend_stream_type_attribute(
-    hass: HomeAssistant, entity_id: str
-) -> StreamType:
-    """Get the frontend_stream_type camera attribute."""
-    cam = hass.states.get(entity_id)
-    assert cam is not None
-    assert cam.state == CameraState.STREAMING
-    return cam.attributes.get("frontend_stream_type")
-
-
-async def async_frontend_stream_types(
-    client: MockHAClientWebSocket, entity_id: str
-) -> list[str] | None:
-    """Get the frontend stream types supported."""
-    await client.send_json_auto_id(
-        {"type": "camera/capabilities", "entity_id": entity_id}
-    )
-    msg = await client.receive_json()
-    assert msg.get("type") == TYPE_RESULT
-    assert msg.get("success")
-    assert msg.get("result")
-    return msg["result"].get("frontend_stream_types")
-
-
 async def fire_alarm(hass: HomeAssistant, point_in_time: datetime.datetime) -> None:
     """Fire an alarm and wait for callbacks to run."""
     with freeze_time(point_in_time):
@@ -261,21 +237,16 @@ async def test_camera_stream(
     camera_device: None,
     auth: FakeAuth,
     mock_create_stream: Mock,
-    hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test a basic camera and fetch its live stream."""
     auth.responses = [make_stream_url_response()]
     await setup_platform()
 
     assert len(hass.states.async_all()) == 1
-    assert (
-        get_frontend_stream_type_attribute(hass, "camera.my_camera") == StreamType.HLS
-    )
-    client = await hass_ws_client(hass)
-    frontend_stream_types = await async_frontend_stream_types(
-        client, "camera.my_camera"
-    )
-    assert frontend_stream_types == [StreamType.HLS]
+    cam = hass.states.get("camera.my_camera")
+    assert cam is not None
+    assert cam.state == CameraState.STREAMING
+    assert cam.attributes["frontend_stream_type"] == StreamType.HLS
 
     stream_source = await camera.async_get_stream_source(hass, "camera.my_camera")
     assert stream_source == "rtsp://some/url?auth=g.0.streamingToken"
@@ -294,16 +265,12 @@ async def test_camera_ws_stream(
     await setup_platform()
 
     assert len(hass.states.async_all()) == 1
-    assert (
-        get_frontend_stream_type_attribute(hass, "camera.my_camera") == StreamType.HLS
-    )
+    cam = hass.states.get("camera.my_camera")
+    assert cam is not None
+    assert cam.state == CameraState.STREAMING
+    assert cam.attributes["frontend_stream_type"] == StreamType.HLS
 
     client = await hass_ws_client(hass)
-    frontend_stream_types = await async_frontend_stream_types(
-        client, "camera.my_camera"
-    )
-    assert frontend_stream_types == [StreamType.HLS]
-
     await client.send_json(
         {
             "id": 2,
@@ -355,7 +322,7 @@ async def test_camera_ws_stream_failure(
 async def test_camera_stream_missing_trait(
     hass: HomeAssistant, setup_platform, create_device
 ) -> None:
-    """Test that cameras missing a live stream are not supported."""
+    """Test fetching a video stream when not supported by the API."""
     create_device.create(
         {
             "sdm.devices.traits.Info": {
@@ -371,7 +338,16 @@ async def test_camera_stream_missing_trait(
     )
     await setup_platform()
 
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_all()) == 1
+    cam = hass.states.get("camera.my_camera")
+    assert cam is not None
+    assert cam.state == CameraState.IDLE
+
+    stream_source = await camera.async_get_stream_source(hass, "camera.my_camera")
+    assert stream_source is None
+
+    # Fallback to placeholder image
+    await async_get_image(hass)
 
 
 async def test_refresh_expired_stream_token(
@@ -483,50 +459,6 @@ async def test_stream_response_already_expired(
     assert stream_source == "rtsp://some/url?auth=g.2.streamingToken"
 
 
-async def test_extending_stream_already_expired(
-    hass: HomeAssistant,
-    auth: FakeAuth,
-    setup_platform: PlatformSetup,
-    camera_device: None,
-) -> None:
-    """Test a API response when extending the stream returns an expired stream url."""
-    now = utcnow()
-    stream_1_expiration = now + datetime.timedelta(seconds=180)
-    stream_2_expiration = now + datetime.timedelta(seconds=30)  # Will be in the past
-    stream_3_expiration = now + datetime.timedelta(seconds=600)
-    auth.responses = [
-        make_stream_url_response(stream_1_expiration, token_num=1),
-        make_stream_url_response(stream_2_expiration, token_num=2),
-        make_stream_url_response(stream_3_expiration, token_num=3),
-    ]
-    await setup_platform()
-
-    assert len(hass.states.async_all()) == 1
-    cam = hass.states.get("camera.my_camera")
-    assert cam is not None
-    assert cam.state == CameraState.STREAMING
-
-    # The stream is expired, but we return it anyway
-    stream_source = await camera.async_get_stream_source(hass, "camera.my_camera")
-    assert stream_source == "rtsp://some/url?auth=g.1.streamingToken"
-
-    # Jump to when the stream will be refreshed
-    await fire_alarm(hass, now + datetime.timedelta(seconds=160))
-    stream_source = await camera.async_get_stream_source(hass, "camera.my_camera")
-    assert stream_source == "rtsp://some/url?auth=g.2.streamingToken"
-
-    # The stream will have expired in the past, but 1 minute min refresh interval is applied.
-    # The stream token is not updated.
-    await fire_alarm(hass, now + datetime.timedelta(seconds=170))
-    stream_source = await camera.async_get_stream_source(hass, "camera.my_camera")
-    assert stream_source == "rtsp://some/url?auth=g.2.streamingToken"
-
-    # Now go past the min update interval and the stream is refreshed
-    await fire_alarm(hass, now + datetime.timedelta(seconds=225))
-    stream_source = await camera.async_get_stream_source(hass, "camera.my_camera")
-    assert stream_source == "rtsp://some/url?auth=g.3.streamingToken"
-
-
 async def test_camera_removed(
     hass: HomeAssistant,
     auth: FakeAuth,
@@ -645,11 +577,11 @@ async def test_refresh_expired_stream_failure(
         assert create_stream.called
 
 
-@pytest.mark.usefixtures("webrtc_camera_device")
 async def test_camera_web_rtc(
     hass: HomeAssistant,
     auth,
     hass_ws_client: WebSocketGenerator,
+    webrtc_camera_device,
     setup_platform,
 ) -> None:
     """Test a basic camera that supports web rtc."""
@@ -674,43 +606,31 @@ async def test_camera_web_rtc(
     assert cam.attributes["frontend_stream_type"] == StreamType.WEB_RTC
 
     client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
+    await client.send_json(
         {
-            "type": "camera/webrtc/offer",
+            "id": 5,
+            "type": "camera/web_rtc_offer",
             "entity_id": "camera.my_camera",
             "offer": "a=recvonly",
         }
     )
 
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "answer",
-        "answer": "v=0\r\ns=-\r\n",
-    }
+    msg = await client.receive_json()
+    assert msg["id"] == 5
+    assert msg["type"] == TYPE_RESULT
+    assert msg["success"]
+    assert msg["result"]["answer"] == "v=0\r\ns=-\r\n"
 
     # Nest WebRTC cameras return a placeholder
     await async_get_image(hass)
     await async_get_image(hass, width=1024, height=768)
 
 
-@pytest.mark.usefixtures("auth", "camera_device")
 async def test_camera_web_rtc_unsupported(
     hass: HomeAssistant,
+    auth,
     hass_ws_client: WebSocketGenerator,
+    camera_device,
     setup_platform,
 ) -> None:
     """Test a basic camera that supports web rtc."""
@@ -723,37 +643,28 @@ async def test_camera_web_rtc_unsupported(
     assert cam.attributes["frontend_stream_type"] == StreamType.HLS
 
     client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {"type": "camera/capabilities", "entity_id": "camera.my_camera"}
-    )
-    msg = await client.receive_json()
-
-    assert msg["type"] == TYPE_RESULT
-    assert msg["success"]
-    assert msg["result"] == {"frontend_stream_types": ["hls"]}
-
-    await client.send_json_auto_id(
+    await client.send_json(
         {
-            "type": "camera/webrtc/offer",
+            "id": 5,
+            "type": "camera/web_rtc_offer",
             "entity_id": "camera.my_camera",
             "offer": "a=recvonly",
         }
     )
 
     msg = await client.receive_json()
+    assert msg["id"] == 5
     assert msg["type"] == TYPE_RESULT
     assert not msg["success"]
-    assert msg["error"] == {
-        "code": "webrtc_offer_failed",
-        "message": "Camera does not support WebRTC, frontend_stream_type=hls",
-    }
+    assert msg["error"]["code"] == "web_rtc_offer_failed"
+    assert msg["error"]["message"].startswith("Camera does not support WebRTC")
 
 
-@pytest.mark.usefixtures("webrtc_camera_device")
 async def test_camera_web_rtc_offer_failure(
     hass: HomeAssistant,
     auth,
     hass_ws_client: WebSocketGenerator,
+    webrtc_camera_device,
     setup_platform,
 ) -> None:
     """Test a basic camera that supports web rtc."""
@@ -768,47 +679,36 @@ async def test_camera_web_rtc_offer_failure(
     assert cam.state == CameraState.STREAMING
 
     client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
+    await client.send_json(
         {
-            "type": "camera/webrtc/offer",
+            "id": 5,
+            "type": "camera/web_rtc_offer",
             "entity_id": "camera.my_camera",
             "offer": "a=recvonly",
         }
     )
 
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "error",
-        "code": "webrtc_offer_failed",
-        "message": "Nest API error: Bad Request response from API (400)",
-    }
+    msg = await client.receive_json()
+    assert msg["id"] == 5
+    assert msg["type"] == TYPE_RESULT
+    assert not msg["success"]
+    assert msg["error"]["code"] == "web_rtc_offer_failed"
+    assert msg["error"]["message"].startswith("Nest API error")
 
 
-@pytest.mark.usefixtures("mock_create_stream")
 async def test_camera_multiple_streams(
     hass: HomeAssistant,
     auth,
     hass_ws_client: WebSocketGenerator,
     create_device,
     setup_platform,
+    mock_create_stream,
 ) -> None:
     """Test a camera supporting multiple stream types."""
     expiration = utcnow() + datetime.timedelta(seconds=100)
     auth.responses = [
+        # RTSP response
+        make_stream_url_response(),
         # WebRTC response
         aiohttp.web.json_response(
             {
@@ -845,127 +745,23 @@ async def test_camera_multiple_streams(
     # Prefer WebRTC over RTSP/HLS
     assert cam.attributes["frontend_stream_type"] == StreamType.WEB_RTC
 
-    # RTSP stream is not supported
+    # RTSP stream
     stream_source = await camera.async_get_stream_source(hass, "camera.my_camera")
-    assert not stream_source
+    assert stream_source == "rtsp://some/url?auth=g.0.streamingToken"
 
     # WebRTC stream
     client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
+    await client.send_json(
         {
-            "type": "camera/webrtc/offer",
+            "id": 5,
+            "type": "camera/web_rtc_offer",
             "entity_id": "camera.my_camera",
             "offer": "a=recvonly",
         }
     )
 
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "answer",
-        "answer": "v=0\r\ns=-\r\n",
-    }
-
-
-@pytest.mark.usefixtures("webrtc_camera_device")
-async def test_webrtc_refresh_expired_stream(
-    hass: HomeAssistant,
-    setup_platform: PlatformSetup,
-    hass_ws_client: WebSocketGenerator,
-    auth: FakeAuth,
-) -> None:
-    """Test a camera webrtc expiration and refresh."""
-    now = utcnow()
-
-    stream_1_expiration = now + datetime.timedelta(seconds=90)
-    stream_2_expiration = now + datetime.timedelta(seconds=180)
-    auth.responses = [
-        aiohttp.web.json_response(
-            {
-                "results": {
-                    "answerSdp": "v=0\r\ns=-\r\n",
-                    "mediaSessionId": "yP2grqz0Y1V_wgiX9KEbMWHoLd...",
-                    "expiresAt": stream_1_expiration.isoformat(timespec="seconds"),
-                },
-            }
-        ),
-        aiohttp.web.json_response(
-            {
-                "results": {
-                    "mediaSessionId": "yP2grqz0Y1V_wgiX9KEbMWHoLd...",
-                    "expiresAt": stream_2_expiration.isoformat(timespec="seconds"),
-                },
-            }
-        ),
-    ]
-    await setup_platform()
-    await hass.async_block_till_done()
-
-    assert len(hass.states.async_all()) == 1
-    cam = hass.states.get("camera.my_camera")
-    assert cam is not None
-    assert cam.state == CameraState.STREAMING
-    assert cam.attributes["frontend_stream_type"] == StreamType.WEB_RTC
-
-    client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
-        {
-            "type": "camera/webrtc/offer",
-            "entity_id": "camera.my_camera",
-            "offer": "a=recvonly",
-        }
-    )
-
-    response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "answer",
-        "answer": "v=0\r\ns=-\r\n",
-    }
-
-    assert len(auth.captured_requests) == 1
-    assert (
-        auth.captured_requests[0][2].get("command")
-        == "sdm.devices.commands.CameraLiveStream.GenerateWebRtcStream"
-    )
-
-    # Fire alarm before stream_1_expiration. The stream url is not refreshed
-    next_update = now + datetime.timedelta(seconds=25)
-    await fire_alarm(hass, next_update)
-    assert len(auth.captured_requests) == 1
-
-    # Alarm is near stream_1_expiration which causes the stream extension
-    next_update = now + datetime.timedelta(seconds=60)
-    await fire_alarm(hass, next_update)
-
-    assert len(auth.captured_requests) >= 2
-    assert (
-        auth.captured_requests[1][2].get("command")
-        == "sdm.devices.commands.CameraLiveStream.ExtendWebRtcStream"
-    )
+    msg = await client.receive_json()
+    assert msg["id"] == 5
+    assert msg["type"] == TYPE_RESULT
+    assert msg["success"]
+    assert msg["result"]["answer"] == "v=0\r\ns=-\r\n"
diff --git a/tests/components/nest/test_config_flow.py b/tests/components/nest/test_config_flow.py
index 8b05ace6d4d..b6e84ce358f 100644
--- a/tests/components/nest/test_config_flow.py
+++ b/tests/components/nest/test_config_flow.py
@@ -6,7 +6,11 @@ from http import HTTPStatus
 from typing import Any
 from unittest.mock import patch
 
-from google_nest_sdm.exceptions import AuthException
+from google_nest_sdm.exceptions import (
+    AuthException,
+    ConfigurationException,
+    SubscriberException,
+)
 from google_nest_sdm.structure import Structure
 import pytest
 
@@ -36,7 +40,7 @@ from tests.typing import ClientSessionGenerator
 
 WEB_REDIRECT_URL = "https://example.com/auth/external/callback"
 APP_REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob"
-RAND_SUBSCRIBER_SUFFIX = "ABCDEF"
+
 
 FAKE_DHCP_DATA = dhcp.DhcpServiceInfo(
     ip="127.0.0.2", macaddress="001122334455", hostname="fake_hostname"
@@ -49,16 +53,6 @@ def nest_test_config() -> NestTestConfig:
     return TEST_CONFIGFLOW_APP_CREDS
 
 
-@pytest.fixture(autouse=True)
-def mock_rand_topic_name_fixture() -> None:
-    """Set the topic name random string to a constant."""
-    with patch(
-        "homeassistant.components.nest.config_flow.get_random_string",
-        return_value=RAND_SUBSCRIBER_SUFFIX,
-    ):
-        yield
-
-
 class OAuthFixture:
     """Simulate the oauth flow used by the config flow."""
 
@@ -164,43 +158,6 @@ class OAuthFixture:
             },
         )
 
-    async def async_complete_pubsub_flow(
-        self,
-        result: dict,
-        selected_topic: str,
-        selected_subscription: str = "create_new_subscription",
-        user_input: dict | None = None,
-    ) -> ConfigEntry:
-        """Fixture to walk through the Pub/Sub topic and subscription steps.
-
-        This picks a simple set of steps that are reusable for most flows without
-        exercising the corner cases.
-        """
-
-        # Validate Pub/Sub topics are shown
-        assert result.get("type") is FlowResultType.FORM
-        assert result.get("step_id") == "pubsub_topic"
-        assert not result.get("errors")
-
-        # Select Pub/Sub topic the show available subscriptions (none)
-        result = await self.async_configure(
-            result,
-            {
-                "topic_name": selected_topic,
-            },
-        )
-        assert result.get("type") is FlowResultType.FORM
-        assert result.get("step_id") == "pubsub_subscription"
-        assert not result.get("errors")
-
-        # Create the subscription and end the flow
-        return await self.async_finish_setup(
-            result,
-            {
-                "subscription_name": selected_subscription,
-            },
-        )
-
     async def async_finish_setup(
         self, result: dict, user_input: dict | None = None
     ) -> ConfigEntry:
@@ -222,6 +179,15 @@ class OAuthFixture:
             user_input,
         )
 
+    async def async_pubsub_flow(self, result: dict, cloud_project_id="") -> None:
+        """Verify the pubsub creation step."""
+        # Render form with a link to get an auth token
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "pubsub"
+        assert "description_placeholders" in result
+        assert "url" in result["description_placeholders"]
+        assert result["data_schema"]({}) == {"cloud_project_id": cloud_project_id}
+
     def get_config_entry(self) -> ConfigEntry:
         """Get the config entry."""
         entries = self.hass.config_entries.async_entries(DOMAIN)
@@ -240,115 +206,6 @@ async def oauth(
     return OAuthFixture(hass, hass_client_no_auth, aioclient_mock)
 
 
-@pytest.fixture(name="sdm_managed_topic")
-def mock_sdm_managed_topic() -> bool:
-    """Fixture to configure fake server responses for SDM owend Pub/Sub topics."""
-    return False
-
-
-@pytest.fixture(name="user_managed_topics")
-def mock_user_managed_topics() -> list[str]:
-    """Fixture to configure fake server response for user owned Pub/Sub topics."""
-    return []
-
-
-@pytest.fixture(name="subscriptions")
-def mock_subscriptions() -> list[tuple[str, str]]:
-    """Fixture to configure fake server response for user subscriptions that exist."""
-    return []
-
-
-@pytest.fixture(name="device_access_project_id")
-def mock_device_access_project_id() -> str:
-    """Fixture to configure the device access console project id used in tests."""
-    return PROJECT_ID
-
-
-@pytest.fixture(name="cloud_project_id")
-def mock_cloud_project_id() -> str:
-    """Fixture to configure the cloud console project id used in tests."""
-    return CLOUD_PROJECT_ID
-
-
-@pytest.fixture(name="create_subscription_status")
-def mock_create_subscription_status() -> str:
-    """Fixture to configure the return code when creating the subscription."""
-    return HTTPStatus.OK
-
-
-@pytest.fixture(name="list_topics_status")
-def mock_list_topics_status() -> str:
-    """Fixture to configure the return code when listing topics."""
-    return HTTPStatus.OK
-
-
-@pytest.fixture(name="list_subscriptions_status")
-def mock_list_subscriptions_status() -> str:
-    """Fixture to configure the return code when listing subscriptions."""
-    return HTTPStatus.OK
-
-
-@pytest.fixture(autouse=True)
-def mock_pubsub_api_responses(
-    aioclient_mock: AiohttpClientMocker,
-    sdm_managed_topic: bool,
-    user_managed_topics: list[str],
-    subscriptions: list[tuple[str, str]],
-    device_access_project_id: str,
-    cloud_project_id: str,
-    create_subscription_status: HTTPStatus,
-    list_topics_status: HTTPStatus,
-    list_subscriptions_status: HTTPStatus,
-) -> None:
-    """Configure a server response for an SDM managed Pub/Sub topic.
-
-    We check for a topic created by the SDM Device Access Console (but note we don't have permission to read it)
-    or the user has created one themselves in the Google Cloud Project.
-    """
-    aioclient_mock.get(
-        f"https://pubsub.googleapis.com/v1/projects/sdm-prod/topics/enterprise-{device_access_project_id}",
-        status=HTTPStatus.FORBIDDEN if sdm_managed_topic else HTTPStatus.NOT_FOUND,
-    )
-    aioclient_mock.get(
-        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/topics",
-        json={
-            "topics": [
-                {
-                    "name": topic_name,
-                }
-                for topic_name in user_managed_topics or ()
-            ]
-        },
-        status=list_topics_status,
-    )
-    # We check for a topic created by the SDM Device Access Console (but note we don't have permission to read it)
-    # or the user has created one themselves in the Google Cloud Project.
-    aioclient_mock.get(
-        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/subscriptions",
-        json={
-            "subscriptions": [
-                {
-                    "name": subscription_name,
-                    "topic": topic,
-                    "pushConfig": {},
-                    "ackDeadlineSeconds": 10,
-                    "messageRetentionDuration": "604800s",
-                    "expirationPolicy": {"ttl": "2678400s"},
-                    "state": "ACTIVE",
-                }
-                for (subscription_name, topic) in subscriptions or ()
-            ]
-        },
-        status=list_subscriptions_status,
-    )
-    aioclient_mock.put(
-        f"https://pubsub.googleapis.com/v1/projects/{cloud_project_id}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}",
-        json={},
-        status=create_subscription_status,
-    )
-
-
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_app_credentials(
     hass: HomeAssistant, oauth, subscriber, setup_platform
 ) -> None:
@@ -361,22 +218,20 @@ async def test_app_credentials(
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
 
-    result = await oauth.async_configure(result, None)
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic=f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
+    entry = await oauth.async_finish_setup(result)
 
     data = dict(entry.data)
     assert "token" in data
     data["token"].pop("expires_in")
     data["token"].pop("expires_at")
+    assert "subscriber_id" in data
+    assert f"projects/{CLOUD_PROJECT_ID}/subscriptions" in data["subscriber_id"]
+    data.pop("subscriber_id")
     assert data == {
         "sdm": {},
         "auth_implementation": "imported-cred",
         "cloud_project_id": CLOUD_PROJECT_ID,
         "project_id": PROJECT_ID,
-        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}",
-        "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
         "token": {
             "refresh_token": "mock-refresh-token",
             "access_token": "mock-access-token",
@@ -385,10 +240,6 @@ async def test_app_credentials(
     }
 
 
-@pytest.mark.parametrize(
-    ("sdm_managed_topic", "device_access_project_id", "cloud_project_id"),
-    [(True, "new-project-id", "new-cloud-project-id")],
-)
 async def test_config_flow_restart(
     hass: HomeAssistant, oauth, subscriber, setup_platform
 ) -> None:
@@ -421,22 +272,20 @@ async def test_config_flow_restart(
     await oauth.async_oauth_web_flow(result, "new-project-id")
     oauth.async_mock_refresh()
 
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic="projects/sdm-prod/topics/enterprise-new-project-id"
-    )
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
 
     data = dict(entry.data)
     assert "token" in data
     data["token"].pop("expires_in")
     data["token"].pop("expires_at")
+    assert "subscriber_id" in data
+    assert "projects/new-cloud-project-id/subscriptions" in data["subscriber_id"]
+    data.pop("subscriber_id")
     assert data == {
         "sdm": {},
         "auth_implementation": "imported-cred",
         "cloud_project_id": "new-cloud-project-id",
         "project_id": "new-project-id",
-        "subscription_name": "projects/new-cloud-project-id/subscriptions/home-assistant-ABCDEF",
-        "topic_name": "projects/sdm-prod/topics/enterprise-new-project-id",
         "token": {
             "refresh_token": "mock-refresh-token",
             "access_token": "mock-access-token",
@@ -445,7 +294,6 @@ async def test_config_flow_restart(
     }
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_config_flow_wrong_project_id(
     hass: HomeAssistant, oauth, subscriber, setup_platform
 ) -> None:
@@ -476,22 +324,20 @@ async def test_config_flow_wrong_project_id(
     await hass.async_block_till_done()
     oauth.async_mock_refresh()
 
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic="projects/sdm-prod/topics/enterprise-some-project-id"
-    )
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
 
     data = dict(entry.data)
     assert "token" in data
     data["token"].pop("expires_in")
     data["token"].pop("expires_at")
+    assert "subscriber_id" in data
+    assert f"projects/{CLOUD_PROJECT_ID}/subscriptions" in data["subscriber_id"]
+    data.pop("subscriber_id")
     assert data == {
         "sdm": {},
         "auth_implementation": "imported-cred",
         "cloud_project_id": CLOUD_PROJECT_ID,
         "project_id": PROJECT_ID,
-        "subscription_name": "projects/cloud-id-9876/subscriptions/home-assistant-ABCDEF",
-        "topic_name": "projects/sdm-prod/topics/enterprise-some-project-id",
         "token": {
             "refresh_token": "mock-refresh-token",
             "access_token": "mock-access-token",
@@ -500,9 +346,6 @@ async def test_config_flow_wrong_project_id(
     }
 
 
-@pytest.mark.parametrize(
-    ("sdm_managed_topic", "create_subscription_status"), [(True, HTTPStatus.NOT_FOUND)]
-)
 async def test_config_flow_pubsub_configuration_error(
     hass: HomeAssistant,
     oauth,
@@ -518,41 +361,14 @@ async def test_config_flow_pubsub_configuration_error(
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
 
+    mock_subscriber.create_subscription.side_effect = ConfigurationException
     result = await oauth.async_configure(result, {"code": "1234"})
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_topic"
-    assert result.get("data_schema")({}) == {
-        "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
-    }
-
-    # Select Pub/Sub topic the show available subscriptions (none)
-    result = await oauth.async_configure(
-        result,
-        {
-            "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
-        },
-    )
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_subscription"
-    assert result.get("data_schema")({}) == {
-        "subscription_name": "create_new_subscription",
-    }
-
-    # Failure when creating the subscription
-    result = await oauth.async_configure(
-        result,
-        {
-            "subscription_name": "create_new_subscription",
-        },
-    )
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("errors") == {"base": "pubsub_api_error"}
+    assert result["type"] is FlowResultType.FORM
+    assert "errors" in result
+    assert "cloud_project_id" in result["errors"]
+    assert result["errors"]["cloud_project_id"] == "bad_project_id"
 
 
-@pytest.mark.parametrize(
-    ("sdm_managed_topic", "create_subscription_status"),
-    [(True, HTTPStatus.INTERNAL_SERVER_ERROR)],
-)
 async def test_config_flow_pubsub_subscriber_error(
     hass: HomeAssistant, oauth, setup_platform, mock_subscriber
 ) -> None:
@@ -564,42 +380,17 @@ async def test_config_flow_pubsub_subscriber_error(
     )
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
+
+    mock_subscriber.create_subscription.side_effect = SubscriberException()
     result = await oauth.async_configure(result, {"code": "1234"})
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_topic"
-    assert result.get("data_schema")({}) == {
-        "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
-    }
 
-    # Select Pub/Sub topic the show available subscriptions (none)
-    result = await oauth.async_configure(
-        result,
-        {
-            "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
-        },
-    )
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_subscription"
-    assert result.get("data_schema")({}) == {
-        "subscription_name": "create_new_subscription",
-    }
-
-    # Failure when creating the subscription
-    result = await oauth.async_configure(
-        result,
-        {
-            "subscription_name": "create_new_subscription",
-        },
-    )
-
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("errors") == {"base": "pubsub_api_error"}
+    assert result["type"] is FlowResultType.FORM
+    assert "errors" in result
+    assert "cloud_project_id" in result["errors"]
+    assert result["errors"]["cloud_project_id"] == "subscriber_error"
 
 
-@pytest.mark.parametrize(
-    ("nest_test_config", "sdm_managed_topic", "device_access_project_id"),
-    [(TEST_CONFIG_APP_CREDS, True, "project-id-2")],
-)
+@pytest.mark.parametrize("nest_test_config", [TEST_CONFIG_APP_CREDS])
 async def test_multiple_config_entries(
     hass: HomeAssistant, oauth, setup_platform
 ) -> None:
@@ -614,10 +405,7 @@ async def test_multiple_config_entries(
     )
     await oauth.async_app_creds_flow(result, project_id="project-id-2")
     oauth.async_mock_refresh()
-    result = await oauth.async_configure(result, user_input={})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic="projects/sdm-prod/topics/enterprise-project-id-2"
-    )
+    entry = await oauth.async_finish_setup(result)
     assert entry.title == "Mock Title"
     assert "token" in entry.data
 
@@ -625,9 +413,7 @@ async def test_multiple_config_entries(
     assert len(entries) == 2
 
 
-@pytest.mark.parametrize(
-    ("nest_test_config", "sdm_managed_topic"), [(TEST_CONFIG_APP_CREDS, True)]
-)
+@pytest.mark.parametrize("nest_test_config", [TEST_CONFIG_APP_CREDS])
 async def test_duplicate_config_entries(
     hass: HomeAssistant, oauth, setup_platform
 ) -> None:
@@ -652,9 +438,7 @@ async def test_duplicate_config_entries(
     assert result.get("reason") == "already_configured"
 
 
-@pytest.mark.parametrize(
-    ("nest_test_config", "sdm_managed_topic"), [(TEST_CONFIG_APP_CREDS, True)]
-)
+@pytest.mark.parametrize("nest_test_config", [TEST_CONFIG_APP_CREDS])
 async def test_reauth_multiple_config_entries(
     hass: HomeAssistant, oauth, setup_platform, config_entry
 ) -> None:
@@ -705,7 +489,6 @@ async def test_reauth_multiple_config_entries(
     assert entry.data.get("extra_data")
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_pubsub_subscription_strip_whitespace(
     hass: HomeAssistant, oauth, subscriber, setup_platform
 ) -> None:
@@ -719,10 +502,8 @@ async def test_pubsub_subscription_strip_whitespace(
         result, cloud_project_id=" " + CLOUD_PROJECT_ID + " "
     )
     oauth.async_mock_refresh()
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic="projects/sdm-prod/topics/enterprise-some-project-id"
-    )
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
+
     assert entry.title == "Import from configuration.yaml"
     assert "token" in entry.data
     entry.data["token"].pop("expires_at")
@@ -733,14 +514,10 @@ async def test_pubsub_subscription_strip_whitespace(
         "type": "Bearer",
         "expires_in": 60,
     }
-    assert "subscription_name" in entry.data
+    assert "subscriber_id" in entry.data
     assert entry.data["cloud_project_id"] == CLOUD_PROJECT_ID
 
 
-@pytest.mark.parametrize(
-    ("sdm_managed_topic", "create_subscription_status"),
-    [(True, HTTPStatus.UNAUTHORIZED)],
-)
 async def test_pubsub_subscription_auth_failure(
     hass: HomeAssistant, oauth, setup_platform, mock_subscriber
 ) -> None:
@@ -751,43 +528,17 @@ async def test_pubsub_subscription_auth_failure(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
+    mock_subscriber.create_subscription.side_effect = AuthException()
+
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
     result = await oauth.async_configure(result, {"code": "1234"})
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_topic"
-    assert result.get("data_schema")({}) == {
-        "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
-    }
 
-    # Select Pub/Sub topic the show available subscriptions (none)
-    result = await oauth.async_configure(
-        result,
-        {
-            "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
-        },
-    )
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_subscription"
-    assert result.get("data_schema")({}) == {
-        "subscription_name": "create_new_subscription",
-    }
-
-    # Failure when creating the subscription
-    result = await oauth.async_configure(
-        result,
-        {
-            "subscription_name": "create_new_subscription",
-        },
-    )
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_subscription"
-    assert result.get("errors") == {"base": "pubsub_api_error"}
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "invalid_access_token"
 
 
-@pytest.mark.parametrize(
-    ("nest_test_config", "sdm_managed_topic"), [(TEST_CONFIG_APP_CREDS, True)]
-)
+@pytest.mark.parametrize("nest_test_config", [TEST_CONFIG_APP_CREDS])
 async def test_pubsub_subscriber_config_entry_reauth(
     hass: HomeAssistant,
     oauth,
@@ -817,7 +568,6 @@ async def test_pubsub_subscriber_config_entry_reauth(
     assert entry.data["cloud_project_id"] == CLOUD_PROJECT_ID
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_config_entry_title_from_home(
     hass: HomeAssistant, oauth, setup_platform, subscriber
 ) -> None:
@@ -845,24 +595,13 @@ async def test_config_entry_title_from_home(
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
 
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic=f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
     assert entry.title == "Example Home"
     assert "token" in entry.data
-    assert entry.data.get("cloud_project_id") == CLOUD_PROJECT_ID
-    assert (
-        entry.data.get("subscription_name")
-        == f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}"
-    )
-    assert (
-        entry.data.get("topic_name")
-        == f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
+    assert "subscriber_id" in entry.data
+    assert entry.data["cloud_project_id"] == CLOUD_PROJECT_ID
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_config_entry_title_multiple_homes(
     hass: HomeAssistant, oauth, setup_platform, subscriber
 ) -> None:
@@ -902,14 +641,10 @@ async def test_config_entry_title_multiple_homes(
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
 
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic=f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
     assert entry.title == "Example Home #1, Example Home #2"
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_title_failure_fallback(
     hass: HomeAssistant, oauth, setup_platform, mock_subscriber
 ) -> None:
@@ -923,26 +658,13 @@ async def test_title_failure_fallback(
     oauth.async_mock_refresh()
 
     mock_subscriber.async_get_device_manager.side_effect = AuthException()
-
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic=f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
-
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
     assert entry.title == "Import from configuration.yaml"
     assert "token" in entry.data
-    assert entry.data.get("cloud_project_id") == CLOUD_PROJECT_ID
-    assert (
-        entry.data.get("subscription_name")
-        == f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}"
-    )
-    assert (
-        entry.data.get("topic_name")
-        == f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
+    assert "subscriber_id" in entry.data
+    assert entry.data["cloud_project_id"] == CLOUD_PROJECT_ID
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_structure_missing_trait(
     hass: HomeAssistant, oauth, setup_platform, subscriber
 ) -> None:
@@ -967,10 +689,7 @@ async def test_structure_missing_trait(
     await oauth.async_app_creds_flow(result)
     oauth.async_mock_refresh()
 
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic=f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
     # Fallback to default name
     assert entry.title == "Import from configuration.yaml"
 
@@ -994,7 +713,6 @@ async def test_dhcp_discovery(
     assert result.get("reason") == "missing_credentials"
 
 
-@pytest.mark.parametrize(("sdm_managed_topic"), [(True)])
 async def test_dhcp_discovery_with_creds(
     hass: HomeAssistant, oauth, subscriber, setup_platform
 ) -> None:
@@ -1017,23 +735,21 @@ async def test_dhcp_discovery_with_creds(
     result = await oauth.async_configure(result, {"project_id": PROJECT_ID})
     await oauth.async_oauth_web_flow(result)
     oauth.async_mock_refresh()
-
-    result = await oauth.async_configure(result, {"code": "1234"})
-    entry = await oauth.async_complete_pubsub_flow(
-        result, selected_topic=f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}"
-    )
+    entry = await oauth.async_finish_setup(result, {"code": "1234"})
+    await hass.async_block_till_done()
 
     data = dict(entry.data)
     assert "token" in data
     data["token"].pop("expires_in")
     data["token"].pop("expires_at")
+    assert "subscriber_id" in data
+    assert f"projects/{CLOUD_PROJECT_ID}/subscriptions" in data["subscriber_id"]
+    data.pop("subscriber_id")
     assert data == {
         "sdm": {},
         "auth_implementation": "imported-cred",
         "cloud_project_id": CLOUD_PROJECT_ID,
         "project_id": PROJECT_ID,
-        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/home-assistant-{RAND_SUBSCRIBER_SUFFIX}",
-        "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
         "token": {
             "refresh_token": "mock-refresh-token",
             "access_token": "mock-access-token",
@@ -1073,133 +789,3 @@ async def test_token_error(
     result = await oauth.async_configure(result, user_input=None)
     assert result.get("type") is FlowResultType.ABORT
     assert result.get("reason") == error_reason
-
-
-@pytest.mark.parametrize(
-    ("user_managed_topics", "subscriptions"),
-    [
-        (
-            [f"projects/{CLOUD_PROJECT_ID}/topics/some-topic-id"],
-            [
-                (
-                    f"projects/{CLOUD_PROJECT_ID}/subscriptions/some-subscription-id",
-                    f"projects/{CLOUD_PROJECT_ID}/topics/some-topic-id",
-                )
-            ],
-        )
-    ],
-)
-async def test_existing_topic_and_subscription(
-    hass: HomeAssistant, oauth, subscriber, setup_platform
-) -> None:
-    """Test selecting existing user managed topic and subscription."""
-    await setup_platform()
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    await oauth.async_app_creds_flow(result)
-    oauth.async_mock_refresh()
-
-    result = await oauth.async_configure(result, None)
-    entry = await oauth.async_complete_pubsub_flow(
-        result,
-        selected_topic=f"projects/{CLOUD_PROJECT_ID}/topics/some-topic-id",
-        selected_subscription=f"projects/{CLOUD_PROJECT_ID}/subscriptions/some-subscription-id",
-    )
-
-    data = dict(entry.data)
-    assert "token" in data
-    data["token"].pop("expires_in")
-    data["token"].pop("expires_at")
-    assert data == {
-        "sdm": {},
-        "auth_implementation": "imported-cred",
-        "cloud_project_id": CLOUD_PROJECT_ID,
-        "project_id": PROJECT_ID,
-        "subscription_name": f"projects/{CLOUD_PROJECT_ID}/subscriptions/some-subscription-id",
-        "subscriber_id_imported": True,
-        "topic_name": f"projects/{CLOUD_PROJECT_ID}/topics/some-topic-id",
-        "token": {
-            "refresh_token": "mock-refresh-token",
-            "access_token": "mock-access-token",
-            "type": "Bearer",
-        },
-    }
-
-
-async def test_no_eligible_topics(
-    hass: HomeAssistant, oauth, subscriber, setup_platform
-) -> None:
-    """Test the case where there are no eligible pub/sub topics."""
-    await setup_platform()
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    await oauth.async_app_creds_flow(result)
-    oauth.async_mock_refresh()
-
-    result = await oauth.async_configure(result, None)
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub"
-    assert result.get("errors") == {"base": "no_pubsub_topics"}
-
-
-@pytest.mark.parametrize(
-    ("list_topics_status"),
-    [
-        (HTTPStatus.INTERNAL_SERVER_ERROR),
-    ],
-)
-async def test_list_topics_failure(
-    hass: HomeAssistant, oauth, subscriber, setup_platform
-) -> None:
-    """Test selecting existing user managed topic and subscription."""
-    await setup_platform()
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    await oauth.async_app_creds_flow(result)
-    oauth.async_mock_refresh()
-
-    result = await oauth.async_configure(result, None)
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub"
-    assert result.get("errors") == {"base": "pubsub_api_error"}
-
-
-@pytest.mark.parametrize(
-    ("sdm_managed_topic", "list_subscriptions_status"),
-    [
-        (True, HTTPStatus.INTERNAL_SERVER_ERROR),
-    ],
-)
-async def test_list_subscriptions_failure(
-    hass: HomeAssistant, oauth, subscriber, setup_platform
-) -> None:
-    """Test selecting existing user managed topic and subscription."""
-    await setup_platform()
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    await oauth.async_app_creds_flow(result)
-    oauth.async_mock_refresh()
-
-    result = await oauth.async_configure(result, None)
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_topic"
-    assert not result.get("errors")
-
-    # Select Pub/Sub topic the show available subscriptions (none)
-    result = await oauth.async_configure(
-        result,
-        {
-            "topic_name": f"projects/sdm-prod/topics/enterprise-{PROJECT_ID}",
-        },
-    )
-    assert result.get("type") is FlowResultType.FORM
-    assert result.get("step_id") == "pubsub_subscription"
-    assert result.get("errors") == {"base": "pubsub_api_error"}
diff --git a/tests/components/nest/test_init.py b/tests/components/nest/test_init.py
index a17803a6cde..f3226c936fb 100644
--- a/tests/components/nest/test_init.py
+++ b/tests/components/nest/test_init.py
@@ -31,7 +31,6 @@ from .common import (
     SUBSCRIBER_ID,
     TEST_CONFIG_ENTRY_LEGACY,
     TEST_CONFIG_LEGACY,
-    TEST_CONFIG_NEW_SUBSCRIPTION,
     TEST_CONFIGFLOW_APP_CREDS,
     FakeSubscriber,
     PlatformSetup,
@@ -98,19 +97,6 @@ async def test_setup_success(
     assert entries[0].state is ConfigEntryState.LOADED
 
 
-@pytest.mark.parametrize("nest_test_config", [(TEST_CONFIG_NEW_SUBSCRIPTION)])
-async def test_setup_success_new_subscription_format(
-    hass: HomeAssistant, error_caplog: pytest.LogCaptureFixture, setup_platform
-) -> None:
-    """Test successful setup."""
-    await setup_platform()
-    assert not error_caplog.records
-
-    entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(entries) == 1
-    assert entries[0].state is ConfigEntryState.LOADED
-
-
 @pytest.mark.parametrize("subscriber_id", [("invalid-subscriber-format")])
 async def test_setup_configuration_failure(
     hass: HomeAssistant,
@@ -185,6 +171,19 @@ async def test_subscriber_auth_failure(
     assert flows[0]["step_id"] == "reauth_confirm"
 
 
+@pytest.mark.parametrize("subscriber_id", [(None)])
+async def test_setup_missing_subscriber_id(
+    hass: HomeAssistant, warning_caplog: pytest.LogCaptureFixture, setup_base_platform
+) -> None:
+    """Test missing subscriber id from configuration."""
+    await setup_base_platform()
+    assert "Configuration option" in warning_caplog.text
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.SETUP_ERROR
+
+
 @pytest.mark.parametrize("subscriber_side_effect", [(ConfigurationException())])
 async def test_subscriber_configuration_failure(
     hass: HomeAssistant,
diff --git a/tests/components/nest/test_media_source.py b/tests/components/nest/test_media_source.py
index 2526bfdf975..101bfae089d 100644
--- a/tests/components/nest/test_media_source.py
+++ b/tests/components/nest/test_media_source.py
@@ -48,9 +48,6 @@ CAMERA_TRAITS = {
         "customName": DEVICE_NAME,
     },
     "sdm.devices.traits.CameraImage": {},
-    "sdm.devices.traits.CameraLiveStream": {
-        "supportedProtocols": ["RTSP"],
-    },
     "sdm.devices.traits.CameraEventImage": {},
     "sdm.devices.traits.CameraPerson": {},
     "sdm.devices.traits.CameraMotion": {},
@@ -60,9 +57,7 @@ BATTERY_CAMERA_TRAITS = {
         "customName": DEVICE_NAME,
     },
     "sdm.devices.traits.CameraClipPreview": {},
-    "sdm.devices.traits.CameraLiveStream": {
-        "supportedProtocols": ["WEB_RTC"],
-    },
+    "sdm.devices.traits.CameraLiveStream": {},
     "sdm.devices.traits.CameraPerson": {},
     "sdm.devices.traits.CameraMotion": {},
 }
diff --git a/tests/components/network/test_init.py b/tests/components/network/test_init.py
index dca31106dba..57a12868d0a 100644
--- a/tests/components/network/test_init.py
+++ b/tests/components/network/test_init.py
@@ -886,42 +886,3 @@ async def test_async_get_announce_addresses_no_source_ip(hass: HomeAssistant) ->
         "172.16.1.5",
         "fe80::dead:beef:dead:beef",
     ]
-
-
-async def test_websocket_network_url(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
-) -> None:
-    """Test the network/url websocket command."""
-    assert await async_setup_component(hass, "network", {})
-
-    client = await hass_ws_client(hass)
-
-    with (
-        patch(
-            "homeassistant.helpers.network._get_internal_url", return_value="internal"
-        ),
-        patch("homeassistant.helpers.network._get_cloud_url", return_value="cloud"),
-    ):
-        await client.send_json({"id": 1, "type": "network/url"})
-        msg = await client.receive_json()
-        assert msg["success"]
-        assert msg["result"] == {
-            "internal": "internal",
-            "external": "cloud",
-            "cloud": "cloud",
-        }
-
-    # Test with no cloud URL
-    with (
-        patch(
-            "homeassistant.helpers.network._get_internal_url", return_value="internal"
-        ),
-    ):
-        await client.send_json({"id": 2, "type": "network/url"})
-        msg = await client.receive_json()
-        assert msg["success"]
-        assert msg["result"] == {
-            "internal": "internal",
-            "external": None,
-            "cloud": None,
-        }
diff --git a/tests/components/nextcloud/snapshots/test_update.ambr b/tests/components/nextcloud/snapshots/test_update.ambr
index 484106580b1..be94339b41a 100644
--- a/tests/components/nextcloud/snapshots/test_update.ambr
+++ b/tests/components/nextcloud/snapshots/test_update.ambr
@@ -36,7 +36,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'auto_update': False,
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/nextcloud/icon.png',
       'friendly_name': 'my.nc_url.local None',
       'in_progress': False,
diff --git a/tests/components/nice_go/conftest.py b/tests/components/nice_go/conftest.py
index cf85cd7e092..9ed3d0d19cf 100644
--- a/tests/components/nice_go/conftest.py
+++ b/tests/components/nice_go/conftest.py
@@ -52,9 +52,7 @@ def mock_nice_go() -> Generator[AsyncMock]:
                 attr=barrier["attr"],
                 state=BarrierState(
                     **barrier["state"],
-                    connectionState=ConnectionState(**barrier["connectionState"])
-                    if barrier.get("connectionState")
-                    else None,
+                    connectionState=ConnectionState(**barrier["connectionState"]),
                 ),
                 api=client,
             )
diff --git a/tests/components/nice_go/fixtures/get_all_barriers.json b/tests/components/nice_go/fixtures/get_all_barriers.json
index 84799e0dd32..0597f0038dc 100644
--- a/tests/components/nice_go/fixtures/get_all_barriers.json
+++ b/tests/components/nice_go/fixtures/get_all_barriers.json
@@ -63,7 +63,7 @@
   },
   {
     "id": "3",
-    "type": "Mms100",
+    "type": "WallStation",
     "controlLevel": "Owner",
     "attr": [
       {
@@ -79,42 +79,16 @@
         "autoDisabled": false,
         "migrationStatus": "DONE",
         "deviceId": "3",
+        "vcnMode": false,
         "deviceFwVersion": "1.2.3.4.5.6",
-        "barrierStatus": "1,100,0,0,1,0,0,0",
-        "radioConnected": 1,
-        "powerLevel": "LOW"
+        "barrierStatus": "2,100,0,0,-1,0,3,0"
       },
       "timestamp": null,
       "version": null
     },
-    "connectionState": null
-  },
-  {
-    "id": "4",
-    "type": "unknown-device-type",
-    "controlLevel": "Owner",
-    "attr": [
-      {
-        "key": "organization",
-        "value": "test_organization"
-      }
-    ],
-    "state": {
-      "deviceId": "4",
-      "desired": { "key": "value" },
-      "reported": {
-        "displayName": "Test Garage 4",
-        "autoDisabled": false,
-        "migrationStatus": "DONE",
-        "deviceId": "4",
-        "deviceFwVersion": "1.2.3.4.5.6",
-        "barrierStatus": "1,100,0,0,1,0,0,0",
-        "radioConnected": 1,
-        "powerLevel": "LOW"
-      },
-      "timestamp": null,
-      "version": null
-    },
-    "connectionState": null
+    "connectionState": {
+      "connected": true,
+      "updatedTimestamp": "123"
+    }
   }
 ]
diff --git a/tests/components/nice_go/snapshots/test_cover.ambr b/tests/components/nice_go/snapshots/test_cover.ambr
index 49b5267df56..1633193853d 100644
--- a/tests/components/nice_go/snapshots/test_cover.ambr
+++ b/tests/components/nice_go/snapshots/test_cover.ambr
@@ -117,7 +117,7 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': <CoverDeviceClass.GATE: 'gate'>,
+    'original_device_class': <CoverDeviceClass.GARAGE: 'garage'>,
     'original_icon': None,
     'original_name': None,
     'platform': 'nice_go',
@@ -131,7 +131,7 @@
 # name: test_covers[cover.test_garage_3-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'device_class': 'gate',
+      'device_class': 'garage',
       'friendly_name': 'Test Garage 3',
       'supported_features': <CoverEntityFeature: 3>,
     }),
@@ -140,54 +140,6 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'open',
-  })
-# ---
-# name: test_covers[cover.test_garage_4-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'cover',
-    'entity_category': None,
-    'entity_id': 'cover.test_garage_4',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <CoverDeviceClass.GARAGE: 'garage'>,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'nice_go',
-    'previous_unique_id': None,
-    'supported_features': <CoverEntityFeature: 3>,
-    'translation_key': None,
-    'unique_id': '4',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_covers[cover.test_garage_4-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'garage',
-      'friendly_name': 'Test Garage 4',
-      'supported_features': <CoverEntityFeature: 3>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'cover.test_garage_4',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'open',
+    'state': 'closed',
   })
 # ---
diff --git a/tests/components/nice_go/snapshots/test_diagnostics.ambr b/tests/components/nice_go/snapshots/test_diagnostics.ambr
index f4ba363a421..be67643c5b7 100644
--- a/tests/components/nice_go/snapshots/test_diagnostics.ambr
+++ b/tests/components/nice_go/snapshots/test_diagnostics.ambr
@@ -9,7 +9,6 @@
         'id': '1',
         'light_status': True,
         'name': 'Test Garage 1',
-        'type': 'WallStation',
         'vacation_mode': False,
       }),
       '2': dict({
@@ -19,28 +18,16 @@
         'id': '2',
         'light_status': False,
         'name': 'Test Garage 2',
-        'type': 'WallStation',
         'vacation_mode': True,
       }),
       '3': dict({
-        'barrier_status': 'open',
+        'barrier_status': 'closed',
         'connected': True,
         'fw_version': '1.2.3.4.5.6',
         'id': '3',
         'light_status': None,
         'name': 'Test Garage 3',
-        'type': 'Mms100',
-        'vacation_mode': None,
-      }),
-      '4': dict({
-        'barrier_status': 'open',
-        'connected': True,
-        'fw_version': '1.2.3.4.5.6',
-        'id': '4',
-        'light_status': None,
-        'name': 'Test Garage 4',
-        'type': 'unknown-device-type',
-        'vacation_mode': None,
+        'vacation_mode': False,
       }),
     }),
     'entry': dict({
diff --git a/tests/components/nice_go/test_init.py b/tests/components/nice_go/test_init.py
index 4eb3851516e..23d496df238 100644
--- a/tests/components/nice_go/test_init.py
+++ b/tests/components/nice_go/test_init.py
@@ -347,7 +347,7 @@ async def test_no_connection_state(
         }
     )
 
-    assert hass.states.get("cover.test_garage_1").state == "open"
+    assert hass.states.get("cover.test_garage_1").state == "unavailable"
 
 
 async def test_connection_attempts_exhausted(
diff --git a/tests/components/nice_go/test_light.py b/tests/components/nice_go/test_light.py
index b170a0ee3ab..f7aa015c3bd 100644
--- a/tests/components/nice_go/test_light.py
+++ b/tests/components/nice_go/test_light.py
@@ -134,29 +134,3 @@ async def test_error(
             {ATTR_ENTITY_ID: entity_id},
             blocking=True,
         )
-
-
-async def test_unsupported_device_type(
-    hass: HomeAssistant,
-    mock_nice_go: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test that unsupported device types are handled appropriately."""
-
-    await setup_integration(hass, mock_config_entry, [Platform.LIGHT])
-
-    assert hass.states.get("light.test_garage_4_light") is None
-    assert (
-        "Device 'Test Garage 4' has unknown device type 'unknown-device-type'"
-        in caplog.text
-    )
-    assert "which is not supported by this integration" in caplog.text
-    assert (
-        "We try to support it with a cover and event entity, but nothing else."
-        in caplog.text
-    )
-    assert (
-        "Please create an issue with your device model in additional info"
-        in caplog.text
-    )
diff --git a/tests/components/nina/test_config_flow.py b/tests/components/nina/test_config_flow.py
index 309c8860c20..cd0904b181d 100644
--- a/tests/components/nina/test_config_flow.py
+++ b/tests/components/nina/test_config_flow.py
@@ -8,6 +8,7 @@ from typing import Any
 from unittest.mock import patch
 
 from pynina import ApiError
+import pytest
 
 from homeassistant.components.nina.const import (
     CONF_AREA_FILTER,
@@ -278,6 +279,10 @@ async def test_options_flow_connection_error(hass: HomeAssistant) -> None:
         assert result["errors"] == {"base": "cannot_connect"}
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.nina.options.error.unknown"],
+)
 async def test_options_flow_unexpected_exception(hass: HomeAssistant) -> None:
     """Test config flow options but with an unexpected exception."""
     config_entry = MockConfigEntry(
diff --git a/tests/components/nordpool/__init__.py b/tests/components/nordpool/__init__.py
deleted file mode 100644
index 20d74d38486..00000000000
--- a/tests/components/nordpool/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""Tests for the Nord Pool integration."""
-
-from homeassistant.components.nordpool.const import CONF_AREAS
-from homeassistant.const import CONF_CURRENCY
-
-ENTRY_CONFIG = {
-    CONF_AREAS: ["SE3", "SE4"],
-    CONF_CURRENCY: "SEK",
-}
diff --git a/tests/components/nordpool/conftest.py b/tests/components/nordpool/conftest.py
deleted file mode 100644
index d1c1972c568..00000000000
--- a/tests/components/nordpool/conftest.py
+++ /dev/null
@@ -1,75 +0,0 @@
-"""Fixtures for the Nord Pool integration."""
-
-from __future__ import annotations
-
-from datetime import datetime
-import json
-from typing import Any
-from unittest.mock import patch
-
-from pynordpool import NordPoolClient
-from pynordpool.const import Currency
-from pynordpool.model import DeliveryPeriodData
-import pytest
-
-from homeassistant.components.nordpool.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER
-from homeassistant.core import HomeAssistant
-from homeassistant.util import dt as dt_util
-
-from . import ENTRY_CONFIG
-
-from tests.common import MockConfigEntry, load_fixture
-from tests.test_util.aiohttp import AiohttpClientMocker
-
-
-@pytest.fixture
-async def load_int(
-    hass: HomeAssistant, get_data: DeliveryPeriodData
-) -> MockConfigEntry:
-    """Set up the Nord Pool integration in Home Assistant."""
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        source=SOURCE_USER,
-        data=ENTRY_CONFIG,
-    )
-
-    config_entry.add_to_hass(hass)
-
-    with (
-        patch(
-            "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-            return_value=get_data,
-        ),
-    ):
-        await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    return config_entry
-
-
-@pytest.fixture(name="get_data")
-async def get_data_from_library(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, load_json: dict[str, Any]
-) -> DeliveryPeriodData:
-    """Retrieve data from Nord Pool library."""
-
-    client = NordPoolClient(aioclient_mock.create_session(hass.loop))
-    with patch("pynordpool.NordPoolClient._get", return_value=load_json):
-        output = await client.async_get_delivery_period(
-            datetime(2024, 11, 5, 13, tzinfo=dt_util.UTC), Currency.SEK, ["SE3", "SE4"]
-        )
-    await client._session.close()
-    return output
-
-
-@pytest.fixture(name="load_json")
-def load_json_from_fixture(load_data: str) -> dict[str, Any]:
-    """Load fixture with json data and return."""
-    return json.loads(load_data)
-
-
-@pytest.fixture(name="load_data", scope="package")
-def load_data_from_fixture() -> str:
-    """Load fixture with fixture data and return."""
-    return load_fixture("delivery_period.json", DOMAIN)
diff --git a/tests/components/nordpool/fixtures/delivery_period.json b/tests/components/nordpool/fixtures/delivery_period.json
deleted file mode 100644
index 77d51dc9433..00000000000
--- a/tests/components/nordpool/fixtures/delivery_period.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-  "deliveryDateCET": "2024-11-05",
-  "version": 3,
-  "updatedAt": "2024-11-04T12:15:03.9456464Z",
-  "deliveryAreas": ["SE3", "SE4"],
-  "market": "DayAhead",
-  "multiAreaEntries": [
-    {
-      "deliveryStart": "2024-11-04T23:00:00Z",
-      "deliveryEnd": "2024-11-05T00:00:00Z",
-      "entryPerArea": {
-        "SE3": 250.73,
-        "SE4": 283.79
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T00:00:00Z",
-      "deliveryEnd": "2024-11-05T01:00:00Z",
-      "entryPerArea": {
-        "SE3": 76.36,
-        "SE4": 81.36
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T01:00:00Z",
-      "deliveryEnd": "2024-11-05T02:00:00Z",
-      "entryPerArea": {
-        "SE3": 73.92,
-        "SE4": 79.15
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T02:00:00Z",
-      "deliveryEnd": "2024-11-05T03:00:00Z",
-      "entryPerArea": {
-        "SE3": 61.69,
-        "SE4": 65.19
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T03:00:00Z",
-      "deliveryEnd": "2024-11-05T04:00:00Z",
-      "entryPerArea": {
-        "SE3": 64.6,
-        "SE4": 68.44
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T04:00:00Z",
-      "deliveryEnd": "2024-11-05T05:00:00Z",
-      "entryPerArea": {
-        "SE3": 453.27,
-        "SE4": 516.71
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T05:00:00Z",
-      "deliveryEnd": "2024-11-05T06:00:00Z",
-      "entryPerArea": {
-        "SE3": 996.28,
-        "SE4": 1240.85
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T06:00:00Z",
-      "deliveryEnd": "2024-11-05T07:00:00Z",
-      "entryPerArea": {
-        "SE3": 1406.14,
-        "SE4": 1648.25
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T07:00:00Z",
-      "deliveryEnd": "2024-11-05T08:00:00Z",
-      "entryPerArea": {
-        "SE3": 1346.54,
-        "SE4": 1570.5
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T08:00:00Z",
-      "deliveryEnd": "2024-11-05T09:00:00Z",
-      "entryPerArea": {
-        "SE3": 1150.28,
-        "SE4": 1345.37
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T09:00:00Z",
-      "deliveryEnd": "2024-11-05T10:00:00Z",
-      "entryPerArea": {
-        "SE3": 1031.32,
-        "SE4": 1206.51
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T10:00:00Z",
-      "deliveryEnd": "2024-11-05T11:00:00Z",
-      "entryPerArea": {
-        "SE3": 927.37,
-        "SE4": 1085.8
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T11:00:00Z",
-      "deliveryEnd": "2024-11-05T12:00:00Z",
-      "entryPerArea": {
-        "SE3": 925.05,
-        "SE4": 1081.72
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T12:00:00Z",
-      "deliveryEnd": "2024-11-05T13:00:00Z",
-      "entryPerArea": {
-        "SE3": 949.49,
-        "SE4": 1130.38
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T13:00:00Z",
-      "deliveryEnd": "2024-11-05T14:00:00Z",
-      "entryPerArea": {
-        "SE3": 1042.03,
-        "SE4": 1256.91
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T14:00:00Z",
-      "deliveryEnd": "2024-11-05T15:00:00Z",
-      "entryPerArea": {
-        "SE3": 1258.89,
-        "SE4": 1765.82
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T15:00:00Z",
-      "deliveryEnd": "2024-11-05T16:00:00Z",
-      "entryPerArea": {
-        "SE3": 1816.45,
-        "SE4": 2522.55
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T16:00:00Z",
-      "deliveryEnd": "2024-11-05T17:00:00Z",
-      "entryPerArea": {
-        "SE3": 2512.65,
-        "SE4": 3533.03
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T17:00:00Z",
-      "deliveryEnd": "2024-11-05T18:00:00Z",
-      "entryPerArea": {
-        "SE3": 1819.83,
-        "SE4": 2524.06
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T18:00:00Z",
-      "deliveryEnd": "2024-11-05T19:00:00Z",
-      "entryPerArea": {
-        "SE3": 1011.77,
-        "SE4": 1804.46
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T19:00:00Z",
-      "deliveryEnd": "2024-11-05T20:00:00Z",
-      "entryPerArea": {
-        "SE3": 835.53,
-        "SE4": 1112.57
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T20:00:00Z",
-      "deliveryEnd": "2024-11-05T21:00:00Z",
-      "entryPerArea": {
-        "SE3": 796.19,
-        "SE4": 1051.69
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T21:00:00Z",
-      "deliveryEnd": "2024-11-05T22:00:00Z",
-      "entryPerArea": {
-        "SE3": 522.3,
-        "SE4": 662.44
-      }
-    },
-    {
-      "deliveryStart": "2024-11-05T22:00:00Z",
-      "deliveryEnd": "2024-11-05T23:00:00Z",
-      "entryPerArea": {
-        "SE3": 289.14,
-        "SE4": 349.21
-      }
-    }
-  ],
-  "blockPriceAggregates": [
-    {
-      "blockName": "Off-peak 1",
-      "deliveryStart": "2024-11-04T23:00:00Z",
-      "deliveryEnd": "2024-11-05T07:00:00Z",
-      "averagePricePerArea": {
-        "SE3": {
-          "average": 422.87,
-          "min": 61.69,
-          "max": 1406.14
-        },
-        "SE4": {
-          "average": 497.97,
-          "min": 65.19,
-          "max": 1648.25
-        }
-      }
-    },
-    {
-      "blockName": "Peak",
-      "deliveryStart": "2024-11-05T07:00:00Z",
-      "deliveryEnd": "2024-11-05T19:00:00Z",
-      "averagePricePerArea": {
-        "SE3": {
-          "average": 1315.97,
-          "min": 925.05,
-          "max": 2512.65
-        },
-        "SE4": {
-          "average": 1735.59,
-          "min": 1081.72,
-          "max": 3533.03
-        }
-      }
-    },
-    {
-      "blockName": "Off-peak 2",
-      "deliveryStart": "2024-11-05T19:00:00Z",
-      "deliveryEnd": "2024-11-05T23:00:00Z",
-      "averagePricePerArea": {
-        "SE3": {
-          "average": 610.79,
-          "min": 289.14,
-          "max": 835.53
-        },
-        "SE4": {
-          "average": 793.98,
-          "min": 349.21,
-          "max": 1112.57
-        }
-      }
-    }
-  ],
-  "currency": "SEK",
-  "exchangeRate": 11.6402,
-  "areaStates": [
-    {
-      "state": "Final",
-      "areas": ["SE3", "SE4"]
-    }
-  ],
-  "areaAverages": [
-    {
-      "areaCode": "SE3",
-      "price": 900.74
-    },
-    {
-      "areaCode": "SE4",
-      "price": 1166.12
-    }
-  ]
-}
diff --git a/tests/components/nordpool/snapshots/test_diagnostics.ambr b/tests/components/nordpool/snapshots/test_diagnostics.ambr
deleted file mode 100644
index dde2eca0022..00000000000
--- a/tests/components/nordpool/snapshots/test_diagnostics.ambr
+++ /dev/null
@@ -1,283 +0,0 @@
-# serializer version: 1
-# name: test_diagnostics
-  dict({
-    'raw': dict({
-      'areaAverages': list([
-        dict({
-          'areaCode': 'SE3',
-          'price': 900.74,
-        }),
-        dict({
-          'areaCode': 'SE4',
-          'price': 1166.12,
-        }),
-      ]),
-      'areaStates': list([
-        dict({
-          'areas': list([
-            'SE3',
-            'SE4',
-          ]),
-          'state': 'Final',
-        }),
-      ]),
-      'blockPriceAggregates': list([
-        dict({
-          'averagePricePerArea': dict({
-            'SE3': dict({
-              'average': 422.87,
-              'max': 1406.14,
-              'min': 61.69,
-            }),
-            'SE4': dict({
-              'average': 497.97,
-              'max': 1648.25,
-              'min': 65.19,
-            }),
-          }),
-          'blockName': 'Off-peak 1',
-          'deliveryEnd': '2024-11-05T07:00:00Z',
-          'deliveryStart': '2024-11-04T23:00:00Z',
-        }),
-        dict({
-          'averagePricePerArea': dict({
-            'SE3': dict({
-              'average': 1315.97,
-              'max': 2512.65,
-              'min': 925.05,
-            }),
-            'SE4': dict({
-              'average': 1735.59,
-              'max': 3533.03,
-              'min': 1081.72,
-            }),
-          }),
-          'blockName': 'Peak',
-          'deliveryEnd': '2024-11-05T19:00:00Z',
-          'deliveryStart': '2024-11-05T07:00:00Z',
-        }),
-        dict({
-          'averagePricePerArea': dict({
-            'SE3': dict({
-              'average': 610.79,
-              'max': 835.53,
-              'min': 289.14,
-            }),
-            'SE4': dict({
-              'average': 793.98,
-              'max': 1112.57,
-              'min': 349.21,
-            }),
-          }),
-          'blockName': 'Off-peak 2',
-          'deliveryEnd': '2024-11-05T23:00:00Z',
-          'deliveryStart': '2024-11-05T19:00:00Z',
-        }),
-      ]),
-      'currency': 'SEK',
-      'deliveryAreas': list([
-        'SE3',
-        'SE4',
-      ]),
-      'deliveryDateCET': '2024-11-05',
-      'exchangeRate': 11.6402,
-      'market': 'DayAhead',
-      'multiAreaEntries': list([
-        dict({
-          'deliveryEnd': '2024-11-05T00:00:00Z',
-          'deliveryStart': '2024-11-04T23:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 250.73,
-            'SE4': 283.79,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T01:00:00Z',
-          'deliveryStart': '2024-11-05T00:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 76.36,
-            'SE4': 81.36,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T02:00:00Z',
-          'deliveryStart': '2024-11-05T01:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 73.92,
-            'SE4': 79.15,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T03:00:00Z',
-          'deliveryStart': '2024-11-05T02:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 61.69,
-            'SE4': 65.19,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T04:00:00Z',
-          'deliveryStart': '2024-11-05T03:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 64.6,
-            'SE4': 68.44,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T05:00:00Z',
-          'deliveryStart': '2024-11-05T04:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 453.27,
-            'SE4': 516.71,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T06:00:00Z',
-          'deliveryStart': '2024-11-05T05:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 996.28,
-            'SE4': 1240.85,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T07:00:00Z',
-          'deliveryStart': '2024-11-05T06:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1406.14,
-            'SE4': 1648.25,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T08:00:00Z',
-          'deliveryStart': '2024-11-05T07:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1346.54,
-            'SE4': 1570.5,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T09:00:00Z',
-          'deliveryStart': '2024-11-05T08:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1150.28,
-            'SE4': 1345.37,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T10:00:00Z',
-          'deliveryStart': '2024-11-05T09:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1031.32,
-            'SE4': 1206.51,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T11:00:00Z',
-          'deliveryStart': '2024-11-05T10:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 927.37,
-            'SE4': 1085.8,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T12:00:00Z',
-          'deliveryStart': '2024-11-05T11:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 925.05,
-            'SE4': 1081.72,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T13:00:00Z',
-          'deliveryStart': '2024-11-05T12:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 949.49,
-            'SE4': 1130.38,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T14:00:00Z',
-          'deliveryStart': '2024-11-05T13:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1042.03,
-            'SE4': 1256.91,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T15:00:00Z',
-          'deliveryStart': '2024-11-05T14:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1258.89,
-            'SE4': 1765.82,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T16:00:00Z',
-          'deliveryStart': '2024-11-05T15:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1816.45,
-            'SE4': 2522.55,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T17:00:00Z',
-          'deliveryStart': '2024-11-05T16:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 2512.65,
-            'SE4': 3533.03,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T18:00:00Z',
-          'deliveryStart': '2024-11-05T17:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1819.83,
-            'SE4': 2524.06,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T19:00:00Z',
-          'deliveryStart': '2024-11-05T18:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 1011.77,
-            'SE4': 1804.46,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T20:00:00Z',
-          'deliveryStart': '2024-11-05T19:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 835.53,
-            'SE4': 1112.57,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T21:00:00Z',
-          'deliveryStart': '2024-11-05T20:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 796.19,
-            'SE4': 1051.69,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T22:00:00Z',
-          'deliveryStart': '2024-11-05T21:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 522.3,
-            'SE4': 662.44,
-          }),
-        }),
-        dict({
-          'deliveryEnd': '2024-11-05T23:00:00Z',
-          'deliveryStart': '2024-11-05T22:00:00Z',
-          'entryPerArea': dict({
-            'SE3': 289.14,
-            'SE4': 349.21,
-          }),
-        }),
-      ]),
-      'updatedAt': '2024-11-04T12:15:03.9456464Z',
-      'version': 3,
-    }),
-  })
-# ---
diff --git a/tests/components/nordpool/snapshots/test_sensor.ambr b/tests/components/nordpool/snapshots/test_sensor.ambr
deleted file mode 100644
index 01600352861..00000000000
--- a/tests/components/nordpool/snapshots/test_sensor.ambr
+++ /dev/null
@@ -1,2215 +0,0 @@
-# serializer version: 1
-# name: test_sensor[sensor.nord_pool_se3_currency-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.nord_pool_se3_currency',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Currency',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'currency',
-    'unique_id': 'SE3-currency',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_currency-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Currency',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_currency',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'SEK',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_current_price-entry]
-  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.nord_pool_se3_current_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Current price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'current_price',
-    'unique_id': 'SE3-current_price',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_current_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Current price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_current_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.01177',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_daily_average-entry]
-  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.nord_pool_se3_daily_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Daily average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'daily_average',
-    'unique_id': 'SE3-daily_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_daily_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Daily average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_daily_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.90074',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_exchange_rate-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.nord_pool_se3_exchange_rate',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Exchange rate',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'exchange_rate',
-    'unique_id': 'SE3-exchange_rate',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_exchange_rate-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Exchange rate',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_exchange_rate',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '11.6402',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_last_updated-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.nord_pool_se3_last_updated',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Last updated',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'updated_at',
-    'unique_id': 'SE3-updated_at',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_last_updated-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE3 Last updated',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_last_updated',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-04T12:15:03+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_next_price-entry]
-  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.nord_pool_se3_next_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Next price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'next_price',
-    'unique_id': 'SE3-next_price',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_next_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Next price',
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_next_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.83553',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_average-entry]
-  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.nord_pool_se3_off_peak_1_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_average',
-    'unique_id': 'off_peak_1-SE3-block_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Off-peak 1 average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_1_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.42287',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_highest_price-entry]
-  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.nord_pool_se3_off_peak_1_highest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 highest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_max',
-    'unique_id': 'off_peak_1-SE3-block_max',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_highest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Off-peak 1 highest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_1_highest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.40614',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_lowest_price-entry]
-  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.nord_pool_se3_off_peak_1_lowest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 lowest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_min',
-    'unique_id': 'off_peak_1-SE3-block_min',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_lowest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Off-peak 1 lowest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_1_lowest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.06169',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_time_from-entry]
-  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.nord_pool_se3_off_peak_1_time_from',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 time from',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_start_time',
-    'unique_id': 'off_peak_1-SE3-block_start_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_time_from-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE3 Off-peak 1 time from',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_1_time_from',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-04T23:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_time_until-entry]
-  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.nord_pool_se3_off_peak_1_time_until',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 time until',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_end_time',
-    'unique_id': 'off_peak_1-SE3-block_end_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_1_time_until-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE3 Off-peak 1 time until',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_1_time_until',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T07:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_average-entry]
-  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.nord_pool_se3_off_peak_2_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_average',
-    'unique_id': 'off_peak_2-SE3-block_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Off-peak 2 average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_2_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.61079',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_highest_price-entry]
-  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.nord_pool_se3_off_peak_2_highest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 highest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_max',
-    'unique_id': 'off_peak_2-SE3-block_max',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_highest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Off-peak 2 highest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_2_highest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.83553',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_lowest_price-entry]
-  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.nord_pool_se3_off_peak_2_lowest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 lowest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_min',
-    'unique_id': 'off_peak_2-SE3-block_min',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_lowest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Off-peak 2 lowest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_2_lowest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.28914',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_time_from-entry]
-  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.nord_pool_se3_off_peak_2_time_from',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 time from',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_start_time',
-    'unique_id': 'off_peak_2-SE3-block_start_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_time_from-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE3 Off-peak 2 time from',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_2_time_from',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T19:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_time_until-entry]
-  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.nord_pool_se3_off_peak_2_time_until',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 time until',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_end_time',
-    'unique_id': 'off_peak_2-SE3-block_end_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_off_peak_2_time_until-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE3 Off-peak 2 time until',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_off_peak_2_time_until',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T23:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_average-entry]
-  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.nord_pool_se3_peak_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Peak average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_average',
-    'unique_id': 'peak-SE3-block_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Peak average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_peak_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.31597',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_highest_price-entry]
-  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.nord_pool_se3_peak_highest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Peak highest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_max',
-    'unique_id': 'peak-SE3-block_max',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_highest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Peak highest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_peak_highest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2.51265',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_lowest_price-entry]
-  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.nord_pool_se3_peak_lowest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Peak lowest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_min',
-    'unique_id': 'peak-SE3-block_min',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_lowest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Peak lowest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_peak_lowest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.92505',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_time_from-entry]
-  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.nord_pool_se3_peak_time_from',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Peak time from',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_start_time',
-    'unique_id': 'peak-SE3-block_start_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_time_from-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE3 Peak time from',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_peak_time_from',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T07:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_time_until-entry]
-  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.nord_pool_se3_peak_time_until',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Peak time until',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_end_time',
-    'unique_id': 'peak-SE3-block_end_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_peak_time_until-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE3 Peak time until',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_peak_time_until',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T19:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_previous_price-entry]
-  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.nord_pool_se3_previous_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Previous price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'last_price',
-    'unique_id': 'SE3-last_price',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se3_previous_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE3 Previous price',
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se3_previous_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.81983',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_currency-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.nord_pool_se4_currency',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Currency',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'currency',
-    'unique_id': 'SE4-currency',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_currency-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Currency',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_currency',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'SEK',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_current_price-entry]
-  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.nord_pool_se4_current_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Current price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'current_price',
-    'unique_id': 'SE4-current_price',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_current_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Current price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_current_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.80446',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_daily_average-entry]
-  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.nord_pool_se4_daily_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Daily average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'daily_average',
-    'unique_id': 'SE4-daily_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_daily_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Daily average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_daily_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.16612',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_exchange_rate-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.nord_pool_se4_exchange_rate',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Exchange rate',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'exchange_rate',
-    'unique_id': 'SE4-exchange_rate',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_exchange_rate-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Exchange rate',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_exchange_rate',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '11.6402',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_last_updated-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.nord_pool_se4_last_updated',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Last updated',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'updated_at',
-    'unique_id': 'SE4-updated_at',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_last_updated-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE4 Last updated',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_last_updated',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-04T12:15:03+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_next_price-entry]
-  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.nord_pool_se4_next_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Next price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'next_price',
-    'unique_id': 'SE4-next_price',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_next_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Next price',
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_next_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.11257',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_average-entry]
-  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.nord_pool_se4_off_peak_1_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_average',
-    'unique_id': 'off_peak_1-SE4-block_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Off-peak 1 average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_1_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.49797',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_highest_price-entry]
-  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.nord_pool_se4_off_peak_1_highest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 highest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_max',
-    'unique_id': 'off_peak_1-SE4-block_max',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_highest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Off-peak 1 highest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_1_highest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.64825',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_lowest_price-entry]
-  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.nord_pool_se4_off_peak_1_lowest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 lowest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_min',
-    'unique_id': 'off_peak_1-SE4-block_min',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_lowest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Off-peak 1 lowest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_1_lowest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.06519',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_time_from-entry]
-  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.nord_pool_se4_off_peak_1_time_from',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 time from',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_start_time',
-    'unique_id': 'off_peak_1-SE4-block_start_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_time_from-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE4 Off-peak 1 time from',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_1_time_from',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-04T23:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_time_until-entry]
-  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.nord_pool_se4_off_peak_1_time_until',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 1 time until',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_end_time',
-    'unique_id': 'off_peak_1-SE4-block_end_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_1_time_until-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE4 Off-peak 1 time until',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_1_time_until',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T07:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_average-entry]
-  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.nord_pool_se4_off_peak_2_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_average',
-    'unique_id': 'off_peak_2-SE4-block_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Off-peak 2 average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_2_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.79398',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_highest_price-entry]
-  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.nord_pool_se4_off_peak_2_highest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 highest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_max',
-    'unique_id': 'off_peak_2-SE4-block_max',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_highest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Off-peak 2 highest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_2_highest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.11257',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_lowest_price-entry]
-  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.nord_pool_se4_off_peak_2_lowest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 lowest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_min',
-    'unique_id': 'off_peak_2-SE4-block_min',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_lowest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Off-peak 2 lowest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_2_lowest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.34921',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_time_from-entry]
-  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.nord_pool_se4_off_peak_2_time_from',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 time from',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_start_time',
-    'unique_id': 'off_peak_2-SE4-block_start_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_time_from-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE4 Off-peak 2 time from',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_2_time_from',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T19:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_time_until-entry]
-  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.nord_pool_se4_off_peak_2_time_until',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Off-peak 2 time until',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_end_time',
-    'unique_id': 'off_peak_2-SE4-block_end_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_off_peak_2_time_until-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE4 Off-peak 2 time until',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_off_peak_2_time_until',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T23:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_average-entry]
-  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.nord_pool_se4_peak_average',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Peak average',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_average',
-    'unique_id': 'peak-SE4-block_average',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_average-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Peak average',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_peak_average',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.73559',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_highest_price-entry]
-  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.nord_pool_se4_peak_highest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Peak highest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_max',
-    'unique_id': 'peak-SE4-block_max',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_highest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Peak highest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_peak_highest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '3.53303',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_lowest_price-entry]
-  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.nord_pool_se4_peak_lowest_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Peak lowest price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_min',
-    'unique_id': 'peak-SE4-block_min',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_lowest_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Peak lowest price',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_peak_lowest_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.08172',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_time_from-entry]
-  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.nord_pool_se4_peak_time_from',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Peak time from',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_start_time',
-    'unique_id': 'peak-SE4-block_start_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_time_from-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE4 Peak time from',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_peak_time_from',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T07:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_time_until-entry]
-  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.nord_pool_se4_peak_time_until',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Peak time until',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'block_end_time',
-    'unique_id': 'peak-SE4-block_end_time',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_peak_time_until-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Nord Pool SE4 Peak time until',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_peak_time_until',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-11-05T19:00:00+00:00',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_previous_price-entry]
-  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.nord_pool_se4_previous_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Previous price',
-    'platform': 'nordpool',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'last_price',
-    'unique_id': 'SE4-last_price',
-    'unit_of_measurement': 'SEK/kWh',
-  })
-# ---
-# name: test_sensor[sensor.nord_pool_se4_previous_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Nord Pool SE4 Previous price',
-      'unit_of_measurement': 'SEK/kWh',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.nord_pool_se4_previous_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2.52406',
-  })
-# ---
diff --git a/tests/components/nordpool/test_config_flow.py b/tests/components/nordpool/test_config_flow.py
deleted file mode 100644
index cfdfc63aca7..00000000000
--- a/tests/components/nordpool/test_config_flow.py
+++ /dev/null
@@ -1,206 +0,0 @@
-"""Test the Nord Pool config flow."""
-
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from pynordpool import (
-    DeliveryPeriodData,
-    NordPoolConnectionError,
-    NordPoolEmptyResponseError,
-    NordPoolError,
-    NordPoolResponseError,
-)
-import pytest
-
-from homeassistant import config_entries
-from homeassistant.components.nordpool.const import CONF_AREAS, DOMAIN
-from homeassistant.const import CONF_CURRENCY
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from . import ENTRY_CONFIG
-
-from tests.common import MockConfigEntry
-
-
-@pytest.mark.freeze_time("2024-11-05T18:00:00+00:00")
-async def test_form(hass: HomeAssistant, get_data: DeliveryPeriodData) -> None:
-    """Test we get the form."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["step_id"] == "user"
-    assert result["type"] is FlowResultType.FORM
-
-    with (
-        patch(
-            "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-            return_value=get_data,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            ENTRY_CONFIG,
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["version"] == 1
-    assert result["title"] == "Nord Pool"
-    assert result["data"] == {"areas": ["SE3", "SE4"], "currency": "SEK"}
-
-
-@pytest.mark.freeze_time("2024-11-05T18:00:00+00:00")
-async def test_single_config_entry(
-    hass: HomeAssistant, load_int: None, get_data: DeliveryPeriodData
-) -> None:
-    """Test abort for single config entry."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "single_instance_allowed"
-
-
-@pytest.mark.freeze_time("2024-11-05T18:00:00+00:00")
-@pytest.mark.parametrize(
-    ("error_message", "p_error"),
-    [
-        (NordPoolConnectionError, "cannot_connect"),
-        (NordPoolEmptyResponseError, "no_data"),
-        (NordPoolError, "cannot_connect"),
-        (NordPoolResponseError, "cannot_connect"),
-    ],
-)
-async def test_cannot_connect(
-    hass: HomeAssistant,
-    get_data: DeliveryPeriodData,
-    error_message: Exception,
-    p_error: str,
-) -> None:
-    """Test cannot connect error."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == config_entries.SOURCE_USER
-
-    with patch(
-        "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-        side_effect=error_message,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=ENTRY_CONFIG,
-        )
-
-    assert result["errors"] == {"base": p_error}
-
-    with patch(
-        "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-        return_value=get_data,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=ENTRY_CONFIG,
-        )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Nord Pool"
-    assert result["data"] == {"areas": ["SE3", "SE4"], "currency": "SEK"}
-
-
-@pytest.mark.freeze_time("2024-11-05T18:00:00+00:00")
-async def test_reconfigure(
-    hass: HomeAssistant,
-    load_int: MockConfigEntry,
-    get_data: DeliveryPeriodData,
-) -> None:
-    """Test reconfiguration."""
-
-    result = await load_int.start_reconfigure_flow(hass)
-
-    with (
-        patch(
-            "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-            return_value=get_data,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_AREAS: ["SE3"],
-                CONF_CURRENCY: "EUR",
-            },
-        )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reconfigure_successful"
-    assert load_int.data == {
-        "areas": [
-            "SE3",
-        ],
-        "currency": "EUR",
-    }
-
-
-@pytest.mark.freeze_time("2024-11-05T18:00:00+00:00")
-@pytest.mark.parametrize(
-    ("error_message", "p_error"),
-    [
-        (NordPoolConnectionError, "cannot_connect"),
-        (NordPoolEmptyResponseError, "no_data"),
-        (NordPoolError, "cannot_connect"),
-        (NordPoolResponseError, "cannot_connect"),
-    ],
-)
-async def test_reconfigure_cannot_connect(
-    hass: HomeAssistant,
-    load_int: MockConfigEntry,
-    get_data: DeliveryPeriodData,
-    error_message: Exception,
-    p_error: str,
-) -> None:
-    """Test cannot connect error in a reeconfigure flow."""
-
-    result = await load_int.start_reconfigure_flow(hass)
-
-    with patch(
-        "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-        side_effect=error_message,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_AREAS: ["SE3"],
-                CONF_CURRENCY: "EUR",
-            },
-        )
-
-    assert result["errors"] == {"base": p_error}
-
-    with patch(
-        "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-        return_value=get_data,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_AREAS: ["SE3"],
-                CONF_CURRENCY: "EUR",
-            },
-        )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reconfigure_successful"
-    assert load_int.data == {
-        "areas": [
-            "SE3",
-        ],
-        "currency": "EUR",
-    }
diff --git a/tests/components/nordpool/test_coordinator.py b/tests/components/nordpool/test_coordinator.py
deleted file mode 100644
index d2d912b1b99..00000000000
--- a/tests/components/nordpool/test_coordinator.py
+++ /dev/null
@@ -1,106 +0,0 @@
-"""The test for the Nord Pool coordinator."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-from unittest.mock import patch
-
-from freezegun.api import FrozenDateTimeFactory
-from pynordpool import (
-    DeliveryPeriodData,
-    NordPoolAuthenticationError,
-    NordPoolEmptyResponseError,
-    NordPoolError,
-    NordPoolResponseError,
-)
-import pytest
-
-from homeassistant.components.nordpool.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import STATE_UNAVAILABLE
-from homeassistant.core import HomeAssistant
-
-from . import ENTRY_CONFIG
-
-from tests.common import MockConfigEntry, async_fire_time_changed
-
-
-@pytest.mark.freeze_time("2024-11-05T10:00:00+00:00")
-async def test_coordinator(
-    hass: HomeAssistant,
-    get_data: DeliveryPeriodData,
-    freezer: FrozenDateTimeFactory,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the Nord Pool coordinator with errors."""
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        source=SOURCE_USER,
-        data=ENTRY_CONFIG,
-    )
-
-    config_entry.add_to_hass(hass)
-
-    with (
-        patch(
-            "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-        ) as mock_data,
-    ):
-        mock_data.return_value = get_data
-        await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
-        mock_data.assert_called_once()
-        state = hass.states.get("sensor.nord_pool_se3_current_price")
-        assert state.state == "0.92737"
-        mock_data.reset_mock()
-
-        mock_data.side_effect = NordPoolError("error")
-        freezer.tick(timedelta(hours=1))
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done(wait_background_tasks=True)
-        mock_data.assert_called_once()
-        state = hass.states.get("sensor.nord_pool_se3_current_price")
-        assert state.state == STATE_UNAVAILABLE
-        mock_data.reset_mock()
-
-        assert "Authentication error" not in caplog.text
-        mock_data.side_effect = NordPoolAuthenticationError("Authentication error")
-        freezer.tick(timedelta(hours=1))
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done(wait_background_tasks=True)
-        mock_data.assert_called_once()
-        state = hass.states.get("sensor.nord_pool_se3_current_price")
-        assert state.state == STATE_UNAVAILABLE
-        assert "Authentication error" in caplog.text
-        mock_data.reset_mock()
-
-        assert "Empty response" not in caplog.text
-        mock_data.side_effect = NordPoolEmptyResponseError("Empty response")
-        freezer.tick(timedelta(hours=1))
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done(wait_background_tasks=True)
-        mock_data.assert_called_once()
-        state = hass.states.get("sensor.nord_pool_se3_current_price")
-        assert state.state == STATE_UNAVAILABLE
-        assert "Empty response" in caplog.text
-        mock_data.reset_mock()
-
-        assert "Response error" not in caplog.text
-        mock_data.side_effect = NordPoolResponseError("Response error")
-        freezer.tick(timedelta(hours=1))
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done(wait_background_tasks=True)
-        mock_data.assert_called_once()
-        state = hass.states.get("sensor.nord_pool_se3_current_price")
-        assert state.state == STATE_UNAVAILABLE
-        assert "Response error" in caplog.text
-        mock_data.reset_mock()
-
-        mock_data.return_value = get_data
-        mock_data.side_effect = None
-        freezer.tick(timedelta(hours=1))
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done()
-        mock_data.assert_called_once()
-        state = hass.states.get("sensor.nord_pool_se3_current_price")
-        assert state.state == "1.81645"
diff --git a/tests/components/nordpool/test_diagnostics.py b/tests/components/nordpool/test_diagnostics.py
deleted file mode 100644
index 4639186ecf1..00000000000
--- a/tests/components/nordpool/test_diagnostics.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""Test Nord Pool diagnostics."""
-
-from __future__ import annotations
-
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-
-from tests.components.diagnostics import get_diagnostics_for_config_entry
-from tests.typing import ClientSessionGenerator
-
-
-async def test_diagnostics(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    load_int: ConfigEntry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test generating diagnostics for a config entry."""
-    assert (
-        await get_diagnostics_for_config_entry(hass, hass_client, load_int) == snapshot
-    )
diff --git a/tests/components/nordpool/test_init.py b/tests/components/nordpool/test_init.py
deleted file mode 100644
index 5ec1c4b3a0b..00000000000
--- a/tests/components/nordpool/test_init.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""Test for Nord Pool component Init."""
-
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from pynordpool import DeliveryPeriodData
-
-from homeassistant.components.nordpool.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER, ConfigEntryState
-from homeassistant.core import HomeAssistant
-
-from . import ENTRY_CONFIG
-
-from tests.common import MockConfigEntry
-
-
-async def test_unload_entry(hass: HomeAssistant, get_data: DeliveryPeriodData) -> None:
-    """Test load and unload an entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        source=SOURCE_USER,
-        data=ENTRY_CONFIG,
-    )
-    entry.add_to_hass(hass)
-
-    with (
-        patch(
-            "homeassistant.components.nordpool.coordinator.NordPoolClient.async_get_delivery_period",
-            return_value=get_data,
-        ),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    assert entry.state is ConfigEntryState.LOADED
-    assert await hass.config_entries.async_unload(entry.entry_id)
-    await hass.async_block_till_done()
-    assert entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/nordpool/test_sensor.py b/tests/components/nordpool/test_sensor.py
deleted file mode 100644
index c7a305c8a40..00000000000
--- a/tests/components/nordpool/test_sensor.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""The test for the Nord Pool sensor platform."""
-
-from __future__ import annotations
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from tests.common import snapshot_platform
-
-
-@pytest.mark.freeze_time("2024-11-05T18:00:00+00:00")
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_sensor(
-    hass: HomeAssistant,
-    load_int: ConfigEntry,
-    entity_registry: er.EntityRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test the Nord Pool sensor."""
-
-    await snapshot_platform(hass, entity_registry, snapshot, load_int.entry_id)
diff --git a/tests/components/nut/test_init.py b/tests/components/nut/test_init.py
index d5d85daa336..61a5187407b 100644
--- a/tests/components/nut/test_init.py
+++ b/tests/components/nut/test_init.py
@@ -8,9 +8,8 @@ from homeassistant.components.nut.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_HOST, CONF_PORT, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
 
-from .util import _get_mock_nutclient, async_init_integration
+from .util import _get_mock_nutclient
 
 from tests.common import MockConfigEntry
 
@@ -97,53 +96,3 @@ async def test_auth_fails(hass: HomeAssistant) -> None:
     flows = hass.config_entries.flow.async_progress()
     assert len(flows) == 1
     assert flows[0]["context"]["source"] == "reauth"
-
-
-async def test_serial_number(hass: HomeAssistant) -> None:
-    """Test for serial number set on device."""
-    mock_serial_number = "A00000000000"
-    await async_init_integration(
-        hass,
-        username="someuser",
-        password="somepassword",
-        list_vars={"ups.serial": mock_serial_number},
-        list_ups={"ups1": "UPS 1"},
-        list_commands_return_value=[],
-    )
-
-    device_registry = dr.async_get(hass)
-    assert device_registry is not None
-
-    device_entry = device_registry.async_get_device(
-        identifiers={(DOMAIN, mock_serial_number)}
-    )
-
-    assert device_entry is not None
-    assert device_entry.serial_number == mock_serial_number
-
-
-async def test_device_location(hass: HomeAssistant) -> None:
-    """Test for suggested location on device."""
-    mock_serial_number = "A00000000000"
-    mock_device_location = "XYZ Location"
-    await async_init_integration(
-        hass,
-        username="someuser",
-        password="somepassword",
-        list_vars={
-            "ups.serial": mock_serial_number,
-            "device.location": mock_device_location,
-        },
-        list_ups={"ups1": "UPS 1"},
-        list_commands_return_value=[],
-    )
-
-    device_registry = dr.async_get(hass)
-    assert device_registry is not None
-
-    device_entry = device_registry.async_get_device(
-        identifiers={(DOMAIN, mock_serial_number)}
-    )
-
-    assert device_entry is not None
-    assert device_entry.suggested_area == mock_device_location
diff --git a/tests/components/nyt_games/conftest.py b/tests/components/nyt_games/conftest.py
index 1004b6eb42a..2999ae115b1 100644
--- a/tests/components/nyt_games/conftest.py
+++ b/tests/components/nyt_games/conftest.py
@@ -1,7 +1,7 @@
 """NYTGames tests configuration."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 from nyt_games.models import ConnectionsStats, WordleStats
 import pytest
@@ -10,6 +10,7 @@ from homeassistant.components.nyt_games.const import DOMAIN
 from homeassistant.const import CONF_TOKEN
 
 from tests.common import MockConfigEntry, load_fixture
+from tests.components.smhi.common import AsyncMock
 
 
 @pytest.fixture
diff --git a/tests/components/nyt_games/snapshots/test_sensor.ambr b/tests/components/nyt_games/snapshots/test_sensor.ambr
index 84b74a26f0d..fdec7d58d9d 100644
--- a/tests/components/nyt_games/snapshots/test_sensor.ambr
+++ b/tests/components/nyt_games/snapshots/test_sensor.ambr
@@ -98,7 +98,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '2',
+    'state': '0',
   })
 # ---
 # name: test_all_entities[sensor.connections_last_played-entry]
diff --git a/tests/components/ollama/test_config_flow.py b/tests/components/ollama/test_config_flow.py
index 7755f2208b4..82c954a1737 100644
--- a/tests/components/ollama/test_config_flow.py
+++ b/tests/components/ollama/test_config_flow.py
@@ -204,6 +204,10 @@ async def test_form_errors(hass: HomeAssistant, side_effect, error) -> None:
     assert result2["errors"] == {"base": error}
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.ollama.config.abort.download_failed"],
+)
 async def test_download_error(hass: HomeAssistant) -> None:
     """Test we handle errors while downloading a model."""
     result = await hass.config_entries.flow.async_init(
diff --git a/tests/components/onboarding/test_views.py b/tests/components/onboarding/test_views.py
index 35f6b7d739c..b66470dfaf7 100644
--- a/tests/components/onboarding/test_views.py
+++ b/tests/components/onboarding/test_views.py
@@ -5,7 +5,7 @@ from collections.abc import AsyncGenerator
 from http import HTTPStatus
 import os
 from typing import Any
-from unittest.mock import AsyncMock, Mock, patch
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -69,14 +69,24 @@ async def no_rpi_fixture(
 
 @pytest.fixture(name="mock_supervisor")
 async def mock_supervisor_fixture(
-    aioclient_mock: AiohttpClientMocker,
-    store_info: AsyncMock,
-    supervisor_is_connected: AsyncMock,
-    resolution_info: AsyncMock,
+    aioclient_mock: AiohttpClientMocker, store_info
 ) -> AsyncGenerator[None]:
     """Mock supervisor."""
     aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
     aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/info",
+        json={
+            "result": "ok",
+            "data": {
+                "unsupported": [],
+                "unhealthy": [],
+                "suggestions": [],
+                "issues": [],
+                "checks": [],
+            },
+        },
+    )
     aioclient_mock.get(
         "http://127.0.0.1/network/info",
         json={
@@ -89,6 +99,10 @@ async def mock_supervisor_fixture(
     )
     with (
         patch.dict(os.environ, {"SUPERVISOR": "127.0.0.1"}),
+        patch(
+            "homeassistant.components.hassio.HassIO.is_connected",
+            return_value=True,
+        ),
         patch(
             "homeassistant.components.hassio.HassIO.get_info",
             return_value={},
diff --git a/tests/components/onkyo/__init__.py b/tests/components/onkyo/__init__.py
deleted file mode 100644
index 8900f189aea..00000000000
--- a/tests/components/onkyo/__init__.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""Tests for the Onkyo integration."""
-
-from unittest.mock import AsyncMock, Mock, patch
-
-from homeassistant.components.onkyo.receiver import Receiver, ReceiverInfo
-from homeassistant.const import CONF_HOST
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-def create_receiver_info(id: int) -> ReceiverInfo:
-    """Create an empty receiver info object for testing."""
-    return ReceiverInfo(
-        host=f"host {id}",
-        port=id,
-        model_name=f"type {id}",
-        identifier=f"id{id}",
-    )
-
-
-def create_config_entry_from_info(info: ReceiverInfo) -> MockConfigEntry:
-    """Create a config entry from receiver info."""
-    data = {CONF_HOST: info.host}
-    options = {
-        "volume_resolution": 80,
-        "input_sources": {"12": "tv"},
-        "max_volume": 100,
-    }
-
-    return MockConfigEntry(
-        data=data,
-        options=options,
-        title=info.model_name,
-        domain="onkyo",
-        unique_id=info.identifier,
-    )
-
-
-def create_empty_config_entry() -> MockConfigEntry:
-    """Create an empty config entry for use in unit tests."""
-    data = {CONF_HOST: ""}
-    options = {
-        "volume_resolution": 80,
-        "input_sources": {"12": "tv"},
-        "max_volume": 100,
-    }
-
-    return MockConfigEntry(
-        data=data,
-        options=options,
-        title="Unit test Onkyo",
-        domain="onkyo",
-        unique_id="onkyo_unique_id",
-    )
-
-
-async def setup_integration(
-    hass: HomeAssistant, config_entry: MockConfigEntry, receiver_info: ReceiverInfo
-) -> None:
-    """Fixture for setting up the component."""
-
-    config_entry.add_to_hass(hass)
-
-    mock_receiver = AsyncMock()
-    mock_receiver.conn.close = Mock()
-    mock_receiver.callbacks.connect = Mock()
-    mock_receiver.callbacks.update = Mock()
-
-    with (
-        patch(
-            "homeassistant.components.onkyo.async_interview",
-            return_value=receiver_info,
-        ),
-        patch.object(Receiver, "async_create", return_value=mock_receiver),
-    ):
-        await hass.config_entries.async_setup(config_entry.entry_id)
-        await hass.async_block_till_done()
diff --git a/tests/components/onkyo/conftest.py b/tests/components/onkyo/conftest.py
deleted file mode 100644
index c37966e3bae..00000000000
--- a/tests/components/onkyo/conftest.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""Configure tests for the Onkyo integration."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
-
-import pytest
-
-from homeassistant.components.onkyo.const import DOMAIN
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.onkyo.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture(name="config_entry")
-def mock_config_entry() -> MockConfigEntry:
-    """Create Onkyo entry in Home Assistant."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        title="Onkyo",
-        data={},
-    )
diff --git a/tests/components/onkyo/test_config_flow.py b/tests/components/onkyo/test_config_flow.py
deleted file mode 100644
index f230ab124bd..00000000000
--- a/tests/components/onkyo/test_config_flow.py
+++ /dev/null
@@ -1,532 +0,0 @@
-"""Test Onkyo config flow."""
-
-from typing import Any
-from unittest.mock import patch
-
-import pytest
-
-from homeassistant import config_entries
-from homeassistant.components.onkyo import InputSource
-from homeassistant.components.onkyo.config_flow import OnkyoConfigFlow
-from homeassistant.components.onkyo.const import (
-    DOMAIN,
-    OPTION_MAX_VOLUME,
-    OPTION_VOLUME_RESOLUTION,
-)
-from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import CONF_HOST
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType, InvalidData
-
-from . import (
-    create_config_entry_from_info,
-    create_empty_config_entry,
-    create_receiver_info,
-    setup_integration,
-)
-
-from tests.common import Mock, MockConfigEntry
-
-
-async def test_user_initial_menu(hass: HomeAssistant) -> None:
-    """Test initial menu."""
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    assert init_result["type"] is FlowResultType.MENU
-    # Check if the values are there, but ignore order
-    assert not set(init_result["menu_options"]) ^ {"manual", "eiscp_discovery"}
-
-
-async def test_manual_valid_host(hass: HomeAssistant) -> None:
-    """Test valid host entered."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    mock_info = Mock()
-    mock_info.identifier = "mock_id"
-    mock_info.host = "mock_host"
-    mock_info.model_name = "mock_model"
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        return_value=mock_info,
-    ):
-        select_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={CONF_HOST: "sample-host-name"},
-        )
-
-        assert select_result["step_id"] == "configure_receiver"
-        assert (
-            select_result["description_placeholders"]["name"]
-            == "mock_model (mock_host)"
-        )
-
-
-async def test_manual_invalid_host(hass: HomeAssistant) -> None:
-    """Test invalid host entered."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview", return_value=None
-    ):
-        host_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={CONF_HOST: "sample-host-name"},
-        )
-
-    assert host_result["step_id"] == "manual"
-    assert host_result["errors"]["base"] == "cannot_connect"
-
-
-async def test_manual_valid_host_unexpected_error(hass: HomeAssistant) -> None:
-    """Test valid host entered."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        side_effect=Exception(),
-    ):
-        host_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={CONF_HOST: "sample-host-name"},
-        )
-
-    assert host_result["step_id"] == "manual"
-    assert host_result["errors"]["base"] == "unknown"
-
-
-async def test_discovery_and_no_devices_discovered(hass: HomeAssistant) -> None:
-    """Test initial menu."""
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_discover", return_value=[]
-    ):
-        form_result = await hass.config_entries.flow.async_configure(
-            init_result["flow_id"],
-            {"next_step_id": "eiscp_discovery"},
-        )
-
-        assert form_result["type"] is FlowResultType.ABORT
-        assert form_result["reason"] == "no_devices_found"
-
-
-async def test_discovery_with_exception(hass: HomeAssistant) -> None:
-    """Test discovery which throws an unexpected exception."""
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_discover",
-        side_effect=Exception(),
-    ):
-        form_result = await hass.config_entries.flow.async_configure(
-            init_result["flow_id"],
-            {"next_step_id": "eiscp_discovery"},
-        )
-
-        assert form_result["type"] is FlowResultType.ABORT
-        assert form_result["reason"] == "unknown"
-
-
-async def test_discovery_with_new_and_existing_found(hass: HomeAssistant) -> None:
-    """Test discovery with a new and an existing entry."""
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    infos = [create_receiver_info(1), create_receiver_info(2)]
-
-    with (
-        patch(
-            "homeassistant.components.onkyo.config_flow.async_discover",
-            return_value=infos,
-        ),
-        # Fake it like the first entry was already added
-        patch.object(OnkyoConfigFlow, "_async_current_ids", return_value=["id1"]),
-    ):
-        form_result = await hass.config_entries.flow.async_configure(
-            init_result["flow_id"],
-            {"next_step_id": "eiscp_discovery"},
-        )
-
-        assert form_result["type"] is FlowResultType.FORM
-
-        assert form_result["data_schema"] is not None
-        schema = form_result["data_schema"].schema
-        container = schema["device"].container
-        assert container == {"id2": "type 2 (host 2)"}
-
-
-async def test_discovery_with_one_selected(hass: HomeAssistant) -> None:
-    """Test discovery after a selection."""
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    infos = [create_receiver_info(42), create_receiver_info(0)]
-
-    with (
-        patch(
-            "homeassistant.components.onkyo.config_flow.async_discover",
-            return_value=infos,
-        ),
-    ):
-        form_result = await hass.config_entries.flow.async_configure(
-            init_result["flow_id"],
-            {"next_step_id": "eiscp_discovery"},
-        )
-
-        select_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={"device": "id42"},
-        )
-
-        assert select_result["step_id"] == "configure_receiver"
-        assert select_result["description_placeholders"]["name"] == "type 42 (host 42)"
-
-
-async def test_configure_empty_source_list(hass: HomeAssistant) -> None:
-    """Test receiver configuration with no sources set."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    mock_info = Mock()
-    mock_info.identifier = "mock_id"
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        return_value=mock_info,
-    ):
-        select_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={CONF_HOST: "sample-host-name"},
-        )
-
-        configure_result = await hass.config_entries.flow.async_configure(
-            select_result["flow_id"],
-            user_input={"volume_resolution": 200, "input_sources": []},
-        )
-
-        assert configure_result["errors"] == {
-            "input_sources": "empty_input_source_list"
-        }
-
-
-async def test_configure_no_resolution(hass: HomeAssistant) -> None:
-    """Test receiver configure with no resolution set."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    mock_info = Mock()
-    mock_info.identifier = "mock_id"
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        return_value=mock_info,
-    ):
-        select_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={CONF_HOST: "sample-host-name"},
-        )
-
-        with pytest.raises(InvalidData):
-            await hass.config_entries.flow.async_configure(
-                select_result["flow_id"],
-                user_input={"input_sources": ["TV"]},
-            )
-
-
-async def test_configure_resolution_set(hass: HomeAssistant) -> None:
-    """Test receiver configure with specified resolution."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    receiver_info = create_receiver_info(1)
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        return_value=receiver_info,
-    ):
-        select_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={CONF_HOST: "sample-host-name"},
-        )
-
-    configure_result = await hass.config_entries.flow.async_configure(
-        select_result["flow_id"],
-        user_input={"volume_resolution": 200, "input_sources": ["TV"]},
-    )
-
-    assert configure_result["type"] is FlowResultType.CREATE_ENTRY
-    assert configure_result["options"]["volume_resolution"] == 200
-
-
-async def test_configure_invalid_resolution_set(hass: HomeAssistant) -> None:
-    """Test receiver configure with invalid resolution."""
-
-    init_result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    form_result = await hass.config_entries.flow.async_configure(
-        init_result["flow_id"],
-        {"next_step_id": "manual"},
-    )
-
-    mock_info = Mock()
-    mock_info.identifier = "mock_id"
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        return_value=mock_info,
-    ):
-        select_result = await hass.config_entries.flow.async_configure(
-            form_result["flow_id"],
-            user_input={CONF_HOST: "sample-host-name"},
-        )
-
-        with pytest.raises(InvalidData):
-            await hass.config_entries.flow.async_configure(
-                select_result["flow_id"],
-                user_input={"volume_resolution": 42, "input_sources": ["TV"]},
-            )
-
-
-async def test_reconfigure(hass: HomeAssistant) -> None:
-    """Test the reconfigure config flow."""
-    receiver_info = create_receiver_info(1)
-    config_entry = create_config_entry_from_info(receiver_info)
-    await setup_integration(hass, config_entry, receiver_info)
-
-    old_host = config_entry.data[CONF_HOST]
-    old_max_volume = config_entry.options[OPTION_MAX_VOLUME]
-
-    result = await config_entry.start_reconfigure_flow(hass)
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "manual"
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        return_value=receiver_info,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input={"host": receiver_info.host}
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["step_id"] == "configure_receiver"
-
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
-        user_input={"volume_resolution": 200, "input_sources": ["TUNER"]},
-    )
-
-    assert result3["type"] is FlowResultType.ABORT
-    assert result3["reason"] == "reconfigure_successful"
-
-    assert config_entry.data[CONF_HOST] == old_host
-    assert config_entry.options[OPTION_VOLUME_RESOLUTION] == 200
-    assert config_entry.options[OPTION_MAX_VOLUME] == old_max_volume
-
-
-async def test_reconfigure_new_device(hass: HomeAssistant) -> None:
-    """Test the reconfigure config flow with new device."""
-    receiver_info = create_receiver_info(1)
-    config_entry = create_config_entry_from_info(receiver_info)
-    await setup_integration(hass, config_entry, receiver_info)
-
-    old_unique_id = receiver_info.identifier
-
-    result = await config_entry.start_reconfigure_flow(hass)
-
-    receiver_info_2 = create_receiver_info(2)
-
-    with patch(
-        "homeassistant.components.onkyo.config_flow.async_interview",
-        return_value=receiver_info_2,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input={"host": receiver_info_2.host}
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] is FlowResultType.ABORT
-    assert result2["reason"] == "unique_id_mismatch"
-
-    # unique id should remain unchanged
-    assert config_entry.unique_id == old_unique_id
-
-
-@pytest.mark.parametrize(
-    ("user_input", "exception", "error"),
-    [
-        (
-            # No host, and thus no host reachable
-            {
-                CONF_HOST: None,
-                "receiver_max_volume": 100,
-                "max_volume": 100,
-                "sources": {},
-            },
-            None,
-            "cannot_connect",
-        ),
-        (
-            # No host, and connection exception
-            {
-                CONF_HOST: None,
-                "receiver_max_volume": 100,
-                "max_volume": 100,
-                "sources": {},
-            },
-            Exception(),
-            "cannot_connect",
-        ),
-    ],
-)
-async def test_import_fail(
-    hass: HomeAssistant,
-    user_input: dict[str, Any],
-    exception: Exception,
-    error: str,
-) -> None:
-    """Test import flow failed."""
-    with (
-        patch(
-            "homeassistant.components.onkyo.config_flow.async_interview",
-            return_value=None,
-            side_effect=exception,
-        ),
-    ):
-        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"] is FlowResultType.ABORT
-    assert result["reason"] == error
-
-
-async def test_import_success(
-    hass: HomeAssistant,
-) -> None:
-    """Test import flow succeeded."""
-    info = create_receiver_info(1)
-
-    user_input = {
-        CONF_HOST: info.host,
-        "receiver_max_volume": 80,
-        "max_volume": 110,
-        "sources": {
-            InputSource("00"): "Auxiliary",
-            InputSource("01"): "Video",
-        },
-        "info": info,
-    }
-
-    import_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 import_result["type"] is FlowResultType.CREATE_ENTRY
-    assert import_result["data"]["host"] == "host 1"
-    assert import_result["options"]["volume_resolution"] == 80
-    assert import_result["options"]["max_volume"] == 100
-    assert import_result["options"]["input_sources"] == {
-        "00": "Auxiliary",
-        "01": "Video",
-    }
-
-
-async def test_options_flow(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
-    """Test options flow."""
-
-    receiver_info = create_receiver_info(1)
-    config_entry = create_empty_config_entry()
-    await setup_integration(hass, config_entry, receiver_info)
-
-    result = await hass.config_entries.options.async_init(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"],
-        user_input={
-            "max_volume": 42,
-            "TV": "television",
-        },
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] == {
-        "volume_resolution": 80,
-        "max_volume": 42.0,
-        "input_sources": {
-            "12": "television",
-        },
-    }
diff --git a/tests/components/onkyo/test_init.py b/tests/components/onkyo/test_init.py
deleted file mode 100644
index 17086a3088e..00000000000
--- a/tests/components/onkyo/test_init.py
+++ /dev/null
@@ -1,72 +0,0 @@
-"""Test Onkyo component setup process."""
-
-from __future__ import annotations
-
-from unittest.mock import patch
-
-import pytest
-
-from homeassistant.components.onkyo import async_setup_entry
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-
-from . import create_empty_config_entry, create_receiver_info, setup_integration
-
-from tests.common import MockConfigEntry
-
-
-async def test_load_unload_entry(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test load and unload entry."""
-
-    config_entry = create_empty_config_entry()
-    receiver_info = create_receiver_info(1)
-    await setup_integration(hass, config_entry, receiver_info)
-
-    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
-
-
-async def test_update_entry(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test update options."""
-
-    with patch.object(hass.config_entries, "async_reload", return_value=True):
-        config_entry = create_empty_config_entry()
-        receiver_info = create_receiver_info(1)
-        await setup_integration(hass, config_entry, receiver_info)
-
-        # Force option change
-        assert hass.config_entries.async_update_entry(
-            config_entry, options={"option": "new_value"}
-        )
-        await hass.async_block_till_done()
-
-        hass.config_entries.async_reload.assert_called_with(config_entry.entry_id)
-
-
-async def test_no_connection(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test update options."""
-
-    config_entry = create_empty_config_entry()
-    config_entry.add_to_hass(hass)
-
-    with (
-        patch(
-            "homeassistant.components.onkyo.async_interview",
-            return_value=None,
-        ),
-        pytest.raises(ConfigEntryNotReady),
-    ):
-        await async_setup_entry(hass, config_entry)
diff --git a/tests/components/onvif/test_config_flow.py b/tests/components/onvif/test_config_flow.py
index 5c01fb2d200..f7200aa7a00 100644
--- a/tests/components/onvif/test_config_flow.py
+++ b/tests/components/onvif/test_config_flow.py
@@ -9,7 +9,7 @@ from homeassistant import config_entries
 from homeassistant.components import dhcp
 from homeassistant.components.onvif import DOMAIN, config_flow
 from homeassistant.config_entries import SOURCE_DHCP
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_USERNAME
+from homeassistant.const import CONF_HOST, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import device_registry as dr
@@ -803,8 +803,7 @@ async def test_form_reauth(hass: HomeAssistant) -> None:
     assert result2["step_id"] == "reauth_confirm"
     assert result2["errors"] == {config_flow.CONF_PASSWORD: "auth_failed"}
     assert result2["description_placeholders"] == {
-        CONF_NAME: "Mock Title",
-        "error": "not authorized (subcodes:NotAuthorized)",
+        "error": "not authorized (subcodes:NotAuthorized)"
     }
 
     with (
diff --git a/tests/components/osoenergy/conftest.py b/tests/components/osoenergy/conftest.py
deleted file mode 100644
index bb14fec0241..00000000000
--- a/tests/components/osoenergy/conftest.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Common fixtures for the OSO Energy tests."""
-
-from collections.abc import Generator
-from typing import Any
-from unittest.mock import AsyncMock, MagicMock, patch
-
-from apyosoenergyapi.waterheater import OSOEnergyWaterHeaterData
-import pytest
-
-from homeassistant.components.osoenergy.const import DOMAIN
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_KEY
-from homeassistant.core import HomeAssistant
-from homeassistant.util.json import JsonObjectType
-
-from tests.common import MockConfigEntry, load_json_object_fixture
-
-MOCK_CONFIG = {
-    CONF_API_KEY: "secret_api_key",
-}
-TEST_USER_EMAIL = "test_user_email@domain.com"
-
-
-@pytest.fixture
-def water_heater_fixture() -> JsonObjectType:
-    """Load the water heater fixture."""
-    return load_json_object_fixture("water_heater.json", DOMAIN)
-
-
-@pytest.fixture
-def mock_water_heater(water_heater_fixture) -> MagicMock:
-    """Water heater mock object."""
-    mock_heater = MagicMock(OSOEnergyWaterHeaterData)
-    for key, value in water_heater_fixture.items():
-        setattr(mock_heater, key, value)
-    return mock_heater
-
-
-@pytest.fixture
-def mock_entry_data() -> dict[str, Any]:
-    """Mock config entry data for fixture."""
-    return MOCK_CONFIG
-
-
-@pytest.fixture
-def mock_config_entry(
-    hass: HomeAssistant, mock_entry_data: dict[str, Any]
-) -> ConfigEntry:
-    """Mock a config entry setup for incomfort integration."""
-    entry = MockConfigEntry(domain=DOMAIN, data=mock_entry_data)
-    entry.add_to_hass(hass)
-    return entry
-
-
-@pytest.fixture
-async def mock_osoenergy_client(mock_water_heater) -> Generator[AsyncMock]:
-    """Mock a OSO Energy client."""
-
-    with (
-        patch(
-            "homeassistant.components.osoenergy.OSOEnergy", MagicMock()
-        ) as mock_client,
-        patch(
-            "homeassistant.components.osoenergy.config_flow.OSOEnergy", new=mock_client
-        ),
-    ):
-        mock_session = MagicMock()
-        mock_session.device_list = {"water_heater": [mock_water_heater]}
-        mock_session.start_session = AsyncMock(
-            return_value={"water_heater": [mock_water_heater]}
-        )
-        mock_session.update_data = AsyncMock(return_value=True)
-
-        mock_client().session = mock_session
-
-        mock_hotwater = MagicMock()
-        mock_hotwater.get_water_heater = AsyncMock(return_value=mock_water_heater)
-        mock_hotwater.set_profile = AsyncMock(return_value=True)
-        mock_hotwater.set_v40_min = AsyncMock(return_value=True)
-        mock_hotwater.turn_on = AsyncMock(return_value=True)
-        mock_hotwater.turn_off = AsyncMock(return_value=True)
-
-        mock_client().hotwater = mock_hotwater
-
-        mock_client().get_user_email = AsyncMock(return_value=TEST_USER_EMAIL)
-        mock_client().start_session = AsyncMock(
-            return_value={"water_heater": [mock_water_heater]}
-        )
-
-        yield mock_client
diff --git a/tests/components/osoenergy/fixtures/water_heater.json b/tests/components/osoenergy/fixtures/water_heater.json
deleted file mode 100644
index 82bdafb5d8a..00000000000
--- a/tests/components/osoenergy/fixtures/water_heater.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "device_id": "osoenergy_water_heater",
-  "device_type": "SAGA S200",
-  "device_name": "TEST DEVICE",
-  "current_temperature": 60,
-  "min_temperature": 10,
-  "max_temperature": 75,
-  "target_temperature": 60,
-  "target_temperature_low": 57,
-  "target_temperature_high": 63,
-  "available": true,
-  "online": true,
-  "current_operation": "on",
-  "optimization_mode": "oso",
-  "heater_mode": "auto",
-  "profile": [
-    10, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-    60, 60, 60, 60, 60
-  ]
-}
diff --git a/tests/components/osoenergy/snapshots/test_water_heater.ambr b/tests/components/osoenergy/snapshots/test_water_heater.ambr
deleted file mode 100644
index 5ebac405144..00000000000
--- a/tests/components/osoenergy/snapshots/test_water_heater.ambr
+++ /dev/null
@@ -1,57 +0,0 @@
-# serializer version: 1
-# name: test_water_heater[water_heater.test_device-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'max_temp': 75,
-      'min_temp': 10,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'water_heater',
-    'entity_category': None,
-    'entity_id': 'water_heater.test_device',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'osoenergy',
-    'previous_unique_id': None,
-    'supported_features': <WaterHeaterEntityFeature: 9>,
-    'translation_key': None,
-    'unique_id': 'osoenergy_water_heater',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_water_heater[water_heater.test_device-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 60,
-      'friendly_name': 'TEST DEVICE',
-      'max_temp': 75,
-      'min_temp': 10,
-      'supported_features': <WaterHeaterEntityFeature: 9>,
-      'target_temp_high': 63,
-      'target_temp_low': 57,
-      'temperature': 60,
-    }),
-    'context': <ANY>,
-    'entity_id': 'water_heater.test_device',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'eco',
-  })
-# ---
diff --git a/tests/components/osoenergy/test_water_heater.py b/tests/components/osoenergy/test_water_heater.py
deleted file mode 100644
index 851e710fa1c..00000000000
--- a/tests/components/osoenergy/test_water_heater.py
+++ /dev/null
@@ -1,276 +0,0 @@
-"""The water heater tests for the OSO Energy platform."""
-
-from unittest.mock import ANY, MagicMock, patch
-
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.osoenergy.const import DOMAIN
-from homeassistant.components.osoenergy.water_heater import (
-    ATTR_UNTIL_TEMP_LIMIT,
-    ATTR_V40MIN,
-    SERVICE_GET_PROFILE,
-    SERVICE_SET_PROFILE,
-    SERVICE_SET_V40MIN,
-)
-from homeassistant.components.water_heater import (
-    DOMAIN as WATER_HEATER_DOMAIN,
-    SERVICE_SET_TEMPERATURE,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    ATTR_ENTITY_ID,
-    ATTR_TEMPERATURE,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-    Platform,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from tests.common import snapshot_platform
-
-
-@patch("homeassistant.components.osoenergy.PLATFORMS", [Platform.WATER_HEATER])
-async def test_water_heater(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_osoenergy_client: MagicMock,
-    snapshot: SnapshotAssertion,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test states of the water heater."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-@pytest.mark.freeze_time("2024-10-10 00:00:00")
-async def test_get_profile(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test getting the heater profile."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    profile = await hass.services.async_call(
-        DOMAIN,
-        SERVICE_GET_PROFILE,
-        {ATTR_ENTITY_ID: "water_heater.test_device"},
-        blocking=True,
-        return_response=True,
-    )
-
-    # The profile is returned in UTC format from the server
-    # Each index represents an hour from the current day (0-23). For example index 2 - 02:00 UTC
-    # Depending on the time zone and the DST the UTC hour is converted to local time and the value is placed in the correct index
-    # Example: time zone 'US/Pacific' and DST (-7 hours difference) - index 9 (09:00 UTC) will be converted to index 2 (02:00 Local)
-    assert profile == {
-        "water_heater.test_device": {
-            "profile": [
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-                10,
-                60,
-                60,
-                60,
-                60,
-                60,
-                60,
-            ],
-        },
-    }
-
-
-@pytest.mark.freeze_time("2024-10-10 00:00:00")
-async def test_set_profile(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test getting the heater profile."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SET_PROFILE,
-        {ATTR_ENTITY_ID: "water_heater.test_device", "hour_01": 45},
-        blocking=True,
-    )
-
-    # The server expects to receive the profile in UTC format
-    # Each field represents an hour from the current day (0-23). For example field hour_01 - 01:00 Local time
-    # Depending on the time zone and the DST the Local hour is converted to UTC time and the value is placed in the correct index
-    # Example: time zone 'US/Pacific' and DST (-7 hours difference) - index 1 (01:00 Local) will be converted to index 8 (08:00 Utc)
-    mock_osoenergy_client().hotwater.set_profile.assert_called_once_with(
-        ANY,
-        [
-            10,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            45,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-            60,
-        ],
-    )
-
-
-async def test_set_v40_min(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test getting the heater profile."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SET_V40MIN,
-        {ATTR_ENTITY_ID: "water_heater.test_device", ATTR_V40MIN: 300},
-        blocking=True,
-    )
-
-    mock_osoenergy_client().hotwater.set_v40_min.assert_called_once_with(ANY, 300)
-
-
-async def test_set_temperature(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test getting the heater profile."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.services.async_call(
-        WATER_HEATER_DOMAIN,
-        SERVICE_SET_TEMPERATURE,
-        {ATTR_ENTITY_ID: "water_heater.test_device", ATTR_TEMPERATURE: 45},
-        blocking=True,
-    )
-
-    mock_osoenergy_client().hotwater.set_profile.assert_called_once_with(
-        ANY,
-        [
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-            45,
-        ],
-    )
-
-
-async def test_turn_on(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test turning the heater on."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.services.async_call(
-        WATER_HEATER_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "water_heater.test_device"},
-        blocking=True,
-    )
-
-    mock_osoenergy_client().hotwater.turn_on.assert_called_once_with(ANY, True)
-
-
-async def test_turn_off(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test getting the heater profile."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.services.async_call(
-        WATER_HEATER_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: "water_heater.test_device"},
-        blocking=True,
-    )
-
-    mock_osoenergy_client().hotwater.turn_off.assert_called_once_with(ANY, True)
-
-
-async def test_oso_turn_on(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test turning the heater on."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: "water_heater.test_device", ATTR_UNTIL_TEMP_LIMIT: False},
-        blocking=True,
-    )
-
-    mock_osoenergy_client().hotwater.turn_on.assert_called_once_with(ANY, False)
-
-
-async def test_oso_turn_off(
-    hass: HomeAssistant,
-    mock_osoenergy_client: MagicMock,
-    mock_config_entry: ConfigEntry,
-) -> None:
-    """Test getting the heater profile."""
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: "water_heater.test_device", ATTR_UNTIL_TEMP_LIMIT: False},
-        blocking=True,
-    )
-
-    mock_osoenergy_client().hotwater.turn_off.assert_called_once_with(ANY, False)
diff --git a/tests/components/otbr/test_config_flow.py b/tests/components/otbr/test_config_flow.py
index cd02c14e4eb..966f80d0bd8 100644
--- a/tests/components/otbr/test_config_flow.py
+++ b/tests/components/otbr/test_config_flow.py
@@ -9,23 +9,22 @@ import aiohttp
 import pytest
 import python_otbr_api
 
-from homeassistant.components import otbr
+from homeassistant.components import hassio, otbr
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from . import DATASET_CH15, DATASET_CH16, TEST_BORDER_AGENT_ID, TEST_BORDER_AGENT_ID_2
 
 from tests.common import MockConfigEntry, MockModule, mock_integration
 from tests.test_util.aiohttp import AiohttpClientMocker
 
-HASSIO_DATA = HassioServiceInfo(
+HASSIO_DATA = hassio.HassioServiceInfo(
     config={"host": "core-silabs-multiprotocol", "port": 8081},
     name="Silicon Labs Multiprotocol",
     slug="otbr",
     uuid="12345",
 )
-HASSIO_DATA_2 = HassioServiceInfo(
+HASSIO_DATA_2 = hassio.HassioServiceInfo(
     config={"host": "core-silabs-multiprotocol_2", "port": 8082},
     name="Silicon Labs Multiprotocol",
     slug="other_addon",
diff --git a/tests/components/ovo_energy/test_config_flow.py b/tests/components/ovo_energy/test_config_flow.py
index cfe679a254a..f21672679bd 100644
--- a/tests/components/ovo_energy/test_config_flow.py
+++ b/tests/components/ovo_energy/test_config_flow.py
@@ -3,6 +3,7 @@
 from unittest.mock import patch
 
 import aiohttp
+import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.ovo_energy.const import CONF_ACCOUNT, DOMAIN
@@ -120,20 +121,25 @@ async def test_full_flow_implementation(hass: HomeAssistant) -> None:
     assert result2["data"][CONF_ACCOUNT] == FIXTURE_USER_INPUT[CONF_ACCOUNT]
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.ovo_energy.config.error.authorization_error"],
+)
 async def test_reauth_authorization_error(hass: HomeAssistant) -> None:
     """Test we show user form on authorization error."""
     mock_config = MockConfigEntry(
         domain=DOMAIN, unique_id=UNIQUE_ID, data=FIXTURE_USER_INPUT
     )
     mock_config.add_to_hass(hass)
-    result = await mock_config.start_reauth_flow(hass)
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
     with patch(
         "homeassistant.components.ovo_energy.config_flow.OVOEnergy.authenticate",
         return_value=False,
     ):
+        result = await mock_config.start_reauth_flow(hass)
+
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "reauth"
+
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             FIXTURE_REAUTH_INPUT,
@@ -141,26 +147,29 @@ async def test_reauth_authorization_error(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         assert result2["type"] is FlowResultType.FORM
-        assert result2["step_id"] == "reauth_confirm"
+        assert result2["step_id"] == "reauth"
         assert result2["errors"] == {"base": "authorization_error"}
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.ovo_energy.config.error.connection_error"],
+)
 async def test_reauth_connection_error(hass: HomeAssistant) -> None:
     """Test we show user form on connection error."""
     mock_config = MockConfigEntry(
         domain=DOMAIN, unique_id=UNIQUE_ID, data=FIXTURE_USER_INPUT
     )
     mock_config.add_to_hass(hass)
-    result = await mock_config.start_reauth_flow(hass)
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
-    assert result["errors"] == {}
-
     with patch(
         "homeassistant.components.ovo_energy.config_flow.OVOEnergy.authenticate",
         side_effect=aiohttp.ClientError,
     ):
+        result = await mock_config.start_reauth_flow(hass)
+
+        assert result["type"] is FlowResultType.FORM
+        assert result["step_id"] == "reauth"
+
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             FIXTURE_REAUTH_INPUT,
@@ -168,32 +177,33 @@ async def test_reauth_connection_error(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         assert result2["type"] is FlowResultType.FORM
-        assert result2["step_id"] == "reauth_confirm"
+        assert result2["step_id"] == "reauth"
         assert result2["errors"] == {"base": "connection_error"}
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    [
+        [
+            "component.ovo_energy.config.abort.reauth_successful",
+            "component.ovo_energy.config.error.authorization_error",
+        ]
+    ],
+)
 async def test_reauth_flow(hass: HomeAssistant) -> None:
     """Test reauth works."""
     mock_config = MockConfigEntry(
         domain=DOMAIN, unique_id=UNIQUE_ID, data=FIXTURE_USER_INPUT
     )
     mock_config.add_to_hass(hass)
-    result = await mock_config.start_reauth_flow(hass)
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
-    assert result["errors"] == {}
-
     with patch(
         "homeassistant.components.ovo_energy.config_flow.OVOEnergy.authenticate",
         return_value=False,
     ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            FIXTURE_REAUTH_INPUT,
-        )
+        result = await mock_config.start_reauth_flow(hass)
+
         assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "reauth_confirm"
+        assert result["step_id"] == "reauth"
         assert result["errors"] == {"base": "authorization_error"}
 
     with (
diff --git a/tests/components/owntracks/test_config_flow.py b/tests/components/owntracks/test_config_flow.py
index a80685e9b1e..cbe51126eea 100644
--- a/tests/components/owntracks/test_config_flow.py
+++ b/tests/components/owntracks/test_config_flow.py
@@ -8,9 +8,9 @@ from homeassistant import config_entries
 from homeassistant.components.owntracks import config_flow
 from homeassistant.components.owntracks.config_flow import CONF_CLOUDHOOK, CONF_SECRET
 from homeassistant.components.owntracks.const import DOMAIN
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import CONF_WEBHOOK_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/p1_monitor/test_config_flow.py b/tests/components/p1_monitor/test_config_flow.py
index cbd89320074..ea1d12055a0 100644
--- a/tests/components/p1_monitor/test_config_flow.py
+++ b/tests/components/p1_monitor/test_config_flow.py
@@ -36,7 +36,6 @@ async def test_full_user_flow(hass: HomeAssistant) -> None:
     assert result2.get("type") is FlowResultType.CREATE_ENTRY
     assert result2.get("title") == "P1 Monitor"
     assert result2.get("data") == {CONF_HOST: "example.com", CONF_PORT: 80}
-    assert isinstance(result2["data"][CONF_PORT], int)
 
     assert len(mock_setup_entry.mock_calls) == 1
     assert len(mock_p1monitor.mock_calls) == 1
diff --git a/tests/components/palazzetti/__init__.py b/tests/components/palazzetti/__init__.py
deleted file mode 100644
index 0aafdf553ad..00000000000
--- a/tests/components/palazzetti/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""Tests for the Palazzetti integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
-    """Fixture for setting up the component."""
-    config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/palazzetti/conftest.py b/tests/components/palazzetti/conftest.py
deleted file mode 100644
index 33dca845098..00000000000
--- a/tests/components/palazzetti/conftest.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Fixtures for Palazzetti integration tests."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
-
-import pytest
-
-from homeassistant.components.palazzetti.const import DOMAIN
-from homeassistant.const import CONF_HOST
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.palazzetti.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Return the default mocked config entry."""
-    return MockConfigEntry(
-        title="palazzetti",
-        domain=DOMAIN,
-        data={CONF_HOST: "127.0.0.1"},
-        unique_id="11:22:33:44:55:66",
-    )
-
-
-@pytest.fixture
-def mock_palazzetti_client() -> Generator[AsyncMock]:
-    """Return a mocked PalazzettiClient."""
-    with (
-        patch(
-            "homeassistant.components.palazzetti.coordinator.PalazzettiClient",
-            autospec=True,
-        ) as client,
-        patch(
-            "homeassistant.components.palazzetti.config_flow.PalazzettiClient",
-            new=client,
-        ),
-    ):
-        mock_client = client.return_value
-        mock_client.mac = "11:22:33:44:55:66"
-        mock_client.name = "Stove"
-        mock_client.sw_version = "0.0.0"
-        mock_client.hw_version = "1.1.1"
-        mock_client.fan_speed_min = 1
-        mock_client.fan_speed_max = 5
-        mock_client.has_fan_silent = True
-        mock_client.has_fan_high = True
-        mock_client.has_fan_auto = True
-        mock_client.has_on_off_switch = True
-        mock_client.connected = True
-        mock_client.is_heating = True
-        mock_client.room_temperature = 18
-        mock_client.target_temperature = 21
-        mock_client.target_temperature_min = 5
-        mock_client.target_temperature_max = 50
-        mock_client.fan_speed = 3
-        mock_client.connect.return_value = True
-        mock_client.update_state.return_value = True
-        mock_client.set_on.return_value = True
-        mock_client.set_target_temperature.return_value = True
-        mock_client.set_fan_speed.return_value = True
-        mock_client.set_fan_silent.return_value = True
-        mock_client.set_fan_high.return_value = True
-        mock_client.set_fan_auto.return_value = True
-        yield mock_client
diff --git a/tests/components/palazzetti/snapshots/test_climate.ambr b/tests/components/palazzetti/snapshots/test_climate.ambr
deleted file mode 100644
index eb3b323272e..00000000000
--- a/tests/components/palazzetti/snapshots/test_climate.ambr
+++ /dev/null
@@ -1,86 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[climate.stove-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'fan_modes': list([
-        'silent',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        'high',
-        'auto',
-      ]),
-      'hvac_modes': list([
-        <HVACMode.HEAT: 'heat'>,
-        <HVACMode.OFF: 'off'>,
-      ]),
-      'max_temp': 50,
-      'min_temp': 5,
-      'target_temp_step': 1.0,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'climate',
-    'entity_category': None,
-    'entity_id': 'climate.stove',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'palazzetti',
-    'previous_unique_id': None,
-    'supported_features': <ClimateEntityFeature: 393>,
-    'translation_key': 'palazzetti',
-    'unique_id': '11:22:33:44:55:66',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[climate.stove-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'current_temperature': 18,
-      'fan_mode': '3',
-      'fan_modes': list([
-        'silent',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        'high',
-        'auto',
-      ]),
-      'friendly_name': 'Stove',
-      'hvac_modes': list([
-        <HVACMode.HEAT: 'heat'>,
-        <HVACMode.OFF: 'off'>,
-      ]),
-      'max_temp': 50,
-      'min_temp': 5,
-      'supported_features': <ClimateEntityFeature: 393>,
-      'target_temp_step': 1.0,
-      'temperature': 21,
-    }),
-    'context': <ANY>,
-    'entity_id': 'climate.stove',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'heat',
-  })
-# ---
diff --git a/tests/components/palazzetti/snapshots/test_init.ambr b/tests/components/palazzetti/snapshots/test_init.ambr
deleted file mode 100644
index abdee6b7f6f..00000000000
--- a/tests/components/palazzetti/snapshots/test_init.ambr
+++ /dev/null
@@ -1,33 +0,0 @@
-# serializer version: 1
-# name: test_device
-  DeviceRegistryEntrySnapshot({
-    'area_id': None,
-    'config_entries': <ANY>,
-    'configuration_url': None,
-    'connections': set({
-      tuple(
-        'mac',
-        '11:22:33:44:55:66',
-      ),
-    }),
-    'disabled_by': None,
-    'entry_type': None,
-    'hw_version': '1.1.1',
-    'id': <ANY>,
-    'identifiers': set({
-    }),
-    'is_new': False,
-    'labels': set({
-    }),
-    'manufacturer': 'Palazzetti',
-    'model': None,
-    'model_id': None,
-    'name': 'Stove',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': None,
-    'suggested_area': None,
-    'sw_version': '0.0.0',
-    'via_device_id': None,
-  })
-# ---
diff --git a/tests/components/palazzetti/test_climate.py b/tests/components/palazzetti/test_climate.py
deleted file mode 100644
index 78af8f00bdb..00000000000
--- a/tests/components/palazzetti/test_climate.py
+++ /dev/null
@@ -1,174 +0,0 @@
-"""Tests for the Palazzetti climate platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from pypalazzetti.exceptions import CommunicationError, ValidationError
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.climate import (
-    ATTR_FAN_MODE,
-    ATTR_HVAC_MODE,
-    DOMAIN as CLIMATE_DOMAIN,
-    SERVICE_SET_FAN_MODE,
-    SERVICE_SET_HVAC_MODE,
-    SERVICE_SET_TEMPERATURE,
-    HVACMode,
-)
-from homeassistant.components.palazzetti.const import FAN_AUTO, FAN_HIGH, FAN_SILENT
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-ENTITY_ID = "climate.stove"
-
-
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_palazzetti_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.palazzetti.PLATFORMS", [Platform.CLIMATE]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-async def test_async_set_data(
-    hass: HomeAssistant,
-    mock_palazzetti_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test setting climate data via service call."""
-    await setup_integration(hass, mock_config_entry)
-
-    # Set HVAC Mode: Success
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_HVAC_MODE,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.HEAT},
-        blocking=True,
-    )
-    mock_palazzetti_client.set_on.assert_called_once_with(True)
-    mock_palazzetti_client.set_on.reset_mock()
-
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_HVAC_MODE,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.OFF},
-        blocking=True,
-    )
-    mock_palazzetti_client.set_on.assert_called_once_with(False)
-    mock_palazzetti_client.set_on.reset_mock()
-
-    # Set HVAC Mode: Error
-    mock_palazzetti_client.set_on.side_effect = CommunicationError()
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_SET_HVAC_MODE,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.HEAT},
-            blocking=True,
-        )
-
-    mock_palazzetti_client.set_on.side_effect = ValidationError()
-    with pytest.raises(ServiceValidationError):
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_SET_HVAC_MODE,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.HEAT},
-            blocking=True,
-        )
-
-    # Set Temperature: Success
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_TEMPERATURE,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: 22},
-        blocking=True,
-    )
-    mock_palazzetti_client.set_target_temperature.assert_called_once_with(22)
-    mock_palazzetti_client.set_target_temperature.reset_mock()
-
-    # Set Temperature: Error
-    mock_palazzetti_client.set_target_temperature.side_effect = CommunicationError()
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_SET_TEMPERATURE,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: 22},
-            blocking=True,
-        )
-
-    mock_palazzetti_client.set_target_temperature.side_effect = ValidationError()
-    with pytest.raises(ServiceValidationError):
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_SET_TEMPERATURE,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: 22},
-            blocking=True,
-        )
-
-    # Set Fan Mode: Success
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_FAN_MODE,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: FAN_SILENT},
-        blocking=True,
-    )
-    mock_palazzetti_client.set_fan_silent.assert_called_once()
-    mock_palazzetti_client.set_fan_silent.reset_mock()
-
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_FAN_MODE,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: FAN_HIGH},
-        blocking=True,
-    )
-    mock_palazzetti_client.set_fan_high.assert_called_once()
-    mock_palazzetti_client.set_fan_high.reset_mock()
-
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_FAN_MODE,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: FAN_AUTO},
-        blocking=True,
-    )
-    mock_palazzetti_client.set_fan_auto.assert_called_once()
-    mock_palazzetti_client.set_fan_auto.reset_mock()
-
-    await hass.services.async_call(
-        CLIMATE_DOMAIN,
-        SERVICE_SET_FAN_MODE,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: "3"},
-        blocking=True,
-    )
-    mock_palazzetti_client.set_fan_speed.assert_called_once_with(3)
-    mock_palazzetti_client.set_fan_speed.reset_mock()
-
-    # Set Fan Mode: Error
-    mock_palazzetti_client.set_fan_speed.side_effect = CommunicationError()
-    with pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_SET_FAN_MODE,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: 3},
-            blocking=True,
-        )
-
-    mock_palazzetti_client.set_fan_speed.side_effect = ValidationError()
-    with pytest.raises(ServiceValidationError):
-        await hass.services.async_call(
-            CLIMATE_DOMAIN,
-            SERVICE_SET_FAN_MODE,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: 3},
-            blocking=True,
-        )
diff --git a/tests/components/palazzetti/test_config_flow.py b/tests/components/palazzetti/test_config_flow.py
deleted file mode 100644
index 03c56c33d0c..00000000000
--- a/tests/components/palazzetti/test_config_flow.py
+++ /dev/null
@@ -1,140 +0,0 @@
-"""Test the Palazzetti config flow."""
-
-from unittest.mock import AsyncMock
-
-from pypalazzetti.exceptions import CommunicationError
-
-from homeassistant.components import dhcp
-from homeassistant.components.palazzetti.const import DOMAIN
-from homeassistant.config_entries import SOURCE_DHCP, SOURCE_USER
-from homeassistant.const import CONF_HOST
-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, mock_palazzetti_client: AsyncMock, mock_setup_entry: AsyncMock
-) -> None:
-    """Test the full user configuration flow."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={CONF_HOST: "192.168.1.1"},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Stove"
-    assert result["data"] == {CONF_HOST: "192.168.1.1"}
-    assert result["result"].unique_id == "11:22:33:44:55:66"
-    assert len(mock_palazzetti_client.connect.mock_calls) > 0
-
-
-async def test_invalid_host(
-    hass: HomeAssistant,
-    mock_palazzetti_client: AsyncMock,
-    mock_setup_entry: AsyncMock,
-) -> None:
-    """Test cannot connect error."""
-
-    mock_palazzetti_client.connect.side_effect = CommunicationError()
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={CONF_HOST: "192.168.1.1"},
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "cannot_connect"}
-
-    mock_palazzetti_client.connect.side_effect = None
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={CONF_HOST: "192.168.1.1"},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-
-
-async def test_duplicate(
-    hass: HomeAssistant,
-    mock_palazzetti_client: AsyncMock,
-    mock_setup_entry: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test duplicate flow."""
-    mock_config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: "192.168.1.1"},
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_dhcp_flow(
-    hass: HomeAssistant, mock_palazzetti_client: AsyncMock, mock_setup_entry: AsyncMock
-) -> None:
-    """Test the DHCP flow."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        data=dhcp.DhcpServiceInfo(
-            hostname="connbox1234", ip="192.168.1.1", macaddress="11:22:33:44:55:66"
-        ),
-        context={"source": SOURCE_DHCP},
-    )
-
-    await hass.async_block_till_done()
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "discovery_confirm"
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {},
-    )
-
-    await hass.async_block_till_done()
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Stove"
-    assert result["result"].unique_id == "11:22:33:44:55:66"
-
-
-async def test_dhcp_flow_error(
-    hass: HomeAssistant, mock_palazzetti_client: AsyncMock, mock_setup_entry: AsyncMock
-) -> None:
-    """Test the DHCP flow."""
-    mock_palazzetti_client.connect.side_effect = CommunicationError()
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        data=dhcp.DhcpServiceInfo(
-            hostname="connbox1234", ip="192.168.1.1", macaddress="11:22:33:44:55:66"
-        ),
-        context={"source": SOURCE_DHCP},
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "cannot_connect"
diff --git a/tests/components/palazzetti/test_init.py b/tests/components/palazzetti/test_init.py
deleted file mode 100644
index 710144b2b7b..00000000000
--- a/tests/components/palazzetti/test_init.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""Tests for the Palazzetti integration."""
-
-from unittest.mock import AsyncMock
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry
-
-
-async def test_load_unload_config_entry(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_palazzetti_client: AsyncMock,
-) -> None:
-    """Test the Palazzetti configuration entry loading/unloading."""
-    await setup_integration(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    await hass.config_entries.async_unload(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
-
-
-async def test_device(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_palazzetti_client: AsyncMock,
-    snapshot: SnapshotAssertion,
-    device_registry: dr.DeviceRegistry,
-) -> None:
-    """Test the device information."""
-    await setup_integration(hass, mock_config_entry)
-
-    device = device_registry.async_get_device(
-        connections={(dr.CONNECTION_NETWORK_MAC, "11:22:33:44:55:66")}
-    )
-    assert device is not None
-    assert device == snapshot
diff --git a/tests/components/pegel_online/snapshots/test_diagnostics.ambr b/tests/components/pegel_online/snapshots/test_diagnostics.ambr
deleted file mode 100644
index 1e55805f867..00000000000
--- a/tests/components/pegel_online/snapshots/test_diagnostics.ambr
+++ /dev/null
@@ -1,39 +0,0 @@
-# serializer version: 1
-# name: test_entry_diagnostics
-  dict({
-    'data': dict({
-      'air_temperature': None,
-      'clearance_height': None,
-      'oxygen_level': None,
-      'ph_value': None,
-      'water_flow': dict({
-        'uom': 'm³/s',
-        'value': 88.4,
-      }),
-      'water_level': dict({
-        'uom': 'cm',
-        'value': 62,
-      }),
-      'water_speed': None,
-      'water_temperature': None,
-    }),
-    'entry': dict({
-      'data': dict({
-        'station': '70272185-xxxx-xxxx-xxxx-43bea330dcae',
-      }),
-      'disabled_by': None,
-      'discovery_keys': dict({
-      }),
-      'domain': 'pegel_online',
-      'minor_version': 1,
-      'options': dict({
-      }),
-      'pref_disable_new_entities': False,
-      'pref_disable_polling': False,
-      'source': 'user',
-      'title': 'Mock Title',
-      'unique_id': '70272185-xxxx-xxxx-xxxx-43bea330dcae',
-      'version': 1,
-    }),
-  })
-# ---
diff --git a/tests/components/pegel_online/test_diagnostics.py b/tests/components/pegel_online/test_diagnostics.py
deleted file mode 100644
index 220f244b751..00000000000
--- a/tests/components/pegel_online/test_diagnostics.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""Test pegel_online diagnostics."""
-
-from unittest.mock import patch
-
-from syrupy import SnapshotAssertion
-from syrupy.filters import props
-
-from homeassistant.components.pegel_online.const import CONF_STATION, DOMAIN
-from homeassistant.core import HomeAssistant
-
-from . import PegelOnlineMock
-from .const import (
-    MOCK_CONFIG_ENTRY_DATA_DRESDEN,
-    MOCK_STATION_DETAILS_DRESDEN,
-    MOCK_STATION_MEASUREMENT_DRESDEN,
-)
-
-from tests.common import MockConfigEntry
-from tests.components.diagnostics import get_diagnostics_for_config_entry
-from tests.typing import ClientSessionGenerator
-
-
-async def test_entry_diagnostics(
-    hass: HomeAssistant,
-    hass_client: ClientSessionGenerator,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test config entry diagnostics."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data=MOCK_CONFIG_ENTRY_DATA_DRESDEN,
-        unique_id=MOCK_CONFIG_ENTRY_DATA_DRESDEN[CONF_STATION],
-    )
-    entry.add_to_hass(hass)
-    with patch("homeassistant.components.pegel_online.PegelOnline") as pegelonline:
-        pegelonline.return_value = PegelOnlineMock(
-            station_details=MOCK_STATION_DETAILS_DRESDEN,
-            station_measurements=MOCK_STATION_MEASUREMENT_DRESDEN,
-        )
-        assert await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    result = await get_diagnostics_for_config_entry(hass, hass_client, entry)
-    assert result == snapshot(exclude=props("entry_id", "created_at", "modified_at"))
diff --git a/tests/components/permobil/test_config_flow.py b/tests/components/permobil/test_config_flow.py
index 7067566a74d..f9121f8f268 100644
--- a/tests/components/permobil/test_config_flow.py
+++ b/tests/components/permobil/test_config_flow.py
@@ -284,7 +284,11 @@ async def test_config_flow_reauth_success(
         "homeassistant.components.permobil.config_flow.MyPermobil",
         return_value=my_permobil,
     ):
-        result = await mock_entry.start_reauth_flow(hass)
+        result = await hass.config_entries.flow.async_init(
+            config_flow.DOMAIN,
+            context={"source": "reauth", "entry_id": mock_entry.entry_id},
+            data=mock_entry.data,
+        )
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "email_code"
@@ -324,7 +328,11 @@ async def test_config_flow_reauth_fail_invalid_code(
         "homeassistant.components.permobil.config_flow.MyPermobil",
         return_value=my_permobil,
     ):
-        result = await mock_entry.start_reauth_flow(hass)
+        result = await hass.config_entries.flow.async_init(
+            config_flow.DOMAIN,
+            context={"source": "reauth", "entry_id": mock_entry.entry_id},
+            data=mock_entry.data,
+        )
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "email_code"
@@ -352,11 +360,17 @@ async def test_config_flow_reauth_fail_code_request(
     )
     mock_entry.add_to_hass(hass)
     # test the reauth and have request_application_code fail leading to an abort
+    my_permobil.request_application_code.side_effect = MyPermobilAPIException
+    reauth_entry = hass.config_entries.async_entries(config_flow.DOMAIN)[0]
     with patch(
         "homeassistant.components.permobil.config_flow.MyPermobil",
         return_value=my_permobil,
     ):
-        result = await mock_entry.start_reauth_flow(hass)
+        result = await hass.config_entries.flow.async_init(
+            config_flow.DOMAIN,
+            context={"source": "reauth", "entry_id": reauth_entry.entry_id},
+            data=mock_entry.data,
+        )
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "unknown"
diff --git a/tests/components/plugwise/conftest.py b/tests/components/plugwise/conftest.py
index f18c96d36c5..ace3ccbda60 100644
--- a/tests/components/plugwise/conftest.py
+++ b/tests/components/plugwise/conftest.py
@@ -7,7 +7,6 @@ import json
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from packaging.version import Version
 from plugwise import PlugwiseData
 import pytest
 
@@ -68,7 +67,7 @@ def mock_smile_config_flow() -> Generator[MagicMock]:
         smile.smile_model = "Test Model"
         smile.smile_model_id = "Test Model ID"
         smile.smile_name = "Test Smile Name"
-        smile.connect.return_value = Version("4.3.2")
+        smile.connect.return_value = True
         yield smile
 
 
@@ -90,7 +89,7 @@ def mock_smile_adam() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_open_therm"
         smile.smile_name = "Adam"
-        smile.connect.return_value = Version("3.0.15")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -117,7 +116,7 @@ def mock_smile_adam_2() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_open_therm"
         smile.smile_name = "Adam"
-        smile.connect.return_value = Version("3.6.4")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -144,7 +143,7 @@ def mock_smile_adam_3() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_open_therm"
         smile.smile_name = "Adam"
-        smile.connect.return_value = Version("3.6.4")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -171,7 +170,7 @@ def mock_smile_adam_4() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_open_therm"
         smile.smile_name = "Adam"
-        smile.connect.return_value = Version("3.2.8")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -197,7 +196,7 @@ def mock_smile_anna() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_thermo"
         smile.smile_name = "Smile Anna"
-        smile.connect.return_value = Version("4.0.15")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -223,7 +222,7 @@ def mock_smile_anna_2() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_thermo"
         smile.smile_name = "Smile Anna"
-        smile.connect.return_value = Version("4.0.15")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -249,7 +248,7 @@ def mock_smile_anna_3() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile_thermo"
         smile.smile_name = "Smile Anna"
-        smile.connect.return_value = Version("4.0.15")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -275,7 +274,7 @@ def mock_smile_p1() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile"
         smile.smile_name = "Smile P1"
-        smile.connect.return_value = Version("4.4.2")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -301,7 +300,7 @@ def mock_smile_p1_2() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = "smile"
         smile.smile_name = "Smile P1"
-        smile.connect.return_value = Version("4.4.2")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -327,7 +326,9 @@ def mock_smile_legacy_anna() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = None
         smile.smile_name = "Smile Anna"
-        smile.connect.return_value = Version("1.8.22")
+
+        smile.connect.return_value = True
+
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
@@ -353,7 +354,7 @@ def mock_stretch() -> Generator[MagicMock]:
         smile.smile_model = "Gateway"
         smile.smile_model_id = None
         smile.smile_name = "Stretch"
-        smile.connect.return_value = Version("3.1.11")
+        smile.connect.return_value = True
         all_data = _read_json(chosen_env, "all_data")
         smile.async_update.return_value = PlugwiseData(
             all_data["gateway"], all_data["devices"]
diff --git a/tests/components/powerwall/test_config_flow.py b/tests/components/powerwall/test_config_flow.py
index 1ff1470f81c..5074a289d19 100644
--- a/tests/components/powerwall/test_config_flow.py
+++ b/tests/components/powerwall/test_config_flow.py
@@ -339,11 +339,6 @@ async def test_form_reauth(hass: HomeAssistant) -> None:
     result = await entry.start_reauth_flow(hass)
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
-    flow = hass.config_entries.flow.async_get(result["flow_id"])
-    assert flow["context"]["title_placeholders"] == {
-        "ip_address": VALID_CONFIG[CONF_IP_ADDRESS],
-        "name": entry.title,
-    }
 
     mock_powerwall = await _mock_powerwall_site_name(hass, "My site")
 
diff --git a/tests/components/profiler/test_init.py b/tests/components/profiler/test_init.py
index 37940df437b..3f0e0b92056 100644
--- a/tests/components/profiler/test_init.py
+++ b/tests/components/profiler/test_init.py
@@ -5,7 +5,6 @@ from functools import lru_cache
 import logging
 import os
 from pathlib import Path
-import sys
 from unittest.mock import patch
 
 from freezegun.api import FrozenDateTimeFactory
@@ -71,9 +70,6 @@ async def test_basic_usage(hass: HomeAssistant, tmp_path: Path) -> None:
     await hass.async_block_till_done()
 
 
-@pytest.mark.skipif(
-    sys.version_info >= (3, 13), reason="not yet available on Python 3.13"
-)
 async def test_memory_usage(hass: HomeAssistant, tmp_path: Path) -> None:
     """Test we can setup and the service is registered."""
     test_dir = tmp_path / "profiles"
@@ -105,24 +101,6 @@ async def test_memory_usage(hass: HomeAssistant, tmp_path: Path) -> None:
     await hass.async_block_till_done()
 
 
-@pytest.mark.skipif(sys.version_info < (3, 13), reason="still works on python 3.12")
-async def test_memory_usage_py313(hass: HomeAssistant, tmp_path: Path) -> None:
-    """Test raise an error on python3.13."""
-    entry = MockConfigEntry(domain=DOMAIN)
-    entry.add_to_hass(hass)
-
-    assert await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-    assert hass.services.has_service(DOMAIN, SERVICE_MEMORY)
-    with pytest.raises(
-        HomeAssistantError,
-        match="Memory profiling is not supported on Python 3.13. Please use Python 3.12.",
-    ):
-        await hass.services.async_call(
-            DOMAIN, SERVICE_MEMORY, {CONF_SECONDS: 0.000001}, blocking=True
-        )
-
-
 async def test_object_growth_logging(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
diff --git a/tests/components/prometheus/test_init.py b/tests/components/prometheus/test_init.py
index 043a9cc4389..5952bd25558 100644
--- a/tests/components/prometheus/test_init.py
+++ b/tests/components/prometheus/test_init.py
@@ -31,7 +31,6 @@ from homeassistant.components import (
     switch,
     update,
 )
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.components.climate import (
     ATTR_CURRENT_TEMPERATURE,
     ATTR_FAN_MODE,
@@ -65,6 +64,8 @@ from homeassistant.const import (
     CONTENT_TYPE_TEXT_PLAIN,
     DEGREE,
     PERCENTAGE,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
     STATE_CLOSED,
     STATE_CLOSING,
     STATE_HOME,
@@ -74,7 +75,6 @@ from homeassistant.const import (
     STATE_OPEN,
     STATE_OPENING,
     STATE_UNAVAILABLE,
-    STATE_UNKNOWN,
     UnitOfEnergy,
     UnitOfTemperature,
 )
@@ -643,7 +643,7 @@ async def test_sensor_without_unit(
         domain="sensor",
         friendly_name="Text Unit",
         entity="sensor.text_unit",
-    ).assert_not_in_metrics(body)
+    ).withValue(0.0).assert_in_metrics(body)
 
 
 @pytest.mark.parametrize("namespace", [""])
@@ -717,13 +717,6 @@ async def test_input_number(
         entity="input_number.target_temperature",
     ).withValue(22.7).assert_in_metrics(body)
 
-    EntityMetric(
-        metric_name="input_number_state_celsius",
-        domain="input_number",
-        friendly_name="Converted temperature",
-        entity="input_number.converted_temperature",
-    ).withValue(100).assert_in_metrics(body)
-
 
 @pytest.mark.parametrize("namespace", [""])
 async def test_number(
@@ -1667,15 +1660,13 @@ async def test_disabling_entity(
 
 
 @pytest.mark.parametrize("namespace", [""])
-@pytest.mark.parametrize("unavailable_state", [STATE_UNAVAILABLE, STATE_UNKNOWN])
-async def test_entity_becomes_unavailable(
+async def test_entity_becomes_unavailable_with_export(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,
     client: ClientSessionGenerator,
     sensor_entities: dict[str, er.RegistryEntry],
-    unavailable_state: str,
 ) -> None:
-    """Test an entity that becomes unavailable/unknown is no longer exported."""
+    """Test an entity that becomes unavailable is still exported."""
     data = {**sensor_entities}
 
     await hass.async_block_till_done()
@@ -1702,20 +1693,6 @@ async def test_entity_becomes_unavailable(
         entity="sensor.outside_temperature",
     ).withValue(1).assert_in_metrics(body)
 
-    EntityMetric(
-        metric_name="last_updated_time_seconds",
-        domain="sensor",
-        friendly_name="Outside Temperature",
-        entity="sensor.outside_temperature",
-    ).assert_in_metrics(body)
-
-    EntityMetric(
-        metric_name="battery_level_percent",
-        domain="sensor",
-        friendly_name="Outside Temperature",
-        entity="sensor.outside_temperature",
-    ).withValue(12.0).assert_in_metrics(body)
-
     EntityMetric(
         metric_name="sensor_humidity_percent",
         domain="sensor",
@@ -1737,28 +1714,21 @@ async def test_entity_becomes_unavailable(
         entity="sensor.outside_humidity",
     ).withValue(1).assert_in_metrics(body)
 
-    # Make sensor_1 unavailable/unknown.
+    # Make sensor_1 unavailable.
     set_state_with_entry(
-        hass, data["sensor_1"], unavailable_state, data["sensor_1_attributes"]
+        hass, data["sensor_1"], STATE_UNAVAILABLE, data["sensor_1_attributes"]
     )
 
     await hass.async_block_till_done()
     body = await generate_latest_metrics(client)
 
-    # Check that the availability changed on sensor_1 and the metric with the value is gone.
+    # Check that only the availability changed on sensor_1.
     EntityMetric(
         metric_name="sensor_temperature_celsius",
         domain="sensor",
         friendly_name="Outside Temperature",
         entity="sensor.outside_temperature",
-    ).assert_not_in_metrics(body)
-
-    EntityMetric(
-        metric_name="battery_level_percent",
-        domain="sensor",
-        friendly_name="Outside Temperature",
-        entity="sensor.outside_temperature",
-    ).assert_not_in_metrics(body)
+    ).withValue(15.6).assert_in_metrics(body)
 
     EntityMetric(
         metric_name="state_change_total",
@@ -1774,13 +1744,6 @@ async def test_entity_becomes_unavailable(
         entity="sensor.outside_temperature",
     ).withValue(0.0).assert_in_metrics(body)
 
-    EntityMetric(
-        metric_name="last_updated_time_seconds",
-        domain="sensor",
-        friendly_name="Outside Temperature",
-        entity="sensor.outside_temperature",
-    ).assert_in_metrics(body)
-
     # The other sensor should be unchanged.
     EntityMetric(
         metric_name="sensor_humidity_percent",
@@ -1803,8 +1766,8 @@ async def test_entity_becomes_unavailable(
         entity="sensor.outside_humidity",
     ).withValue(1).assert_in_metrics(body)
 
-    # Bring sensor_1 back and check that it returned.
-    set_state_with_entry(hass, data["sensor_1"], 201.0, data["sensor_1_attributes"])
+    # Bring sensor_1 back and check that it is correct.
+    set_state_with_entry(hass, data["sensor_1"], 200.0, data["sensor_1_attributes"])
 
     await hass.async_block_till_done()
     body = await generate_latest_metrics(client)
@@ -1814,14 +1777,7 @@ async def test_entity_becomes_unavailable(
         domain="sensor",
         friendly_name="Outside Temperature",
         entity="sensor.outside_temperature",
-    ).withValue(201.0).assert_in_metrics(body)
-
-    EntityMetric(
-        metric_name="battery_level_percent",
-        domain="sensor",
-        friendly_name="Outside Temperature",
-        entity="sensor.outside_temperature",
-    ).withValue(12.0).assert_in_metrics(body)
+    ).withValue(200.0).assert_in_metrics(body)
 
     EntityMetric(
         metric_name="state_change_total",
@@ -2252,17 +2208,6 @@ async def input_number_fixture(
     set_state_with_entry(hass, input_number_3, 22.7)
     data["input_number_3"] = input_number_3
 
-    input_number_4 = entity_registry.async_get_or_create(
-        domain=input_number.DOMAIN,
-        platform="test",
-        unique_id="input_number_4",
-        suggested_object_id="converted_temperature",
-        original_name="Converted temperature",
-        unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
-    )
-    set_state_with_entry(hass, input_number_4, 212)
-    data["input_number_4"] = input_number_4
-
     await hass.async_block_till_done()
     return data
 
@@ -2521,7 +2466,7 @@ async def alarm_control_panel_fixture(
         suggested_object_id="alarm_control_panel_1",
         original_name="Alarm Control Panel 1",
     )
-    set_state_with_entry(hass, alarm_control_panel_1, AlarmControlPanelState.ARMED_AWAY)
+    set_state_with_entry(hass, alarm_control_panel_1, STATE_ALARM_ARMED_AWAY)
     data["alarm_control_panel_1"] = alarm_control_panel_1
 
     alarm_control_panel_2 = entity_registry.async_get_or_create(
@@ -2531,7 +2476,7 @@ async def alarm_control_panel_fixture(
         suggested_object_id="alarm_control_panel_2",
         original_name="Alarm Control Panel 2",
     )
-    set_state_with_entry(hass, alarm_control_panel_2, AlarmControlPanelState.ARMED_HOME)
+    set_state_with_entry(hass, alarm_control_panel_2, STATE_ALARM_ARMED_HOME)
     data["alarm_control_panel_2"] = alarm_control_panel_2
 
     await hass.async_block_till_done()
diff --git a/tests/components/prosegur/test_alarm_control_panel.py b/tests/components/prosegur/test_alarm_control_panel.py
index 4e3dcdc3fd8..f66d070f218 100644
--- a/tests/components/prosegur/test_alarm_control_panel.py
+++ b/tests/components/prosegur/test_alarm_control_panel.py
@@ -6,10 +6,7 @@ from unittest.mock import AsyncMock, patch
 from pyprosegur.installation import Status
 import pytest
 
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_DOMAIN,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_FRIENDLY_NAME,
@@ -17,6 +14,9 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_AWAY,
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_DISARM,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
@@ -93,13 +93,9 @@ async def test_connection_error(
 @pytest.mark.parametrize(
     ("code", "alarm_service", "alarm_state"),
     [
-        (Status.ARMED, SERVICE_ALARM_ARM_AWAY, AlarmControlPanelState.ARMED_AWAY),
-        (
-            Status.PARTIALLY,
-            SERVICE_ALARM_ARM_HOME,
-            AlarmControlPanelState.ARMED_HOME,
-        ),
-        (Status.DISARMED, SERVICE_ALARM_DISARM, AlarmControlPanelState.DISARMED),
+        (Status.ARMED, SERVICE_ALARM_ARM_AWAY, STATE_ALARM_ARMED_AWAY),
+        (Status.PARTIALLY, SERVICE_ALARM_ARM_HOME, STATE_ALARM_ARMED_HOME),
+        (Status.DISARMED, SERVICE_ALARM_DISARM, STATE_ALARM_DISARMED),
     ],
 )
 async def test_arm(
diff --git a/tests/components/push/test_camera.py b/tests/components/push/test_camera.py
index 0088aa6a9c2..df296e7cb57 100644
--- a/tests/components/push/test_camera.py
+++ b/tests/components/push/test_camera.py
@@ -4,8 +4,8 @@ from datetime import timedelta
 from http import HTTPStatus
 import io
 
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
diff --git a/tests/components/rachio/test_config_flow.py b/tests/components/rachio/test_config_flow.py
index 586b31b092f..1eaec1bc46e 100644
--- a/tests/components/rachio/test_config_flow.py
+++ b/tests/components/rachio/test_config_flow.py
@@ -183,16 +183,3 @@ async def test_form_homekit_ignored(hass: HomeAssistant) -> None:
     )
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "already_configured"
-
-
-async def test_options_flow(hass: HomeAssistant) -> None:
-    """Test option flow."""
-    entry = MockConfigEntry(domain=DOMAIN, data={CONF_API_KEY: "api_key"})
-    entry.add_to_hass(hass)
-
-    result = await hass.config_entries.options.async_init(entry.entry_id)
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "init"
-
-    # This should be improved at a later stage to increase test coverage
-    hass.config_entries.options.async_abort(result["flow_id"])
diff --git a/tests/components/recorder/auto_repairs/statistics/test_duplicates.py b/tests/components/recorder/auto_repairs/statistics/test_duplicates.py
index 9e287d13594..a2cf41578c7 100644
--- a/tests/components/recorder/auto_repairs/statistics/test_duplicates.py
+++ b/tests/components/recorder/auto_repairs/statistics/test_duplicates.py
@@ -189,9 +189,6 @@ async def test_delete_metadata_duplicates(
         patch.object(
             recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
         ),
-        patch.object(
-            recorder.migration, "non_live_data_migration_needed", return_value=False
-        ),
         patch(
             "homeassistant.components.recorder.core.create_engine",
             new=_create_engine_28,
@@ -309,9 +306,6 @@ async def test_delete_metadata_duplicates_many(
         patch.object(
             recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
         ),
-        patch.object(
-            recorder.migration, "non_live_data_migration_needed", return_value=False
-        ),
         patch(
             "homeassistant.components.recorder.core.create_engine",
             new=_create_engine_28,
diff --git a/tests/components/recorder/common.py b/tests/components/recorder/common.py
index 60168f5e6ef..18e58d9e572 100644
--- a/tests/components/recorder/common.py
+++ b/tests/components/recorder/common.py
@@ -445,8 +445,9 @@ def old_db_schema(schema_version_postfix: str) -> Iterator[None]:
 
     with (
         patch.object(recorder, "db_schema", old_db_schema),
-        patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
+        patch.object(
+            recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
+        ),
         patch.object(core, "StatesMeta", old_db_schema.StatesMeta),
         patch.object(core, "EventTypes", old_db_schema.EventTypes),
         patch.object(core, "EventData", old_db_schema.EventData),
diff --git a/tests/components/recorder/test_migrate.py b/tests/components/recorder/test_migrate.py
index 14978bee5a9..0e473b702ef 100644
--- a/tests/components/recorder/test_migrate.py
+++ b/tests/components/recorder/test_migrate.py
@@ -95,13 +95,7 @@ async def test_schema_update_calls(
             hass,
             engine,
             session_maker,
-            migration.SchemaValidationStatus(
-                current_version=0,
-                migration_needed=True,
-                non_live_data_migration_needed=True,
-                schema_errors=set(),
-                start_version=0,
-            ),
+            migration.SchemaValidationStatus(0, True, set(), 0),
             42,
         ),
         call(
@@ -109,13 +103,7 @@ async def test_schema_update_calls(
             hass,
             engine,
             session_maker,
-            migration.SchemaValidationStatus(
-                current_version=42,
-                migration_needed=True,
-                non_live_data_migration_needed=True,
-                schema_errors=set(),
-                start_version=0,
-            ),
+            migration.SchemaValidationStatus(42, True, set(), 0),
             db_schema.SCHEMA_VERSION,
         ),
     ]
diff --git a/tests/components/recorder/test_migration_from_schema_32.py b/tests/components/recorder/test_migration_from_schema_32.py
index dcf2d792407..8a54a752989 100644
--- a/tests/components/recorder/test_migration_from_schema_32.py
+++ b/tests/components/recorder/test_migration_from_schema_32.py
@@ -49,7 +49,6 @@ from .common import (
     async_recorder_block_till_done,
     async_wait_recording_done,
 )
-from .conftest import instrument_migration
 
 from tests.common import async_test_home_assistant
 from tests.typing import RecorderInstanceGenerator
@@ -106,8 +105,9 @@ def db_schema_32():
 
     with (
         patch.object(recorder, "db_schema", old_db_schema),
-        patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
+        patch.object(
+            recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
+        ),
         patch.object(core, "StatesMeta", old_db_schema.StatesMeta),
         patch.object(core, "EventTypes", old_db_schema.EventTypes),
         patch.object(core, "EventData", old_db_schema.EventData),
@@ -120,13 +120,13 @@ def db_schema_32():
         yield
 
 
-@pytest.mark.parametrize("persistent_database", [True])
 @pytest.mark.parametrize("enable_migrate_event_context_ids", [True])
-@pytest.mark.usefixtures("hass_storage")  # Prevent test hass from writing to storage
+@pytest.mark.usefixtures("db_schema_32")
 async def test_migrate_events_context_ids(
-    async_test_recorder: RecorderInstanceGenerator,
+    hass: HomeAssistant, recorder_mock: Recorder
 ) -> None:
     """Test we can migrate old uuid context ids and ulid context ids to binary format."""
+    await async_wait_recording_done(hass)
     importlib.import_module(SCHEMA_MODULE)
     old_db_schema = sys.modules[SCHEMA_MODULE]
 
@@ -219,28 +219,18 @@ async def test_migrate_events_context_ids(
                 )
             )
 
-    # Create database with old schema
-    with (
-        patch.object(recorder, "db_schema", old_db_schema),
-        patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
-        patch.object(migration.EventsContextIDMigration, "migrate_data"),
-        patch(CREATE_ENGINE_TARGET, new=_create_engine_test),
-    ):
-        async with (
-            async_test_home_assistant() as hass,
-            async_test_recorder(hass) as instance,
-        ):
-            await instance.async_add_executor_job(_insert_events)
+    await recorder_mock.async_add_executor_job(_insert_events)
 
-            await async_wait_recording_done(hass)
-            now = dt_util.utcnow()
-            expected_ulid_fallback_start = ulid_to_bytes(ulid_at_time(now.timestamp()))[
-                0:6
-            ]
-            await _async_wait_migration_done(hass)
+    await async_wait_recording_done(hass)
+    now = dt_util.utcnow()
+    expected_ulid_fallback_start = ulid_to_bytes(ulid_at_time(now.timestamp()))[0:6]
+    await _async_wait_migration_done(hass)
 
-            await hass.async_stop()
-            await hass.async_block_till_done()
+    with freeze_time(now):
+        # This is a threadsafe way to add a task to the recorder
+        migrator = migration.EventsContextIDMigration(None, None)
+        recorder_mock.queue_task(migrator.task(migrator))
+        await _async_wait_migration_done(hass)
 
     def _object_as_dict(obj):
         return {c.key: getattr(obj, c.key) for c in inspect(obj).mapper.column_attrs}
@@ -266,38 +256,7 @@ async def test_migrate_events_context_ids(
             assert len(events) == 6
             return {event.event_type: _object_as_dict(event) for event in events}
 
-    # Run again with new schema, let migration run
-    async with async_test_home_assistant() as hass:
-        with freeze_time(now), instrument_migration(hass) as instrumented_migration:
-            async with async_test_recorder(
-                hass, wait_recorder=False, wait_recorder_setup=False
-            ) as instance:
-                # Check the context ID migrator is considered non-live
-                assert recorder.util.async_migration_is_live(hass) is False
-                instrumented_migration.migration_stall.set()
-                instance.recorder_and_worker_thread_ids.add(threading.get_ident())
-
-                await hass.async_block_till_done()
-                await async_wait_recording_done(hass)
-                await async_wait_recording_done(hass)
-
-                events_by_type = await instance.async_add_executor_job(
-                    _fetch_migrated_events
-                )
-
-                migration_changes = await instance.async_add_executor_job(
-                    _get_migration_id, hass
-                )
-
-                # Check the index which will be removed by the migrator no longer exists
-                with session_scope(hass=hass) as session:
-                    assert (
-                        get_index_by_name(session, "events", "ix_events_context_id")
-                        is None
-                    )
-
-                await hass.async_stop()
-                await hass.async_block_till_done()
+    events_by_type = await recorder_mock.async_add_executor_job(_fetch_migrated_events)
 
     old_uuid_context_id_event = events_by_type["old_uuid_context_id_event"]
     assert old_uuid_context_id_event["context_id"] is None
@@ -368,11 +327,18 @@ async def test_migrate_events_context_ids(
         event_with_garbage_context_id_no_time_fired_ts["context_parent_id_bin"] is None
     )
 
+    migration_changes = await recorder_mock.async_add_executor_job(
+        _get_migration_id, hass
+    )
     assert (
         migration_changes[migration.EventsContextIDMigration.migration_id]
         == migration.EventsContextIDMigration.migration_version
     )
 
+    # Check the index which will be removed by the migrator no longer exists
+    with session_scope(hass=hass) as session:
+        assert get_index_by_name(session, "events", "ix_events_context_id") is None
+
 
 @pytest.mark.parametrize("persistent_database", [True])
 @pytest.mark.parametrize("enable_migrate_event_context_ids", [True])
@@ -482,13 +448,13 @@ async def test_finish_migrate_events_context_ids(
         await hass.async_block_till_done()
 
 
-@pytest.mark.parametrize("persistent_database", [True])
 @pytest.mark.parametrize("enable_migrate_state_context_ids", [True])
-@pytest.mark.usefixtures("hass_storage")  # Prevent test hass from writing to storage
+@pytest.mark.usefixtures("db_schema_32")
 async def test_migrate_states_context_ids(
-    async_test_recorder: RecorderInstanceGenerator,
+    hass: HomeAssistant, recorder_mock: Recorder
 ) -> None:
     """Test we can migrate old uuid context ids and ulid context ids to binary format."""
+    await async_wait_recording_done(hass)
     importlib.import_module(SCHEMA_MODULE)
     old_db_schema = sys.modules[SCHEMA_MODULE]
 
@@ -563,24 +529,12 @@ async def test_migrate_states_context_ids(
                 )
             )
 
-    # Create database with old schema
-    with (
-        patch.object(recorder, "db_schema", old_db_schema),
-        patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
-        patch.object(migration.StatesContextIDMigration, "migrate_data"),
-        patch(CREATE_ENGINE_TARGET, new=_create_engine_test),
-    ):
-        async with (
-            async_test_home_assistant() as hass,
-            async_test_recorder(hass) as instance,
-        ):
-            await instance.async_add_executor_job(_insert_states)
+    await recorder_mock.async_add_executor_job(_insert_states)
 
-            await async_wait_recording_done(hass)
-            await _async_wait_migration_done(hass)
-
-            await hass.async_stop()
-            await hass.async_block_till_done()
+    await async_wait_recording_done(hass)
+    migrator = migration.StatesContextIDMigration(None, None)
+    recorder_mock.queue_task(migrator.task(migrator))
+    await _async_wait_migration_done(hass)
 
     def _object_as_dict(obj):
         return {c.key: getattr(obj, c.key) for c in inspect(obj).mapper.column_attrs}
@@ -606,38 +560,9 @@ async def test_migrate_states_context_ids(
             assert len(events) == 6
             return {state.entity_id: _object_as_dict(state) for state in events}
 
-    # Run again with new schema, let migration run
-    async with async_test_home_assistant() as hass:
-        with instrument_migration(hass) as instrumented_migration:
-            async with async_test_recorder(
-                hass, wait_recorder=False, wait_recorder_setup=False
-            ) as instance:
-                # Check the context ID migrator is considered non-live
-                assert recorder.util.async_migration_is_live(hass) is False
-                instrumented_migration.migration_stall.set()
-                instance.recorder_and_worker_thread_ids.add(threading.get_ident())
-
-                await hass.async_block_till_done()
-                await async_wait_recording_done(hass)
-                await async_wait_recording_done(hass)
-
-                states_by_entity_id = await instance.async_add_executor_job(
-                    _fetch_migrated_states
-                )
-
-                migration_changes = await instance.async_add_executor_job(
-                    _get_migration_id, hass
-                )
-
-                # Check the index which will be removed by the migrator no longer exists
-                with session_scope(hass=hass) as session:
-                    assert (
-                        get_index_by_name(session, "states", "ix_states_context_id")
-                        is None
-                    )
-
-                await hass.async_stop()
-                await hass.async_block_till_done()
+    states_by_entity_id = await recorder_mock.async_add_executor_job(
+        _fetch_migrated_states
+    )
 
     old_uuid_context_id = states_by_entity_id["state.old_uuid_context_id"]
     assert old_uuid_context_id["context_id"] is None
@@ -712,11 +637,18 @@ async def test_migrate_states_context_ids(
         == b"\n\xe2\x97\x99\xeeNOE\x81\x16\xf5\x82\xd7\xd3\xeee"
     )
 
+    migration_changes = await recorder_mock.async_add_executor_job(
+        _get_migration_id, hass
+    )
     assert (
         migration_changes[migration.StatesContextIDMigration.migration_id]
         == migration.StatesContextIDMigration.migration_version
     )
 
+    # Check the index which will be removed by the migrator no longer exists
+    with session_scope(hass=hass) as session:
+        assert get_index_by_name(session, "states", "ix_states_context_id") is None
+
 
 @pytest.mark.parametrize("persistent_database", [True])
 @pytest.mark.parametrize("enable_migrate_state_context_ids", [True])
@@ -865,7 +797,6 @@ async def test_migrate_event_type_ids(
     migrator = migration.EventTypeIDMigration(None, None)
     recorder_mock.queue_task(migrator.task(migrator))
     await _async_wait_migration_done(hass)
-    await _async_wait_migration_done(hass)
 
     def _fetch_migrated_events():
         with session_scope(hass=hass, read_only=True) as session:
@@ -956,7 +887,6 @@ async def test_migrate_entity_ids(hass: HomeAssistant, recorder_mock: Recorder)
     migrator = migration.EntityIDMigration(old_db_schema.SCHEMA_VERSION, {})
     recorder_mock.queue_task(migration.CommitBeforeMigrationTask(migrator))
     await _async_wait_migration_done(hass)
-    await _async_wait_migration_done(hass)
 
     def _fetch_migrated_states():
         with session_scope(hass=hass, read_only=True) as session:
@@ -1036,7 +966,6 @@ async def test_post_migrate_entity_ids(
     migrator = migration.EntityIDPostMigration(None, None)
     recorder_mock.queue_task(migrator.task(migrator))
     await _async_wait_migration_done(hass)
-    await _async_wait_migration_done(hass)
 
     def _fetch_migrated_states():
         with session_scope(hass=hass, read_only=True) as session:
@@ -1095,7 +1024,6 @@ async def test_migrate_null_entity_ids(
     migrator = migration.EntityIDMigration(old_db_schema.SCHEMA_VERSION, {})
     recorder_mock.queue_task(migration.CommitBeforeMigrationTask(migrator))
     await _async_wait_migration_done(hass)
-    await _async_wait_migration_done(hass)
 
     def _fetch_migrated_states():
         with session_scope(hass=hass, read_only=True) as session:
@@ -1180,7 +1108,6 @@ async def test_migrate_null_event_type_ids(
     migrator = migration.EventTypeIDMigration(None, None)
     recorder_mock.queue_task(migrator.task(migrator))
     await _async_wait_migration_done(hass)
-    await _async_wait_migration_done(hass)
 
     def _fetch_migrated_events():
         with session_scope(hass=hass, read_only=True) as session:
@@ -1836,7 +1763,6 @@ async def test_migrate_times(
     with (
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
         patch(CREATE_ENGINE_TARGET, new=_create_engine_test),
     ):
         async with (
diff --git a/tests/components/recorder/test_migration_run_time_migrations_remember.py b/tests/components/recorder/test_migration_run_time_migrations_remember.py
index 93fa16b8364..880e4d6d61e 100644
--- a/tests/components/recorder/test_migration_run_time_migrations_remember.py
+++ b/tests/components/recorder/test_migration_run_time_migrations_remember.py
@@ -94,8 +94,9 @@ async def test_migration_changes_prevent_trying_to_migrate_again(
     # Start with db schema that needs migration (version 32)
     with (
         patch.object(recorder, "db_schema", old_db_schema),
-        patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
+        patch.object(
+            recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
+        ),
         patch.object(core, "StatesMeta", old_db_schema.StatesMeta),
         patch.object(core, "EventTypes", old_db_schema.EventTypes),
         patch.object(core, "EventData", old_db_schema.EventData),
diff --git a/tests/components/recorder/test_statistics_v23_migration.py b/tests/components/recorder/test_statistics_v23_migration.py
index 1f9be0cabee..53c59635e8c 100644
--- a/tests/components/recorder/test_statistics_v23_migration.py
+++ b/tests/components/recorder/test_statistics_v23_migration.py
@@ -168,9 +168,6 @@ async def test_delete_duplicates(
         patch.object(
             recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
         ),
-        patch.object(
-            recorder.migration, "non_live_data_migration_needed", return_value=False
-        ),
         patch(
             CREATE_ENGINE_TARGET,
             new=partial(
@@ -355,9 +352,6 @@ async def test_delete_duplicates_many(
         patch.object(
             recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
         ),
-        patch.object(
-            recorder.migration, "non_live_data_migration_needed", return_value=False
-        ),
         patch(
             CREATE_ENGINE_TARGET,
             new=partial(
@@ -521,9 +515,6 @@ async def test_delete_duplicates_non_identical(
         patch.object(
             recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
         ),
-        patch.object(
-            recorder.migration, "non_live_data_migration_needed", return_value=False
-        ),
         patch(
             CREATE_ENGINE_TARGET,
             new=partial(
@@ -647,9 +638,6 @@ async def test_delete_duplicates_short_term(
         patch.object(
             recorder.migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION
         ),
-        patch.object(
-            recorder.migration, "non_live_data_migration_needed", return_value=False
-        ),
         patch(
             CREATE_ENGINE_TARGET,
             new=partial(
diff --git a/tests/components/recorder/test_util.py b/tests/components/recorder/test_util.py
index 4904bdecc4d..ad68e415df5 100644
--- a/tests/components/recorder/test_util.py
+++ b/tests/components/recorder/test_util.py
@@ -1134,32 +1134,19 @@ Retryable = OperationalError(None, None, BaseException(RETRYABLE_MYSQL_ERRORS[0]
 
 
 @pytest.mark.parametrize(
-    ("side_effect", "dialect", "retval", "expected_result", "num_calls"),
+    ("side_effect", "dialect", "expected_result", "num_calls"),
     [
-        (None, SupportedDialect.MYSQL, None, does_not_raise(), 1),
-        (ValueError, SupportedDialect.MYSQL, None, pytest.raises(ValueError), 1),
-        (
-            NonRetryable,
-            SupportedDialect.MYSQL,
-            None,
-            pytest.raises(OperationalError),
-            1,
-        ),
-        (Retryable, SupportedDialect.MYSQL, None, pytest.raises(OperationalError), 5),
-        (
-            NonRetryable,
-            SupportedDialect.SQLITE,
-            None,
-            pytest.raises(OperationalError),
-            1,
-        ),
-        (Retryable, SupportedDialect.SQLITE, None, pytest.raises(OperationalError), 1),
+        (None, SupportedDialect.MYSQL, does_not_raise(), 1),
+        (ValueError, SupportedDialect.MYSQL, pytest.raises(ValueError), 1),
+        (NonRetryable, SupportedDialect.MYSQL, pytest.raises(OperationalError), 1),
+        (Retryable, SupportedDialect.MYSQL, pytest.raises(OperationalError), 5),
+        (NonRetryable, SupportedDialect.SQLITE, pytest.raises(OperationalError), 1),
+        (Retryable, SupportedDialect.SQLITE, pytest.raises(OperationalError), 1),
     ],
 )
 def test_database_job_retry_wrapper(
     side_effect: Any,
     dialect: str,
-    retval: Any,
     expected_result: AbstractContextManager,
     num_calls: int,
 ) -> None:
@@ -1170,13 +1157,12 @@ def test_database_job_retry_wrapper(
     instance.engine.dialect.name = dialect
     mock_job = Mock(side_effect=side_effect)
 
-    @database_job_retry_wrapper("test", 5)
+    @database_job_retry_wrapper(description="test")
     def job(instance, *args, **kwargs) -> None:
         mock_job()
-        return retval
 
     with expected_result:
-        assert job(instance) == retval
+        job(instance)
 
     assert len(mock_job.mock_calls) == num_calls
 
diff --git a/tests/components/recorder/test_v32_migration.py b/tests/components/recorder/test_v32_migration.py
index d59486b61f0..9a616959174 100644
--- a/tests/components/recorder/test_v32_migration.py
+++ b/tests/components/recorder/test_v32_migration.py
@@ -110,7 +110,6 @@ async def test_migrate_times(
     with (
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
         patch.object(migration, "post_migrate_entity_ids", return_value=False),
         patch.object(migration.EventsContextIDMigration, "migrate_data"),
         patch.object(migration.StatesContextIDMigration, "migrate_data"),
@@ -267,7 +266,6 @@ async def test_migrate_can_resume_entity_id_post_migration(
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
         patch.object(migration.EventIDPostMigration, "migrate_data"),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
         patch.object(migration, "post_migrate_entity_ids", return_value=False),
         patch.object(core, "StatesMeta", old_db_schema.StatesMeta),
         patch.object(core, "EventTypes", old_db_schema.EventTypes),
@@ -387,7 +385,6 @@ async def test_migrate_can_resume_ix_states_event_id_removed(
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
         patch.object(migration.EventIDPostMigration, "migrate_data"),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
         patch.object(migration, "post_migrate_entity_ids", return_value=False),
         patch.object(core, "StatesMeta", old_db_schema.StatesMeta),
         patch.object(core, "EventTypes", old_db_schema.EventTypes),
@@ -520,7 +517,6 @@ async def test_out_of_disk_space_while_rebuild_states_table(
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
         patch.object(migration.EventIDPostMigration, "migrate_data"),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
         patch.object(migration, "post_migrate_entity_ids", return_value=False),
         patch.object(core, "StatesMeta", old_db_schema.StatesMeta),
         patch.object(core, "EventTypes", old_db_schema.EventTypes),
@@ -698,7 +694,6 @@ async def test_out_of_disk_space_while_removing_foreign_key(
         patch.object(recorder, "db_schema", old_db_schema),
         patch.object(migration, "SCHEMA_VERSION", old_db_schema.SCHEMA_VERSION),
         patch.object(migration.EventIDPostMigration, "migrate_data"),
-        patch.object(migration, "non_live_data_migration_needed", return_value=False),
         patch.object(migration, "post_migrate_entity_ids", return_value=False),
         patch.object(core, "StatesMeta", old_db_schema.StatesMeta),
         patch.object(core, "EventTypes", old_db_schema.EventTypes),
diff --git a/tests/components/renault/test_config_flow.py b/tests/components/renault/test_config_flow.py
index 234d1dca069..69bfdf0842e 100644
--- a/tests/components/renault/test_config_flow.py
+++ b/tests/components/renault/test_config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.components.renault.const import (
     CONF_LOCALE,
     DOMAIN,
 )
-from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import aiohttp_client
@@ -224,10 +224,7 @@ async def test_reauth(hass: HomeAssistant, config_entry: MockConfigEntry) -> Non
     result = await config_entry.start_reauth_flow(hass)
 
     assert result["type"] is FlowResultType.FORM
-    assert result["description_placeholders"] == {
-        CONF_NAME: "Mock Title",
-        CONF_USERNAME: "email@test.com",
-    }
+    assert result["description_placeholders"] == {CONF_USERNAME: "email@test.com"}
     assert result["errors"] == {}
 
     # Failed credentials
@@ -241,10 +238,7 @@ async def test_reauth(hass: HomeAssistant, config_entry: MockConfigEntry) -> Non
         )
 
     assert result2["type"] is FlowResultType.FORM
-    assert result2["description_placeholders"] == {
-        CONF_NAME: "Mock Title",
-        CONF_USERNAME: "email@test.com",
-    }
+    assert result2["description_placeholders"] == {CONF_USERNAME: "email@test.com"}
     assert result2["errors"] == {"base": "invalid_credentials"}
 
     # Valid credentials
diff --git a/tests/components/reolink/conftest.py b/tests/components/reolink/conftest.py
index 94192c3502e..f9b8504f14f 100644
--- a/tests/components/reolink/conftest.py
+++ b/tests/components/reolink/conftest.py
@@ -1,12 +1,10 @@
 """Setup the Reolink tests."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, MagicMock, create_autospec, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 from reolink_aio.api import Chime
-from reolink_aio.baichuan import Baichuan
-from reolink_aio.exceptions import ReolinkError
 
 from homeassistant.components.reolink.config_flow import DEFAULT_PROTOCOL
 from homeassistant.components.reolink.const import CONF_USE_HTTPS, DOMAIN
@@ -120,12 +118,6 @@ def reolink_connect_class() -> Generator[MagicMock]:
         host_mock.doorbell_led_list.return_value = ["stayoff", "auto"]
         host_mock.auto_track_method.return_value = 3
         host_mock.daynight_state.return_value = "Black&White"
-
-        # Baichuan
-        host_mock.baichuan = create_autospec(Baichuan)
-        # Disable tcp push by default for tests
-        host_mock.baichuan.events_active = False
-        host_mock.baichuan.subscribe_events.side_effect = ReolinkError("Test error")
         yield host_mock_class
 
 
diff --git a/tests/components/reolink/snapshots/test_diagnostics.ambr b/tests/components/reolink/snapshots/test_diagnostics.ambr
index 71c5397fbd1..33e9c78c550 100644
--- a/tests/components/reolink/snapshots/test_diagnostics.ambr
+++ b/tests/components/reolink/snapshots/test_diagnostics.ambr
@@ -118,8 +118,8 @@
         'null': 2,
       }),
       'GetPtzCurPos': dict({
-        '0': 2,
-        'null': 2,
+        '0': 1,
+        'null': 1,
       }),
       'GetPtzGuard': dict({
         '0': 2,
diff --git a/tests/components/reolink/test_binary_sensor.py b/tests/components/reolink/test_binary_sensor.py
index 71318c27b25..a2c5ba07aa8 100644
--- a/tests/components/reolink/test_binary_sensor.py
+++ b/tests/components/reolink/test_binary_sensor.py
@@ -1,6 +1,5 @@
 """Test the Reolink binary sensor platform."""
 
-from collections.abc import Callable
 from unittest.mock import MagicMock, patch
 
 from freezegun.api import FrozenDateTimeFactory
@@ -9,8 +8,9 @@ from homeassistant.components.reolink import DEVICE_UPDATE_INTERVAL
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
-from .conftest import TEST_DUO_MODEL, TEST_HOST_MODEL, TEST_NVR_NAME
+from .conftest import TEST_DUO_MODEL, TEST_NVR_NAME
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.typing import ClientSessionGenerator
@@ -22,6 +22,7 @@ async def test_motion_sensor(
     freezer: FrozenDateTimeFactory,
     config_entry: MockConfigEntry,
     reolink_connect: MagicMock,
+    entity_registry: er.EntityRegistry,
 ) -> None:
     """Test binary sensor entity with motion sensor."""
     reolink_connect.model = TEST_DUO_MODEL
@@ -41,7 +42,7 @@ async def test_motion_sensor(
 
     assert hass.states.get(entity_id).state == STATE_OFF
 
-    # test ONVIF webhook callback
+    # test webhook callback
     reolink_connect.motion_detected.return_value = True
     reolink_connect.ONVIF_event_callback.return_value = [0]
     webhook_id = config_entry.runtime_data.host.webhook_id
@@ -49,43 +50,3 @@ async def test_motion_sensor(
     await client.post(f"/api/webhook/{webhook_id}", data="test_data")
 
     assert hass.states.get(entity_id).state == STATE_ON
-
-
-async def test_tcp_callback(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    reolink_connect: MagicMock,
-) -> None:
-    """Test tcp callback using motion sensor."""
-
-    class callback_mock_class:
-        callback_func = None
-
-        def register_callback(
-            self, callback_id: str, callback: Callable[[], None], *args, **key_args
-        ) -> None:
-            if callback_id.endswith("_motion"):
-                self.callback_func = callback
-
-    callback_mock = callback_mock_class()
-
-    reolink_connect.model = TEST_HOST_MODEL
-    reolink_connect.baichuan.events_active = True
-    reolink_connect.baichuan.subscribe_events.reset_mock(side_effect=True)
-    reolink_connect.baichuan.register_callback = callback_mock.register_callback
-    reolink_connect.motion_detected.return_value = True
-
-    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.BINARY_SENSOR]):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    entity_id = f"{Platform.BINARY_SENSOR}.{TEST_NVR_NAME}_motion"
-    assert hass.states.get(entity_id).state == STATE_ON
-
-    # simulate a TCP push callback
-    reolink_connect.motion_detected.return_value = False
-    assert callback_mock.callback_func is not None
-    callback_mock.callback_func()
-
-    assert hass.states.get(entity_id).state == STATE_OFF
diff --git a/tests/components/reolink/test_host.py b/tests/components/reolink/test_host.py
index 2286ca5d266..77d156c9486 100644
--- a/tests/components/reolink/test_host.py
+++ b/tests/components/reolink/test_host.py
@@ -14,14 +14,12 @@ from homeassistant.components.reolink import DEVICE_UPDATE_INTERVAL
 from homeassistant.components.reolink.host import (
     FIRST_ONVIF_LONG_POLL_TIMEOUT,
     FIRST_ONVIF_TIMEOUT,
-    FIRST_TCP_PUSH_TIMEOUT,
     LONG_POLL_COOLDOWN,
     LONG_POLL_ERROR_COOLDOWN,
     POLL_INTERVAL_NO_PUSH,
 )
 from homeassistant.components.webhook import async_handle_webhook
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -33,56 +31,6 @@ from tests.components.diagnostics import get_diagnostics_for_config_entry
 from tests.typing import ClientSessionGenerator
 
 
-async def test_setup_with_tcp_push(
-    hass: HomeAssistant,
-    freezer: FrozenDateTimeFactory,
-    config_entry: MockConfigEntry,
-    reolink_connect: MagicMock,
-) -> None:
-    """Test successful setup of the integration with TCP push callbacks."""
-    reolink_connect.baichuan.events_active = True
-    reolink_connect.baichuan.subscribe_events.reset_mock(side_effect=True)
-    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.BINARY_SENSOR]):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    freezer.tick(timedelta(seconds=FIRST_TCP_PUSH_TIMEOUT))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    # ONVIF push subscription not called
-    assert not reolink_connect.subscribe.called
-
-    reolink_connect.baichuan.events_active = False
-    reolink_connect.baichuan.subscribe_events.side_effect = ReolinkError("Test error")
-
-
-async def test_unloading_with_tcp_push(
-    hass: HomeAssistant,
-    config_entry: MockConfigEntry,
-    reolink_connect: MagicMock,
-) -> None:
-    """Test successful unloading of the integration with TCP push callbacks."""
-    reolink_connect.baichuan.events_active = True
-    reolink_connect.baichuan.subscribe_events.reset_mock(side_effect=True)
-    with patch("homeassistant.components.reolink.PLATFORMS", [Platform.BINARY_SENSOR]):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert config_entry.state is ConfigEntryState.LOADED
-
-    reolink_connect.baichuan.unsubscribe_events.side_effect = ReolinkError("Test error")
-
-    # Unload the config entry
-    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
-
-    reolink_connect.baichuan.events_active = False
-    reolink_connect.baichuan.subscribe_events.side_effect = ReolinkError("Test error")
-    reolink_connect.baichuan.unsubscribe_events.reset_mock(side_effect=True)
-
-
 async def test_webhook_callback(
     hass: HomeAssistant,
     hass_client_no_auth: ClientSessionGenerator,
@@ -454,8 +402,3 @@ async def test_diagnostics_event_connection(
 
     diag = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
     assert diag["event connection"] == "ONVIF push"
-
-    # set TCP push as active
-    reolink_connect.baichuan.events_active = True
-    diag = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
-    assert diag["event connection"] == "TCP push"
diff --git a/tests/components/reolink/test_init.py b/tests/components/reolink/test_init.py
index 67ac2db8262..e1e67ee2129 100644
--- a/tests/components/reolink/test_init.py
+++ b/tests/components/reolink/test_init.py
@@ -15,10 +15,10 @@ from homeassistant.components.reolink import (
     NUM_CRED_ERRORS,
 )
 from homeassistant.components.reolink.const import DOMAIN
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_PORT, STATE_OFF, STATE_UNAVAILABLE, Platform
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
diff --git a/tests/components/rest/test_init.py b/tests/components/rest/test_init.py
index c401362d604..02dfe6364ff 100644
--- a/tests/components/rest/test_init.py
+++ b/tests/components/rest/test_init.py
@@ -12,7 +12,6 @@ from homeassistant import config as hass_config
 from homeassistant.components.rest.const import DOMAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
-    CONF_PACKAGES,
     SERVICE_RELOAD,
     STATE_UNAVAILABLE,
     UnitOfInformation,
@@ -469,7 +468,7 @@ async def test_config_schema_via_packages(hass: HomeAssistant) -> None:
         "pack_11": {"rest": {"resource": "http://url1"}},
         "pack_list": {"rest": [{"resource": "http://url2"}]},
     }
-    config = {HOMEASSISTANT_DOMAIN: {CONF_PACKAGES: packages}}
+    config = {HOMEASSISTANT_DOMAIN: {hass_config.CONF_PACKAGES: packages}}
     await hass_config.merge_packages_config(hass, config, packages)
 
     assert len(config) == 2
diff --git a/tests/components/risco/test_alarm_control_panel.py b/tests/components/risco/test_alarm_control_panel.py
index 8caef1fbfc4..9b554ddbf28 100644
--- a/tests/components/risco/test_alarm_control_panel.py
+++ b/tests/components/risco/test_alarm_control_panel.py
@@ -9,7 +9,6 @@ import pytest
 from homeassistant.components.alarm_control_panel import (
     DOMAIN as ALARM_DOMAIN,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.components.risco import CannotConnectError, UnauthorizedError
 from homeassistant.components.risco.const import DOMAIN
@@ -19,6 +18,13 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_ARM_NIGHT,
     SERVICE_ALARM_DISARM,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
@@ -36,25 +42,25 @@ SECOND_LOCAL_ENTITY_ID = "alarm_control_panel.name_1"
 
 CODES_REQUIRED_OPTIONS = {"code_arm_required": True, "code_disarm_required": True}
 TEST_RISCO_TO_HA = {
-    "arm": AlarmControlPanelState.ARMED_AWAY,
-    "partial_arm": AlarmControlPanelState.ARMED_HOME,
-    "A": AlarmControlPanelState.ARMED_HOME,
-    "B": AlarmControlPanelState.ARMED_HOME,
-    "C": AlarmControlPanelState.ARMED_NIGHT,
-    "D": AlarmControlPanelState.ARMED_NIGHT,
+    "arm": STATE_ALARM_ARMED_AWAY,
+    "partial_arm": STATE_ALARM_ARMED_HOME,
+    "A": STATE_ALARM_ARMED_HOME,
+    "B": STATE_ALARM_ARMED_HOME,
+    "C": STATE_ALARM_ARMED_NIGHT,
+    "D": STATE_ALARM_ARMED_NIGHT,
 }
 TEST_FULL_RISCO_TO_HA = {
     **TEST_RISCO_TO_HA,
-    "D": AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
+    "D": STATE_ALARM_ARMED_CUSTOM_BYPASS,
 }
 TEST_HA_TO_RISCO = {
-    AlarmControlPanelState.ARMED_AWAY: "arm",
-    AlarmControlPanelState.ARMED_HOME: "partial_arm",
-    AlarmControlPanelState.ARMED_NIGHT: "C",
+    STATE_ALARM_ARMED_AWAY: "arm",
+    STATE_ALARM_ARMED_HOME: "partial_arm",
+    STATE_ALARM_ARMED_NIGHT: "C",
 }
 TEST_FULL_HA_TO_RISCO = {
     **TEST_HA_TO_RISCO,
-    AlarmControlPanelState.ARMED_CUSTOM_BYPASS: "D",
+    STATE_ALARM_ARMED_CUSTOM_BYPASS: "D",
 }
 CUSTOM_MAPPING_OPTIONS = {
     "risco_states_to_ha": TEST_RISCO_TO_HA,
@@ -204,7 +210,7 @@ async def test_cloud_states(
             hass,
             two_part_cloud_alarm,
             "triggered",
-            AlarmControlPanelState.TRIGGERED,
+            STATE_ALARM_TRIGGERED,
             entity_id,
             partition_id,
         )
@@ -212,7 +218,7 @@ async def test_cloud_states(
             hass,
             two_part_cloud_alarm,
             "arming",
-            AlarmControlPanelState.ARMING,
+            STATE_ALARM_ARMING,
             entity_id,
             partition_id,
         )
@@ -220,7 +226,7 @@ async def test_cloud_states(
             hass,
             two_part_cloud_alarm,
             "armed",
-            AlarmControlPanelState.ARMED_AWAY,
+            STATE_ALARM_ARMED_AWAY,
             entity_id,
             partition_id,
         )
@@ -228,7 +234,7 @@ async def test_cloud_states(
             hass,
             two_part_cloud_alarm,
             "partially_armed",
-            AlarmControlPanelState.ARMED_HOME,
+            STATE_ALARM_ARMED_HOME,
             entity_id,
             partition_id,
         )
@@ -236,7 +242,7 @@ async def test_cloud_states(
             hass,
             two_part_cloud_alarm,
             "disarmed",
-            AlarmControlPanelState.DISARMED,
+            STATE_ALARM_DISARMED,
             entity_id,
             partition_id,
         )
@@ -251,7 +257,7 @@ async def test_cloud_states(
                 hass,
                 two_part_cloud_alarm,
                 "partially_armed",
-                AlarmControlPanelState.ARMED_NIGHT,
+                STATE_ALARM_ARMED_NIGHT,
                 entity_id,
                 partition_id,
             )
@@ -589,7 +595,7 @@ async def test_local_states(
             hass,
             two_part_local_alarm,
             "triggered",
-            AlarmControlPanelState.TRIGGERED,
+            STATE_ALARM_TRIGGERED,
             entity_id,
             partition_id,
             callback,
@@ -598,7 +604,7 @@ async def test_local_states(
             hass,
             two_part_local_alarm,
             "arming",
-            AlarmControlPanelState.ARMING,
+            STATE_ALARM_ARMING,
             entity_id,
             partition_id,
             callback,
@@ -607,7 +613,7 @@ async def test_local_states(
             hass,
             two_part_local_alarm,
             "armed",
-            AlarmControlPanelState.ARMED_AWAY,
+            STATE_ALARM_ARMED_AWAY,
             entity_id,
             partition_id,
             callback,
@@ -616,7 +622,7 @@ async def test_local_states(
             hass,
             two_part_local_alarm,
             "partially_armed",
-            AlarmControlPanelState.ARMED_HOME,
+            STATE_ALARM_ARMED_HOME,
             entity_id,
             partition_id,
             callback,
@@ -625,7 +631,7 @@ async def test_local_states(
             hass,
             two_part_local_alarm,
             "disarmed",
-            AlarmControlPanelState.DISARMED,
+            STATE_ALARM_DISARMED,
             entity_id,
             partition_id,
             callback,
@@ -641,7 +647,7 @@ async def test_local_states(
                 hass,
                 two_part_local_alarm,
                 "partially_armed",
-                AlarmControlPanelState.ARMED_NIGHT,
+                STATE_ALARM_ARMED_NIGHT,
                 entity_id,
                 partition_id,
                 callback,
diff --git a/tests/components/roborock/snapshots/test_diagnostics.ambr b/tests/components/roborock/snapshots/test_diagnostics.ambr
index 26ecb729312..805a498041a 100644
--- a/tests/components/roborock/snapshots/test_diagnostics.ambr
+++ b/tests/components/roborock/snapshots/test_diagnostics.ambr
@@ -102,7 +102,6 @@
                 'id': '120',
                 'mode': 'ro',
                 'name': '错误代码',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -110,7 +109,6 @@
                 'id': '121',
                 'mode': 'ro',
                 'name': '设备状态',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -118,7 +116,6 @@
                 'id': '122',
                 'mode': 'ro',
                 'name': '设备电量',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -126,7 +123,6 @@
                 'id': '123',
                 'mode': 'rw',
                 'name': '清扫模式',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -134,7 +130,6 @@
                 'id': '124',
                 'mode': 'rw',
                 'name': '拖地模式',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -142,7 +137,6 @@
                 'id': '125',
                 'mode': 'rw',
                 'name': '主刷寿命',
-                'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
                 'type': 'VALUE',
               }),
               dict({
@@ -150,7 +144,6 @@
                 'id': '126',
                 'mode': 'rw',
                 'name': '边刷寿命',
-                'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
                 'type': 'VALUE',
               }),
               dict({
@@ -158,7 +151,6 @@
                 'id': '127',
                 'mode': 'rw',
                 'name': '滤网寿命',
-                'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
                 'type': 'VALUE',
               }),
               dict({
@@ -389,7 +381,6 @@
                 'id': '120',
                 'mode': 'ro',
                 'name': '错误代码',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -397,7 +388,6 @@
                 'id': '121',
                 'mode': 'ro',
                 'name': '设备状态',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -405,7 +395,6 @@
                 'id': '122',
                 'mode': 'ro',
                 'name': '设备电量',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -413,7 +402,6 @@
                 'id': '123',
                 'mode': 'rw',
                 'name': '清扫模式',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -421,7 +409,6 @@
                 'id': '124',
                 'mode': 'rw',
                 'name': '拖地模式',
-                'property': '{"range": []}',
                 'type': 'ENUM',
               }),
               dict({
@@ -429,7 +416,6 @@
                 'id': '125',
                 'mode': 'rw',
                 'name': '主刷寿命',
-                'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
                 'type': 'VALUE',
               }),
               dict({
@@ -437,7 +423,6 @@
                 'id': '126',
                 'mode': 'rw',
                 'name': '边刷寿命',
-                'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
                 'type': 'VALUE',
               }),
               dict({
@@ -445,7 +430,6 @@
                 'id': '127',
                 'mode': 'rw',
                 'name': '滤网寿命',
-                'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
                 'type': 'VALUE',
               }),
               dict({
diff --git a/tests/components/roku/test_media_player.py b/tests/components/roku/test_media_player.py
index 5f8a41d16ac..03b1999ae83 100644
--- a/tests/components/roku/test_media_player.py
+++ b/tests/components/roku/test_media_player.py
@@ -38,6 +38,7 @@ from homeassistant.components.roku.const import (
 )
 from homeassistant.components.stream import FORMAT_CONTENT_TYPE, HLS_PROVIDER
 from homeassistant.components.websocket_api import TYPE_RESULT
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_NAME,
@@ -59,7 +60,6 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
diff --git a/tests/components/roomba/test_config_flow.py b/tests/components/roomba/test_config_flow.py
index dedccc14249..8139e42d43d 100644
--- a/tests/components/roomba/test_config_flow.py
+++ b/tests/components/roomba/test_config_flow.py
@@ -8,12 +8,7 @@ from roombapy import RoombaConnectionError, RoombaInfo
 
 from homeassistant.components import dhcp, zeroconf
 from homeassistant.components.roomba import config_flow
-from homeassistant.components.roomba.const import (
-    CONF_BLID,
-    CONF_CONTINUOUS,
-    DEFAULT_DELAY,
-    DOMAIN,
-)
+from homeassistant.components.roomba.const import CONF_BLID, CONF_CONTINUOUS, DOMAIN
 from homeassistant.config_entries import (
     SOURCE_DHCP,
     SOURCE_IGNORE,
@@ -211,7 +206,7 @@ async def test_form_user_discovery_and_password_fetch(hass: HomeAssistant) -> No
     assert result3["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -336,7 +331,7 @@ async def test_form_user_discovery_manual_and_auto_password_fetch(
     assert result4["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -473,7 +468,7 @@ async def test_form_user_discovery_no_devices_found_and_auto_password_fetch(
     assert result3["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -546,7 +541,7 @@ async def test_form_user_discovery_no_devices_found_and_password_fetch_fails(
     assert result4["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -682,7 +677,7 @@ async def test_form_user_discovery_and_password_fetch_gets_connection_refused(
     assert result4["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -743,7 +738,7 @@ async def test_dhcp_discovery_and_roomba_discovery_finds(
     assert result2["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -821,7 +816,7 @@ async def test_dhcp_discovery_falls_back_to_manual(
     assert result4["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -891,7 +886,7 @@ async def test_dhcp_discovery_no_devices_falls_back_to_manual(
     assert result3["data"] == {
         CONF_BLID: "BLID",
         CONF_CONTINUOUS: True,
-        CONF_DELAY: DEFAULT_DELAY,
+        CONF_DELAY: 1,
         CONF_HOST: MOCK_IP,
         CONF_PASSWORD: "password",
     }
@@ -1124,10 +1119,10 @@ async def test_options_flow(
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={CONF_CONTINUOUS: True, CONF_DELAY: DEFAULT_DELAY},
+        user_input={CONF_CONTINUOUS: True, CONF_DELAY: 1},
     )
     await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] == {CONF_CONTINUOUS: True, CONF_DELAY: DEFAULT_DELAY}
-    assert config_entry.options == {CONF_CONTINUOUS: True, CONF_DELAY: DEFAULT_DELAY}
+    assert result["data"] == {CONF_CONTINUOUS: True, CONF_DELAY: 1}
+    assert config_entry.options == {CONF_CONTINUOUS: True, CONF_DELAY: 1}
diff --git a/tests/components/rtsp_to_webrtc/test_config_flow.py b/tests/components/rtsp_to_webrtc/test_config_flow.py
index d3afa80b0b4..5daf9400396 100644
--- a/tests/components/rtsp_to_webrtc/test_config_flow.py
+++ b/tests/components/rtsp_to_webrtc/test_config_flow.py
@@ -7,11 +7,11 @@ from unittest.mock import patch
 import rtsp_to_webrtc
 
 from homeassistant import config_entries
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.components.rtsp_to_webrtc import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .conftest import ComponentSetup
 
diff --git a/tests/components/rtsp_to_webrtc/test_init.py b/tests/components/rtsp_to_webrtc/test_init.py
index 85155855a09..cb4d5f7a131 100644
--- a/tests/components/rtsp_to_webrtc/test_init.py
+++ b/tests/components/rtsp_to_webrtc/test_init.py
@@ -86,11 +86,12 @@ async def test_setup_communication_failure(
     assert entries[0].state is ConfigEntryState.SETUP_RETRY
 
 
-@pytest.mark.usefixtures("mock_camera", "rtsp_to_webrtc_client")
 async def test_offer_for_stream_source(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
+    mock_camera: Any,
+    rtsp_to_webrtc_client: Any,
     setup_integration: ComponentSetup,
 ) -> None:
     """Test successful response from RTSPtoWebRTC server."""
@@ -102,33 +103,21 @@ async def test_offer_for_stream_source(
     )
 
     client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
+    await client.send_json(
         {
-            "type": "camera/webrtc/offer",
+            "id": 1,
+            "type": "camera/web_rtc_offer",
             "entity_id": "camera.demo_camera",
             "offer": OFFER_SDP,
         }
     )
-
     response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "answer",
-        "answer": ANSWER_SDP,
-    }
+    assert response.get("id") == 1
+    assert response.get("type") == TYPE_RESULT
+    assert response.get("success")
+    assert "result" in response
+    assert response["result"].get("answer") == ANSWER_SDP
+    assert "error" not in response
 
     # Validate request parameters were sent correctly
     assert len(aioclient_mock.mock_calls) == 1
@@ -138,11 +127,12 @@ async def test_offer_for_stream_source(
     }
 
 
-@pytest.mark.usefixtures("mock_camera", "rtsp_to_webrtc_client")
 async def test_offer_failure(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
     hass_ws_client: WebSocketGenerator,
+    mock_camera: Any,
+    rtsp_to_webrtc_client: Any,
     setup_integration: ComponentSetup,
 ) -> None:
     """Test a transient failure talking to RTSPtoWebRTC server."""
@@ -154,31 +144,20 @@ async def test_offer_failure(
     )
 
     client = await hass_ws_client(hass)
-    await client.send_json_auto_id(
+    await client.send_json(
         {
-            "type": "camera/webrtc/offer",
+            "id": 2,
+            "type": "camera/web_rtc_offer",
             "entity_id": "camera.demo_camera",
             "offer": OFFER_SDP,
         }
     )
-
     response = await client.receive_json()
-    assert response["type"] == TYPE_RESULT
-    assert response["success"]
-    subscription_id = response["id"]
-
-    # Session id
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"]["type"] == "session"
-
-    # Answer
-    response = await client.receive_json()
-    assert response["id"] == subscription_id
-    assert response["type"] == "event"
-    assert response["event"] == {
-        "type": "error",
-        "code": "webrtc_offer_failed",
-        "message": "RTSPtoWebRTC server communication failure: ",
-    }
+    assert response.get("id") == 2
+    assert response.get("type") == TYPE_RESULT
+    assert "success" in response
+    assert not response.get("success")
+    assert "error" in response
+    assert response["error"].get("code") == "web_rtc_offer_failed"
+    assert "message" in response["error"]
+    assert "RTSPtoWebRTC server communication failure" in response["error"]["message"]
diff --git a/tests/components/russound_rio/__init__.py b/tests/components/russound_rio/__init__.py
index d0e6d77f1ee..96171071907 100644
--- a/tests/components/russound_rio/__init__.py
+++ b/tests/components/russound_rio/__init__.py
@@ -1,13 +1 @@
 """Tests for the Russound RIO integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
-    """Fixture for setting up the component."""
-    config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/russound_rio/conftest.py b/tests/components/russound_rio/conftest.py
index 09cccd7d83f..91d009f13f4 100644
--- a/tests/components/russound_rio/conftest.py
+++ b/tests/components/russound_rio/conftest.py
@@ -1,19 +1,16 @@
 """Test fixtures for Russound RIO integration."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, Mock, patch
+from unittest.mock import AsyncMock, patch
 
-from aiorussound import Controller, RussoundTcpConnectionHandler, Source
-from aiorussound.rio import ZoneControlSurface
-from aiorussound.util import controller_device_str, zone_device_str
 import pytest
 
 from homeassistant.components.russound_rio.const import DOMAIN
 from homeassistant.core import HomeAssistant
 
-from .const import HARDWARE_MAC, HOST, MOCK_CONFIG, MODEL, PORT
+from .const import HARDWARE_MAC, MOCK_CONFIG, MOCK_CONTROLLERS, MODEL
 
-from tests.common import MockConfigEntry, load_json_object_fixture
+from tests.common import MockConfigEntry
 
 
 @pytest.fixture
@@ -28,13 +25,15 @@ def mock_setup_entry():
 @pytest.fixture
 def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
     """Mock a Russound RIO config entry."""
-    return MockConfigEntry(
+    entry = MockConfigEntry(
         domain=DOMAIN, data=MOCK_CONFIG, unique_id=HARDWARE_MAC, title=MODEL
     )
+    entry.add_to_hass(hass)
+    return entry
 
 
 @pytest.fixture
-def mock_russound_client() -> Generator[AsyncMock]:
+def mock_russound() -> Generator[AsyncMock]:
     """Mock the Russound RIO client."""
     with (
         patch(
@@ -42,32 +41,8 @@ def mock_russound_client() -> Generator[AsyncMock]:
         ) as mock_client,
         patch(
             "homeassistant.components.russound_rio.config_flow.RussoundClient",
-            new=mock_client,
+            return_value=mock_client,
         ),
     ):
-        client = mock_client.return_value
-        zones = {
-            int(k): ZoneControlSurface.from_dict(v)
-            for k, v in load_json_object_fixture("get_zones.json", DOMAIN).items()
-        }
-        client.sources = {
-            int(k): Source.from_dict(v)
-            for k, v in load_json_object_fixture("get_sources.json", DOMAIN).items()
-        }
-        for k, v in zones.items():
-            v.device_str = zone_device_str(1, k)
-            v.fetch_current_source = Mock(
-                side_effect=lambda current_source=v.current_source: client.sources.get(
-                    int(current_source)
-                )
-            )
-
-        client.controllers = {
-            1: Controller(
-                1, "MCA-C5", client, controller_device_str(1), HARDWARE_MAC, None, zones
-            )
-        }
-        client.connection_handler = RussoundTcpConnectionHandler(HOST, PORT)
-        client.is_connected = Mock(return_value=True)
-        client.unregister_state_update_callbacks.return_value = True
-        yield client
+        mock_client.controllers = MOCK_CONTROLLERS
+        yield mock_client
diff --git a/tests/components/russound_rio/const.py b/tests/components/russound_rio/const.py
index 3d2924693d2..527f4fe3377 100644
--- a/tests/components/russound_rio/const.py
+++ b/tests/components/russound_rio/const.py
@@ -2,8 +2,6 @@
 
 from collections import namedtuple
 
-from homeassistant.components.media_player import DOMAIN as MP_DOMAIN
-
 HOST = "127.0.0.1"
 PORT = 9621
 MODEL = "MCA-C5"
@@ -16,7 +14,3 @@ MOCK_CONFIG = {
 
 _CONTROLLER = namedtuple("Controller", ["mac_address", "controller_type"])  # noqa: PYI024
 MOCK_CONTROLLERS = {1: _CONTROLLER(mac_address=HARDWARE_MAC, controller_type=MODEL)}
-
-DEVICE_NAME = "mca_c5"
-NAME_ZONE_1 = "backyard"
-ENTITY_ID_ZONE_1 = f"{MP_DOMAIN}.{DEVICE_NAME}_{NAME_ZONE_1}"
diff --git a/tests/components/russound_rio/fixtures/get_sources.json b/tests/components/russound_rio/fixtures/get_sources.json
deleted file mode 100644
index e39d702b8a1..00000000000
--- a/tests/components/russound_rio/fixtures/get_sources.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "1": {
-    "name": "Aux",
-    "type": "Miscellaneous Audio"
-  },
-  "2": {
-    "name": "Spotify",
-    "type": "Russound Media Streamer"
-  }
-}
diff --git a/tests/components/russound_rio/fixtures/get_zones.json b/tests/components/russound_rio/fixtures/get_zones.json
deleted file mode 100644
index 396310339b3..00000000000
--- a/tests/components/russound_rio/fixtures/get_zones.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "1": {
-    "name": "Backyard",
-    "volume": "10",
-    "status": "ON",
-    "enabled": "True",
-    "current_source": "1"
-  },
-  "2": {
-    "name": "Kitchen",
-    "volume": "50",
-    "status": "OFF",
-    "enabled": "True",
-    "current_source": "2"
-  },
-  "3": {
-    "name": "Bedroom",
-    "volume": "10",
-    "status": "OFF",
-    "enabled": "False"
-  }
-}
diff --git a/tests/components/russound_rio/snapshots/test_init.ambr b/tests/components/russound_rio/snapshots/test_init.ambr
deleted file mode 100644
index fcd59dd06f7..00000000000
--- a/tests/components/russound_rio/snapshots/test_init.ambr
+++ /dev/null
@@ -1,37 +0,0 @@
-# serializer version: 1
-# name: test_device_info
-  DeviceRegistryEntrySnapshot({
-    'area_id': None,
-    'config_entries': <ANY>,
-    'configuration_url': 'http://127.0.0.1',
-    'connections': set({
-      tuple(
-        'mac',
-        '00:11:22:33:44:55',
-      ),
-    }),
-    'disabled_by': None,
-    'entry_type': None,
-    'hw_version': None,
-    'id': <ANY>,
-    'identifiers': set({
-      tuple(
-        'russound_rio',
-        '00:11:22:33:44:55',
-      ),
-    }),
-    'is_new': False,
-    'labels': set({
-    }),
-    'manufacturer': 'Russound',
-    'model': 'MCA-C5',
-    'model_id': None,
-    'name': 'MCA-C5',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': None,
-    'suggested_area': None,
-    'sw_version': None,
-    'via_device_id': None,
-  })
-# ---
diff --git a/tests/components/russound_rio/test_config_flow.py b/tests/components/russound_rio/test_config_flow.py
index cf754852731..9461fe1d5be 100644
--- a/tests/components/russound_rio/test_config_flow.py
+++ b/tests/components/russound_rio/test_config_flow.py
@@ -11,7 +11,7 @@ from .const import MOCK_CONFIG, MODEL
 
 
 async def test_form(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_russound_client: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_russound: AsyncMock
 ) -> None:
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
@@ -32,13 +32,13 @@ async def test_form(
 
 
 async def test_form_cannot_connect(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_russound_client: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_russound: AsyncMock
 ) -> None:
     """Test we handle cannot connect error."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_USER}
     )
-    mock_russound_client.connect.side_effect = TimeoutError
+    mock_russound.connect.side_effect = TimeoutError
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         MOCK_CONFIG,
@@ -48,7 +48,7 @@ async def test_form_cannot_connect(
     assert result["errors"] == {"base": "cannot_connect"}
 
     # Recover with correct information
-    mock_russound_client.connect.side_effect = None
+    mock_russound.connect.side_effect = None
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         MOCK_CONFIG,
@@ -61,7 +61,7 @@ async def test_form_cannot_connect(
 
 
 async def test_import(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_russound_client: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_russound: AsyncMock
 ) -> None:
     """Test we import a config entry."""
     result = await hass.config_entries.flow.async_init(
@@ -77,10 +77,10 @@ async def test_import(
 
 
 async def test_import_cannot_connect(
-    hass: HomeAssistant, mock_russound_client: AsyncMock
+    hass: HomeAssistant, mock_russound: AsyncMock
 ) -> None:
     """Test we handle import cannot connect error."""
-    mock_russound_client.connect.side_effect = TimeoutError
+    mock_russound.connect.side_effect = TimeoutError
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_IMPORT}, data=MOCK_CONFIG
diff --git a/tests/components/russound_rio/test_init.py b/tests/components/russound_rio/test_init.py
deleted file mode 100644
index 6787ee37c79..00000000000
--- a/tests/components/russound_rio/test_init.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""Tests for the Russound RIO integration."""
-
-from unittest.mock import AsyncMock
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.russound_rio.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry
-
-
-async def test_config_entry_not_ready(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_russound_client: AsyncMock,
-) -> None:
-    """Test the Cambridge Audio configuration entry not ready."""
-    mock_russound_client.connect.side_effect = TimeoutError
-    await setup_integration(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
-
-    mock_russound_client.connect = AsyncMock(return_value=True)
-
-
-async def test_device_info(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_russound_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    device_registry: dr.DeviceRegistry,
-) -> None:
-    """Test device registry integration."""
-    await setup_integration(hass, mock_config_entry)
-    device_entry = device_registry.async_get_device(
-        identifiers={(DOMAIN, mock_config_entry.unique_id)}
-    )
-    assert device_entry is not None
-    assert device_entry == snapshot
diff --git a/tests/components/russound_rio/test_media_player.py b/tests/components/russound_rio/test_media_player.py
deleted file mode 100644
index e720e2c7f65..00000000000
--- a/tests/components/russound_rio/test_media_player.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""Tests for the Russound RIO media player."""
-
-from unittest.mock import AsyncMock
-
-from aiorussound.models import CallbackType, PlayStatus
-import pytest
-
-from homeassistant.const import (
-    STATE_BUFFERING,
-    STATE_IDLE,
-    STATE_OFF,
-    STATE_ON,
-    STATE_PAUSED,
-    STATE_PLAYING,
-)
-from homeassistant.core import HomeAssistant
-
-from . import setup_integration
-from .const import ENTITY_ID_ZONE_1
-
-from tests.common import MockConfigEntry
-
-
-async def mock_state_update(client: AsyncMock) -> None:
-    """Trigger a callback in the media player."""
-    for callback in client.register_state_update_callbacks.call_args_list:
-        await callback[0][0](client, CallbackType.STATE)
-
-
-@pytest.mark.parametrize(
-    ("zone_status", "source_play_status", "media_player_state"),
-    [
-        (True, None, STATE_ON),
-        (True, PlayStatus.PLAYING, STATE_PLAYING),
-        (True, PlayStatus.PAUSED, STATE_PAUSED),
-        (True, PlayStatus.TRANSITIONING, STATE_BUFFERING),
-        (True, PlayStatus.STOPPED, STATE_IDLE),
-        (False, None, STATE_OFF),
-        (False, PlayStatus.STOPPED, STATE_OFF),
-    ],
-)
-async def test_entity_state(
-    hass: HomeAssistant,
-    mock_russound_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    zone_status: bool,
-    source_play_status: PlayStatus | None,
-    media_player_state: str,
-) -> None:
-    """Test media player state."""
-    await setup_integration(hass, mock_config_entry)
-    mock_russound_client.controllers[1].zones[1].status = zone_status
-    mock_russound_client.sources[1].play_status = source_play_status
-    await mock_state_update(mock_russound_client)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(ENTITY_ID_ZONE_1)
-    assert state.state == media_player_state
diff --git a/tests/components/schlage/conftest.py b/tests/components/schlage/conftest.py
index f774b8cfb89..5ff8d045606 100644
--- a/tests/components/schlage/conftest.py
+++ b/tests/components/schlage/conftest.py
@@ -91,7 +91,6 @@ def mock_lock_attrs() -> dict[str, Any]:
         "is_locked": False,
         "is_jammed": False,
         "battery_level": 20,
-        "auto_lock_time": 15,
         "firmware_version": "1.0",
         "lock_and_leave_enabled": True,
         "beeper_enabled": True,
diff --git a/tests/components/schlage/test_select.py b/tests/components/schlage/test_select.py
deleted file mode 100644
index c27fd4c8813..00000000000
--- a/tests/components/schlage/test_select.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""Test Schlage select."""
-
-from unittest.mock import Mock
-
-from homeassistant.components.select import (
-    ATTR_OPTION,
-    DOMAIN as SELECT_DOMAIN,
-    SERVICE_SELECT_OPTION,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant
-
-
-async def test_select(
-    hass: HomeAssistant, mock_lock: Mock, mock_added_config_entry: ConfigEntry
-) -> None:
-    """Test the auto-lock time select entity."""
-    entity_id = "select.vault_door_auto_lock_time"
-
-    select = hass.states.get(entity_id)
-    assert select is not None
-    assert select.state == "15"
-
-    await hass.services.async_call(
-        SELECT_DOMAIN,
-        SERVICE_SELECT_OPTION,
-        {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: "30"},
-        blocking=True,
-    )
-    mock_lock.set_auto_lock_time.assert_called_once_with(30)
diff --git a/tests/components/sense/__init__.py b/tests/components/sense/__init__.py
index d604bcba737..bf0a87737b9 100644
--- a/tests/components/sense/__init__.py
+++ b/tests/components/sense/__init__.py
@@ -1,23 +1 @@
 """Tests for the Sense integration."""
-
-from unittest.mock import patch
-
-from homeassistant.components.sense.const import DOMAIN
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
-
-from tests.common import MockConfigEntry
-
-
-async def setup_platform(
-    hass: HomeAssistant, config_entry: MockConfigEntry, platform: Platform
-) -> MockConfigEntry:
-    """Set up the Sense platform."""
-    config_entry.add_to_hass(hass)
-
-    with patch("homeassistant.components.sense.PLATFORMS", [platform]):
-        assert await async_setup_component(hass, DOMAIN, {})
-    await hass.async_block_till_done()
-
-    return config_entry
diff --git a/tests/components/sense/conftest.py b/tests/components/sense/conftest.py
deleted file mode 100644
index 7cf1626f40e..00000000000
--- a/tests/components/sense/conftest.py
+++ /dev/null
@@ -1,84 +0,0 @@
-"""Common methods for Sense."""
-
-from __future__ import annotations
-
-from collections.abc import Generator
-import datetime
-from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
-
-import pytest
-from sense_energy import Scale
-
-from homeassistant.components.sense.binary_sensor import SenseDevice
-from homeassistant.components.sense.const import DOMAIN
-
-from .const import (
-    DEVICE_1_DAY_ENERGY,
-    DEVICE_1_ID,
-    DEVICE_1_NAME,
-    DEVICE_1_POWER,
-    DEVICE_2_DAY_ENERGY,
-    DEVICE_2_ID,
-    DEVICE_2_NAME,
-    DEVICE_2_POWER,
-    MOCK_CONFIG,
-    MONITOR_ID,
-)
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.sense.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture
-def config_entry() -> MockConfigEntry:
-    """Mock sense config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        data=MOCK_CONFIG,
-        unique_id="test-email",
-    )
-
-
-@pytest.fixture
-def mock_sense() -> Generator[MagicMock]:
-    """Mock an ASyncSenseable object with a split foundation."""
-    with patch("homeassistant.components.sense.ASyncSenseable", autospec=True) as mock:
-        gateway = mock.return_value
-        gateway.sense_monitor_id = MONITOR_ID
-        gateway.get_monitor_data.return_value = None
-        gateway.update_realtime.return_value = None
-        gateway.fetch_devices.return_value = None
-        gateway.update_trend_data.return_value = None
-
-        type(gateway).active_power = PropertyMock(return_value=100)
-        type(gateway).active_solar_power = PropertyMock(return_value=500)
-        type(gateway).active_voltage = PropertyMock(return_value=[120, 240])
-        gateway.get_stat.return_value = 15
-        gateway.trend_start.return_value = datetime.datetime.fromisoformat(
-            "2024-01-01 01:01:00+00:00"
-        )
-
-        device_1 = SenseDevice(DEVICE_1_ID)
-        device_1.name = DEVICE_1_NAME
-        device_1.icon = "car"
-        device_1.is_on = False
-        device_1.power_w = DEVICE_1_POWER
-        device_1.energy_kwh[Scale.DAY] = DEVICE_1_DAY_ENERGY
-
-        device_2 = SenseDevice(DEVICE_2_ID)
-        device_2.name = DEVICE_2_NAME
-        device_2.icon = "stove"
-        device_2.is_on = False
-        device_2.power_w = DEVICE_2_POWER
-        device_2.energy_kwh[Scale.DAY] = DEVICE_2_DAY_ENERGY
-        type(gateway).devices = PropertyMock(return_value=[device_1, device_2])
-
-        yield gateway
diff --git a/tests/components/sense/const.py b/tests/components/sense/const.py
deleted file mode 100644
index d040c0bc38c..00000000000
--- a/tests/components/sense/const.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Cosntants for the Sense integration tests."""
-
-MONITOR_ID = "456"
-
-MOCK_CONFIG = {
-    "timeout": 6,
-    "email": "test-email",
-    "password": "test-password",
-    "access_token": "ABC",
-    "user_id": "123",
-    "monitor_id": MONITOR_ID,
-    "device_id": "789",
-    "refresh_token": "XYZ",
-}
-
-
-DEVICE_1_NAME = "Car"
-DEVICE_1_ID = "abc123"
-DEVICE_1_ICON = "car-electric"
-DEVICE_1_POWER = 100.0
-DEVICE_1_DAY_ENERGY = 500
-
-DEVICE_2_NAME = "Oven"
-DEVICE_2_ID = "def456"
-DEVICE_2_ICON = "stove"
-DEVICE_2_POWER = 50.0
-DEVICE_2_DAY_ENERGY = 42
-
-MONITOR_ID = "12345"
diff --git a/tests/components/sense/snapshots/test_binary_sensor.ambr b/tests/components/sense/snapshots/test_binary_sensor.ambr
deleted file mode 100644
index 339830b16d3..00000000000
--- a/tests/components/sense/snapshots/test_binary_sensor.ambr
+++ /dev/null
@@ -1,99 +0,0 @@
-# serializer version: 1
-# name: test_binary_sensors[binary_sensor.car_power-entry]
-  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.car_power',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
-    'original_icon': 'mdi:car-electric',
-    'original_name': 'Power',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-abc123',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_binary_sensors[binary_sensor.car_power-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'power',
-      'friendly_name': 'Car Power',
-      'icon': 'mdi:car-electric',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.car_power',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_binary_sensors[binary_sensor.oven_power-entry]
-  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.oven_power',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.POWER: 'power'>,
-    'original_icon': 'mdi:stove',
-    'original_name': 'Power',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-def456',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_binary_sensors[binary_sensor.oven_power-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'power',
-      'friendly_name': 'Oven Power',
-      'icon': 'mdi:stove',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.oven_power',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/sense/snapshots/test_sensor.ambr b/tests/components/sense/snapshots/test_sensor.ambr
deleted file mode 100644
index 4a3507880a1..00000000000
--- a/tests/components/sense/snapshots/test_sensor.ambr
+++ /dev/null
@@ -1,2680 +0,0 @@
-# serializer version: 1
-# name: test_sensors[sensor.car_bill_energy-entry]
-  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.car_bill_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:car-electric',
-    'original_name': 'Bill energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'bill_energy',
-    'unique_id': '12345-abc123-bill-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.car_bill_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Car Bill energy',
-      'icon': 'mdi:car-electric',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.car_bill_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.car_daily_energy-entry]
-  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.car_daily_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:car-electric',
-    'original_name': 'Daily energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'daily_energy',
-    'unique_id': '12345-abc123-daily-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.car_daily_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Car Daily energy',
-      'icon': 'mdi:car-electric',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.car_daily_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '500',
-  })
-# ---
-# name: test_sensors[sensor.car_monthly_energy-entry]
-  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.car_monthly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:car-electric',
-    'original_name': 'Monthly energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'monthly_energy',
-    'unique_id': '12345-abc123-monthly-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.car_monthly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Car Monthly energy',
-      'icon': 'mdi:car-electric',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.car_monthly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.car_power-entry]
-  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.car_power',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': 'mdi:car-electric',
-    'original_name': 'Power',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-abc123-usage',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.car_power-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'power',
-      'friendly_name': 'Car Power',
-      'icon': 'mdi:car-electric',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.car_power',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '100.0',
-  })
-# ---
-# name: test_sensors[sensor.car_weekly_energy-entry]
-  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.car_weekly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:car-electric',
-    'original_name': 'Weekly energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'weekly_energy',
-    'unique_id': '12345-abc123-weekly-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.car_weekly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Car Weekly energy',
-      'icon': 'mdi:car-electric',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.car_weekly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.car_yearly_energy-entry]
-  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.car_yearly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:car-electric',
-    'original_name': 'Yearly energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'yearly_energy',
-    'unique_id': '12345-abc123-yearly-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.car_yearly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Car Yearly energy',
-      'icon': 'mdi:car-electric',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.car_yearly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.oven_bill_energy-entry]
-  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.oven_bill_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:stove',
-    'original_name': 'Bill energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'bill_energy',
-    'unique_id': '12345-def456-bill-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.oven_bill_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Oven Bill energy',
-      'icon': 'mdi:stove',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.oven_bill_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.oven_daily_energy-entry]
-  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.oven_daily_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:stove',
-    'original_name': 'Daily energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'daily_energy',
-    'unique_id': '12345-def456-daily-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.oven_daily_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Oven Daily energy',
-      'icon': 'mdi:stove',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.oven_daily_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '42',
-  })
-# ---
-# name: test_sensors[sensor.oven_monthly_energy-entry]
-  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.oven_monthly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:stove',
-    'original_name': 'Monthly energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'monthly_energy',
-    'unique_id': '12345-def456-monthly-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.oven_monthly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Oven Monthly energy',
-      'icon': 'mdi:stove',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.oven_monthly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.oven_power-entry]
-  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.oven_power',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': 'mdi:stove',
-    'original_name': 'Power',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-def456-usage',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.oven_power-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'power',
-      'friendly_name': 'Oven Power',
-      'icon': 'mdi:stove',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.oven_power',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '50.0',
-  })
-# ---
-# name: test_sensors[sensor.oven_weekly_energy-entry]
-  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.oven_weekly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:stove',
-    'original_name': 'Weekly energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'weekly_energy',
-    'unique_id': '12345-def456-weekly-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.oven_weekly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Oven Weekly energy',
-      'icon': 'mdi:stove',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.oven_weekly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.oven_yearly_energy-entry]
-  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.oven_yearly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 2,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': 'mdi:stove',
-    'original_name': 'Yearly energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'yearly_energy',
-    'unique_id': '12345-def456-yearly-energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.oven_yearly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Oven Yearly energy',
-      'icon': 'mdi:stove',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.oven_yearly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_energy-entry]
-  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.sense_12345_bill_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Bill Energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-bill-usage',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Bill Energy',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_bill_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_from_grid-entry]
-  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.sense_12345_bill_from_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Bill From Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-bill-from_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_from_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Bill From Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_bill_from_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_net_production-entry]
-  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.sense_12345_bill_net_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Bill Net Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-bill-net_production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_net_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Bill Net Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_bill_net_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_net_production_percentage-entry]
-  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.sense_12345_bill_net_production_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Bill Net Production Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-bill-production_pct',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_net_production_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Bill Net Production Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_bill_net_production_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_production-entry]
-  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.sense_12345_bill_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Bill Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-bill-production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Bill Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_bill_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_solar_powered_percentage-entry]
-  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.sense_12345_bill_solar_powered_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Bill Solar Powered Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-bill-solar_powered',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_solar_powered_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Bill Solar Powered Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_bill_solar_powered_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_to_grid-entry]
-  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.sense_12345_bill_to_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Bill To Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-bill-to_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_bill_to_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Bill To Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_bill_to_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_energy-entry]
-  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.sense_12345_daily_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Daily Energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-daily-usage',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Daily Energy',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_daily_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_from_grid-entry]
-  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.sense_12345_daily_from_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Daily From Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-daily-from_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_from_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Daily From Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_daily_from_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_net_production-entry]
-  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.sense_12345_daily_net_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Daily Net Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-daily-net_production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_net_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Daily Net Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_daily_net_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_net_production_percentage-entry]
-  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.sense_12345_daily_net_production_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Daily Net Production Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-daily-production_pct',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_net_production_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Daily Net Production Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_daily_net_production_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_production-entry]
-  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.sense_12345_daily_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Daily Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-daily-production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Daily Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_daily_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_solar_powered_percentage-entry]
-  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.sense_12345_daily_solar_powered_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Daily Solar Powered Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-daily-solar_powered',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_solar_powered_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Daily Solar Powered Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_daily_solar_powered_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_to_grid-entry]
-  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.sense_12345_daily_to_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Daily To Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-daily-to_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_daily_to_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Daily To Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_daily_to_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_energy-entry]
-  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.sense_12345_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': None,
-    'original_name': 'Energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-active-usage',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'power',
-      'friendly_name': 'Sense 12345 Energy',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '100',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_l1_voltage-entry]
-  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.sense_12345_l1_voltage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
-    'original_icon': None,
-    'original_name': 'L1 Voltage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-L1',
-    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_l1_voltage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'voltage',
-      'friendly_name': 'Sense 12345 L1 Voltage',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_l1_voltage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '120',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_l2_voltage-entry]
-  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.sense_12345_l2_voltage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.VOLTAGE: 'voltage'>,
-    'original_icon': None,
-    'original_name': 'L2 Voltage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-L2',
-    'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_l2_voltage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'voltage',
-      'friendly_name': 'Sense 12345 L2 Voltage',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfElectricPotential.VOLT: 'V'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_l2_voltage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '240',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_energy-entry]
-  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.sense_12345_monthly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Monthly Energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-monthly-usage',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Monthly Energy',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_monthly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_from_grid-entry]
-  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.sense_12345_monthly_from_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Monthly From Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-monthly-from_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_from_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Monthly From Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_monthly_from_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_net_production-entry]
-  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.sense_12345_monthly_net_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Monthly Net Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-monthly-net_production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_net_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Monthly Net Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_monthly_net_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_net_production_percentage-entry]
-  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.sense_12345_monthly_net_production_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Monthly Net Production Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-monthly-production_pct',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_net_production_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Monthly Net Production Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_monthly_net_production_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_production-entry]
-  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.sense_12345_monthly_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Monthly Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-monthly-production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Monthly Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_monthly_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_solar_powered_percentage-entry]
-  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.sense_12345_monthly_solar_powered_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Monthly Solar Powered Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-monthly-solar_powered',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_solar_powered_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Monthly Solar Powered Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_monthly_solar_powered_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_to_grid-entry]
-  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.sense_12345_monthly_to_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Monthly To Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-monthly-to_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_monthly_to_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Monthly To Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_monthly_to_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_production-entry]
-  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.sense_12345_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.POWER: 'power'>,
-    'original_icon': None,
-    'original_name': 'Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-active-production',
-    'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'power',
-      'friendly_name': 'Sense 12345 Production',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-      'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '500',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_energy-entry]
-  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.sense_12345_weekly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Weekly Energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-weekly-usage',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Weekly Energy',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_weekly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_from_grid-entry]
-  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.sense_12345_weekly_from_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Weekly From Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-weekly-from_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_from_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Weekly From Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_weekly_from_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_net_production-entry]
-  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.sense_12345_weekly_net_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Weekly Net Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-weekly-net_production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_net_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Weekly Net Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_weekly_net_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_net_production_percentage-entry]
-  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.sense_12345_weekly_net_production_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Weekly Net Production Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-weekly-production_pct',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_net_production_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Weekly Net Production Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_weekly_net_production_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_production-entry]
-  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.sense_12345_weekly_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Weekly Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-weekly-production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Weekly Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_weekly_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_solar_powered_percentage-entry]
-  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.sense_12345_weekly_solar_powered_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Weekly Solar Powered Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-weekly-solar_powered',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_solar_powered_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Weekly Solar Powered Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_weekly_solar_powered_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_to_grid-entry]
-  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.sense_12345_weekly_to_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Weekly To Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-weekly-to_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_weekly_to_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Weekly To Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_weekly_to_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_energy-entry]
-  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.sense_12345_yearly_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Yearly Energy',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-yearly-usage',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Yearly Energy',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_yearly_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_from_grid-entry]
-  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.sense_12345_yearly_from_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Yearly From Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-yearly-from_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_from_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Yearly From Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_yearly_from_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_net_production-entry]
-  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.sense_12345_yearly_net_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Yearly Net Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-yearly-net_production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_net_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Yearly Net Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_yearly_net_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_net_production_percentage-entry]
-  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.sense_12345_yearly_net_production_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Yearly Net Production Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-yearly-production_pct',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_net_production_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Yearly Net Production Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_yearly_net_production_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_production-entry]
-  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.sense_12345_yearly_production',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Yearly Production',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-yearly-production',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_production-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Yearly Production',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_yearly_production',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_solar_powered_percentage-entry]
-  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.sense_12345_yearly_solar_powered_percentage',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Yearly Solar Powered Percentage',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-yearly-solar_powered',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_solar_powered_percentage-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'friendly_name': 'Sense 12345 Yearly Solar Powered Percentage',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_yearly_solar_powered_percentage',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_to_grid-entry]
-  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.sense_12345_yearly_to_grid',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Yearly To Grid',
-    'platform': 'sense',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '12345-yearly-to_grid',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.sense_12345_yearly_to_grid-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by Sense.com',
-      'device_class': 'energy',
-      'friendly_name': 'Sense 12345 Yearly To Grid',
-      'last_reset': '2024-01-01T01:01:00+00:00',
-      'state_class': <SensorStateClass.TOTAL: 'total'>,
-      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.sense_12345_yearly_to_grid',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '15',
-  })
-# ---
diff --git a/tests/components/sense/test_binary_sensor.py b/tests/components/sense/test_binary_sensor.py
deleted file mode 100644
index ae91b7a9a21..00000000000
--- a/tests/components/sense/test_binary_sensor.py
+++ /dev/null
@@ -1,68 +0,0 @@
-"""The tests for Sense binary sensor platform."""
-
-from datetime import timedelta
-from unittest.mock import MagicMock
-
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
-from homeassistant.components.sense.const import ACTIVE_UPDATE_RATE
-from homeassistant.const import STATE_OFF, STATE_ON, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-from homeassistant.util.dt import utcnow
-
-from . import setup_platform
-from .const import DEVICE_1_NAME, DEVICE_2_NAME
-
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
-
-
-async def test_binary_sensors(
-    hass: HomeAssistant,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test Sensor."""
-    await setup_platform(hass, config_entry, Platform.BINARY_SENSOR)
-    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-async def test_on_off_sensors(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test the Sense binary sensors."""
-    await setup_platform(hass, config_entry, BINARY_SENSOR_DOMAIN)
-    device_1, device_2 = mock_sense.devices
-
-    state = hass.states.get(f"binary_sensor.{DEVICE_1_NAME.lower()}_power")
-    assert state.state == STATE_OFF
-
-    state = hass.states.get(f"binary_sensor.{DEVICE_2_NAME.lower()}_power")
-    assert state.state == STATE_OFF
-
-    device_1.is_on = True
-    async_fire_time_changed(hass, utcnow() + timedelta(seconds=ACTIVE_UPDATE_RATE))
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"binary_sensor.{DEVICE_1_NAME.lower()}_power")
-    assert state.state == STATE_ON
-
-    state = hass.states.get(f"binary_sensor.{DEVICE_2_NAME.lower()}_power")
-    assert state.state == STATE_OFF
-
-    device_1.is_on = False
-    device_2.is_on = True
-    async_fire_time_changed(hass, utcnow() + timedelta(seconds=ACTIVE_UPDATE_RATE))
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"binary_sensor.{DEVICE_1_NAME.lower()}_power")
-    assert state.state == STATE_OFF
-
-    state = hass.states.get(f"binary_sensor.{DEVICE_2_NAME.lower()}_power")
-    assert state.state == STATE_ON
diff --git a/tests/components/sense/test_config_flow.py b/tests/components/sense/test_config_flow.py
index acef82dd0ba..0ba8d94e17b 100644
--- a/tests/components/sense/test_config_flow.py
+++ b/tests/components/sense/test_config_flow.py
@@ -16,10 +16,19 @@ from homeassistant.const import CONF_CODE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-from .const import MOCK_CONFIG
-
 from tests.common import MockConfigEntry
 
+MOCK_CONFIG = {
+    "timeout": 6,
+    "email": "test-email",
+    "password": "test-password",
+    "access_token": "ABC",
+    "user_id": "123",
+    "monitor_id": "456",
+    "device_id": "789",
+    "refresh_token": "XYZ",
+}
+
 
 @pytest.fixture(name="mock_sense")
 def mock_sense():
diff --git a/tests/components/sense/test_sensor.py b/tests/components/sense/test_sensor.py
deleted file mode 100644
index d43b422ec38..00000000000
--- a/tests/components/sense/test_sensor.py
+++ /dev/null
@@ -1,234 +0,0 @@
-"""The tests for Sense sensor platform."""
-
-from datetime import timedelta
-from unittest.mock import MagicMock, PropertyMock
-
-from freezegun.api import FrozenDateTimeFactory
-import pytest
-from sense_energy import Scale
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.sense.const import ACTIVE_UPDATE_RATE, TREND_UPDATE_RATE
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-from homeassistant.util.dt import utcnow
-
-from . import setup_platform
-from .const import (
-    DEVICE_1_DAY_ENERGY,
-    DEVICE_1_NAME,
-    DEVICE_2_DAY_ENERGY,
-    DEVICE_2_NAME,
-    DEVICE_2_POWER,
-    MONITOR_ID,
-)
-
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_sensors(
-    hass: HomeAssistant,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test Sensor."""
-    await setup_platform(hass, config_entry, Platform.SENSOR)
-    await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-async def test_device_power_sensors(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test the Sense device power sensors."""
-    device_1, device_2 = mock_sense.devices
-    device_1.power_w = 0
-    device_2.power_w = 0
-    await setup_platform(hass, config_entry, SENSOR_DOMAIN)
-    device_1, device_2 = mock_sense.devices
-
-    state = hass.states.get(f"sensor.{DEVICE_1_NAME.lower()}_power")
-    assert state.state == "0"
-
-    state = hass.states.get(f"sensor.{DEVICE_2_NAME.lower()}_power")
-    assert state.state == "0"
-
-    device_2.power_w = DEVICE_2_POWER
-    async_fire_time_changed(hass, utcnow() + timedelta(seconds=ACTIVE_UPDATE_RATE))
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"sensor.{DEVICE_1_NAME.lower()}_power")
-    assert state.state == "0"
-
-    state = hass.states.get(f"sensor.{DEVICE_2_NAME.lower()}_power")
-    assert state.state == f"{DEVICE_2_POWER:.1f}"
-
-
-async def test_device_energy_sensors(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test the Sense device power sensors."""
-    await setup_platform(hass, config_entry, SENSOR_DOMAIN)
-    device_1, device_2 = mock_sense.devices
-
-    state = hass.states.get(f"sensor.{DEVICE_1_NAME.lower()}_daily_energy")
-    assert state.state == f"{DEVICE_1_DAY_ENERGY:.0f}"
-
-    state = hass.states.get(f"sensor.{DEVICE_2_NAME.lower()}_daily_energy")
-    assert state.state == f"{DEVICE_2_DAY_ENERGY:.0f}"
-
-    device_1.energy_kwh[Scale.DAY] = 0
-    device_2.energy_kwh[Scale.DAY] = 0
-    freezer.tick(timedelta(seconds=TREND_UPDATE_RATE))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"sensor.{DEVICE_1_NAME.lower()}_daily_energy")
-    assert state.state == "0"
-
-    state = hass.states.get(f"sensor.{DEVICE_2_NAME.lower()}_daily_energy")
-    assert state.state == "0"
-
-    device_2.energy_kwh[Scale.DAY] = DEVICE_1_DAY_ENERGY
-    freezer.tick(timedelta(seconds=TREND_UPDATE_RATE))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"sensor.{DEVICE_1_NAME.lower()}_daily_energy")
-    assert state.state == "0"
-
-    state = hass.states.get(f"sensor.{DEVICE_2_NAME.lower()}_daily_energy")
-    assert state.state == f"{DEVICE_1_DAY_ENERGY:.0f}"
-
-
-async def test_voltage_sensors(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test the Sense voltage sensors."""
-
-    type(mock_sense).active_voltage = PropertyMock(return_value=[120, 121])
-
-    await setup_platform(hass, config_entry, SENSOR_DOMAIN)
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_l1_voltage")
-    assert state.state == "120"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_l2_voltage")
-    assert state.state == "121"
-
-    type(mock_sense).active_voltage = PropertyMock(return_value=[122, 123])
-    async_fire_time_changed(hass, utcnow() + timedelta(seconds=ACTIVE_UPDATE_RATE))
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_l1_voltage")
-    assert state.state == "122"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_l2_voltage")
-    assert state.state == "123"
-
-
-async def test_active_power_sensors(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test the Sense power sensors."""
-
-    type(mock_sense).active_power = PropertyMock(return_value=400)
-    type(mock_sense).active_solar_power = PropertyMock(return_value=500)
-
-    await setup_platform(hass, config_entry, SENSOR_DOMAIN)
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_energy")
-    assert state.state == "400"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_production")
-    assert state.state == "500"
-
-    type(mock_sense).active_power = PropertyMock(return_value=600)
-    type(mock_sense).active_solar_power = PropertyMock(return_value=700)
-    async_fire_time_changed(hass, utcnow() + timedelta(seconds=ACTIVE_UPDATE_RATE))
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_energy")
-    assert state.state == "600"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_production")
-    assert state.state == "700"
-
-
-async def test_trend_energy_sensors(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_sense: MagicMock,
-    config_entry: MockConfigEntry,
-) -> None:
-    """Test the Sense power sensors."""
-    mock_sense.get_stat.side_effect = lambda sensor_type, variant: {
-        (Scale.DAY, "usage"): 100,
-        (Scale.DAY, "production"): 200,
-        (Scale.DAY, "from_grid"): 300,
-        (Scale.DAY, "to_grid"): 400,
-        (Scale.DAY, "net_production"): 500,
-        (Scale.DAY, "production_pct"): 600,
-        (Scale.DAY, "solar_powered"): 700,
-    }.get((sensor_type, variant), 0)
-
-    await setup_platform(hass, config_entry, SENSOR_DOMAIN)
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_energy")
-    assert state.state == "100"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_production")
-    assert state.state == "200"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_from_grid")
-    assert state.state == "300"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_to_grid")
-    assert state.state == "400"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_net_production")
-    assert state.state == "500"
-
-    mock_sense.get_stat.side_effect = lambda sensor_type, variant: {
-        (Scale.DAY, "usage"): 1000,
-        (Scale.DAY, "production"): 2000,
-        (Scale.DAY, "from_grid"): 3000,
-        (Scale.DAY, "to_grid"): 4000,
-        (Scale.DAY, "net_production"): 5000,
-        (Scale.DAY, "production_pct"): 6000,
-        (Scale.DAY, "solar_powered"): 7000,
-    }.get((sensor_type, variant), 0)
-    async_fire_time_changed(hass, utcnow() + timedelta(seconds=600))
-    await hass.async_block_till_done()
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_energy")
-    assert state.state == "1000"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_production")
-    assert state.state == "2000"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_from_grid")
-    assert state.state == "3000"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_to_grid")
-    assert state.state == "4000"
-
-    state = hass.states.get(f"sensor.sense_{MONITOR_ID}_daily_net_production")
-    assert state.state == "5000"
diff --git a/tests/components/sensibo/test_config_flow.py b/tests/components/sensibo/test_config_flow.py
index d6edb1c7ae0..3f53495f0f2 100644
--- a/tests/components/sensibo/test_config_flow.py
+++ b/tests/components/sensibo/test_config_flow.py
@@ -348,171 +348,3 @@ async def test_flow_reauth_no_username_or_device(
     assert result2["step_id"] == "reauth_confirm"
     assert result2["type"] is FlowResultType.FORM
     assert result2["errors"] == {"base": p_error}
-
-
-async def test_reconfigure_flow(hass: HomeAssistant) -> None:
-    """Test a reconfigure flow."""
-    entry = MockConfigEntry(
-        version=2,
-        domain=DOMAIN,
-        unique_id="username",
-        data={"api_key": "1234567890"},
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reconfigure_flow(hass)
-    assert result["step_id"] == "reconfigure"
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    with (
-        patch(
-            "homeassistant.components.sensibo.util.SensiboClient.async_get_devices",
-            return_value={"result": [{"id": "xyzxyz"}, {"id": "abcabc"}]},
-        ),
-        patch(
-            "homeassistant.components.sensibo.util.SensiboClient.async_get_me",
-            return_value={"result": {"username": "username"}},
-        ) as mock_sensibo,
-        patch(
-            "homeassistant.components.sensibo.async_setup_entry",
-            return_value=True,
-        ) as mock_setup_entry,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_API_KEY: "1234567891"},
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] is FlowResultType.ABORT
-    assert result2["reason"] == "reconfigure_successful"
-    assert entry.data == {"api_key": "1234567891"}
-
-    assert len(mock_sensibo.mock_calls) == 1
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-@pytest.mark.parametrize(
-    ("sideeffect", "p_error"),
-    [
-        (aiohttp.ClientConnectionError, "cannot_connect"),
-        (TimeoutError, "cannot_connect"),
-        (AuthenticationError, "invalid_auth"),
-        (SensiboError, "cannot_connect"),
-    ],
-)
-async def test_reconfigure_flow_error(
-    hass: HomeAssistant, sideeffect: Exception, p_error: str
-) -> None:
-    """Test a reconfigure flow with error."""
-    entry = MockConfigEntry(
-        version=2,
-        domain=DOMAIN,
-        unique_id="username",
-        data={"api_key": "1234567890"},
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reconfigure_flow(hass)
-
-    with patch(
-        "homeassistant.components.sensibo.util.SensiboClient.async_get_devices",
-        side_effect=sideeffect,
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_API_KEY: "1234567890"},
-        )
-        await hass.async_block_till_done()
-
-    assert result2["step_id"] == "reconfigure"
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": p_error}
-
-    with (
-        patch(
-            "homeassistant.components.sensibo.util.SensiboClient.async_get_devices",
-            return_value={"result": [{"id": "xyzxyz"}, {"id": "abcabc"}]},
-        ),
-        patch(
-            "homeassistant.components.sensibo.util.SensiboClient.async_get_me",
-            return_value={"result": {"username": "username"}},
-        ),
-        patch(
-            "homeassistant.components.sensibo.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {CONF_API_KEY: "1234567891"},
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] is FlowResultType.ABORT
-    assert result2["reason"] == "reconfigure_successful"
-    assert entry.data == {"api_key": "1234567891"}
-
-
-@pytest.mark.parametrize(
-    ("get_devices", "get_me", "p_error"),
-    [
-        (
-            {"result": [{"id": "xyzxyz"}, {"id": "abcabc"}]},
-            {"result": {}},
-            "no_username",
-        ),
-        (
-            {"result": []},
-            {"result": {"username": "username"}},
-            "no_devices",
-        ),
-        (
-            {"result": [{"id": "xyzxyz"}, {"id": "abcabc"}]},
-            {"result": {"username": "username2"}},
-            "incorrect_api_key",
-        ),
-    ],
-)
-async def test_flow_reconfigure_no_username_or_device(
-    hass: HomeAssistant,
-    get_devices: dict[str, Any],
-    get_me: dict[str, Any],
-    p_error: str,
-) -> None:
-    """Test config flow get no username from api."""
-    entry = MockConfigEntry(
-        version=2,
-        domain=DOMAIN,
-        unique_id="username",
-        data={"api_key": "1234567890"},
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reconfigure_flow(hass)
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reconfigure"
-
-    with (
-        patch(
-            "homeassistant.components.sensibo.util.SensiboClient.async_get_devices",
-            return_value=get_devices,
-        ),
-        patch(
-            "homeassistant.components.sensibo.util.SensiboClient.async_get_me",
-            return_value=get_me,
-        ),
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_API_KEY: "1234567890",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["step_id"] == "reconfigure"
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": p_error}
diff --git a/tests/components/sensor/test_recorder.py b/tests/components/sensor/test_recorder.py
index 0e8c2a5e188..37f080d2de2 100644
--- a/tests/components/sensor/test_recorder.py
+++ b/tests/components/sensor/test_recorder.py
@@ -4233,8 +4233,8 @@ async def async_record_states(
 @pytest.mark.parametrize(
     ("units", "attributes", "unit", "unit2", "supported_unit"),
     [
-        (US_CUSTOMARY_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "GW, MW, TW, W, kW"),
-        (METRIC_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "GW, MW, TW, W, kW"),
+        (US_CUSTOMARY_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "W, kW"),
+        (METRIC_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "W, kW"),
         (
             US_CUSTOMARY_SYSTEM,
             TEMPERATURE_SENSOR_ATTRIBUTES,
@@ -4445,8 +4445,8 @@ async def test_validate_statistics_unit_ignore_device_class(
 @pytest.mark.parametrize(
     ("units", "attributes", "unit", "unit2", "supported_unit"),
     [
-        (US_CUSTOMARY_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "GW, MW, TW, W, kW"),
-        (METRIC_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "GW, MW, TW, W, kW"),
+        (US_CUSTOMARY_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "W, kW"),
+        (METRIC_SYSTEM, POWER_SENSOR_ATTRIBUTES, "W", "kW", "W, kW"),
         (
             US_CUSTOMARY_SYSTEM,
             TEMPERATURE_SENSOR_ATTRIBUTES,
diff --git a/tests/components/seventeentrack/snapshots/test_services.ambr b/tests/components/seventeentrack/snapshots/test_services.ambr
index e172a2de594..568acea33a5 100644
--- a/tests/components/seventeentrack/snapshots/test_services.ambr
+++ b/tests/components/seventeentrack/snapshots/test_services.ambr
@@ -71,32 +71,3 @@
     ]),
   })
 # ---
-# name: test_packages_with_none_timestamp
-  dict({
-    'packages': list([
-      dict({
-        'destination_country': 'Belgium',
-        'friendly_name': 'friendly name 1',
-        'info_text': 'info text 1',
-        'location': 'location 1',
-        'origin_country': 'Belgium',
-        'package_type': 'Registered Parcel',
-        'status': 'In Transit',
-        'tracking_info_language': 'Unknown',
-        'tracking_number': '456',
-      }),
-      dict({
-        'destination_country': 'Belgium',
-        'friendly_name': 'friendly name 2',
-        'info_text': 'info text 1',
-        'location': 'location 1',
-        'origin_country': 'Belgium',
-        'package_type': 'Registered Parcel',
-        'status': 'Delivered',
-        'timestamp': '2020-08-10T10:32:00+00:00',
-        'tracking_info_language': 'Unknown',
-        'tracking_number': '789',
-      }),
-    ]),
-  })
-# ---
diff --git a/tests/components/seventeentrack/test_services.py b/tests/components/seventeentrack/test_services.py
index bbd5644ad63..54c9349c121 100644
--- a/tests/components/seventeentrack/test_services.py
+++ b/tests/components/seventeentrack/test_services.py
@@ -150,28 +150,6 @@ async def test_archive_package(
     )
 
 
-async def test_packages_with_none_timestamp(
-    hass: HomeAssistant,
-    mock_seventeentrack: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Ensure service returns all packages when non provided."""
-    await _mock_invalid_packages(mock_seventeentrack)
-    await init_integration(hass, mock_config_entry)
-    service_response = await hass.services.async_call(
-        DOMAIN,
-        SERVICE_GET_PACKAGES,
-        {
-            CONFIG_ENTRY_ID_KEY: mock_config_entry.entry_id,
-        },
-        blocking=True,
-        return_response=True,
-    )
-
-    assert service_response == snapshot
-
-
 async def _mock_packages(mock_seventeentrack):
     package1 = get_package(status=10)
     package2 = get_package(
@@ -189,19 +167,3 @@ async def _mock_packages(mock_seventeentrack):
         package2,
         package3,
     ]
-
-
-async def _mock_invalid_packages(mock_seventeentrack):
-    package1 = get_package(
-        status=10,
-        timestamp=None,
-    )
-    package2 = get_package(
-        tracking_number="789",
-        friendly_name="friendly name 2",
-        status=40,
-    )
-    mock_seventeentrack.return_value.profile.packages.return_value = [
-        package1,
-        package2,
-    ]
diff --git a/tests/components/sky_remote/__init__.py b/tests/components/sky_remote/__init__.py
deleted file mode 100644
index 83d68330d5b..00000000000
--- a/tests/components/sky_remote/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""Tests for the Sky Remote component."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_mock_entry(hass: HomeAssistant, entry: MockConfigEntry):
-    """Initialize a mock config entry."""
-    entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-
-    await hass.async_block_till_done()
diff --git a/tests/components/sky_remote/conftest.py b/tests/components/sky_remote/conftest.py
deleted file mode 100644
index d6c453d81f7..00000000000
--- a/tests/components/sky_remote/conftest.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""Test mocks and fixtures."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-from homeassistant.components.sky_remote.const import DEFAULT_PORT, DOMAIN
-from homeassistant.const import CONF_HOST, CONF_PORT
-
-from tests.common import MockConfigEntry
-
-SAMPLE_CONFIG = {CONF_HOST: "example.com", CONF_PORT: DEFAULT_PORT}
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Mock a config entry."""
-    return MockConfigEntry(domain=DOMAIN, data=SAMPLE_CONFIG)
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Stub out setup function."""
-    with patch(
-        "homeassistant.components.sky_remote.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_remote_control(request: pytest.FixtureRequest) -> Generator[MagicMock]:
-    """Mock skyboxremote library."""
-    with (
-        patch(
-            "homeassistant.components.sky_remote.RemoteControl"
-        ) as mock_remote_control,
-        patch(
-            "homeassistant.components.sky_remote.config_flow.RemoteControl",
-            mock_remote_control,
-        ),
-    ):
-        mock_remote_control._instance_mock = MagicMock(host="example.com")
-        mock_remote_control._instance_mock.check_connectable = AsyncMock(True)
-        mock_remote_control.return_value = mock_remote_control._instance_mock
-        yield mock_remote_control
diff --git a/tests/components/sky_remote/test_config_flow.py b/tests/components/sky_remote/test_config_flow.py
deleted file mode 100644
index aaeda20788c..00000000000
--- a/tests/components/sky_remote/test_config_flow.py
+++ /dev/null
@@ -1,125 +0,0 @@
-"""Test the Sky Remote config flow."""
-
-from __future__ import annotations
-
-from unittest.mock import AsyncMock
-
-import pytest
-from skyboxremote import LEGACY_PORT, SkyBoxConnectionError
-
-from homeassistant.components.sky_remote.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import CONF_HOST, CONF_PORT
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from .conftest import SAMPLE_CONFIG
-
-
-async def test_user_flow(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_remote_control
-) -> None:
-    """Test we can setup an entry."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["step_id"] == "user"
-    assert result["type"] is FlowResultType.FORM
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: SAMPLE_CONFIG[CONF_HOST]},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] == SAMPLE_CONFIG
-
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_device_exists_abort(
-    hass: HomeAssistant, mock_config_entry, mock_remote_control
-) -> None:
-    """Test we abort flow if device already configured."""
-    mock_config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_HOST: mock_config_entry.data[CONF_HOST]},
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-@pytest.mark.parametrize("mock_remote_control", [LEGACY_PORT], indirect=True)
-async def test_user_flow_legacy_device(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    mock_remote_control,
-) -> None:
-    """Test we can setup an entry with a legacy port."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["step_id"] == "user"
-    assert result["type"] is FlowResultType.FORM
-
-    async def mock_check_connectable():
-        if mock_remote_control.call_args[0][1] == LEGACY_PORT:
-            return True
-        raise SkyBoxConnectionError("Wrong port")
-
-    mock_remote_control._instance_mock.check_connectable = mock_check_connectable
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: SAMPLE_CONFIG[CONF_HOST]},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] == {**SAMPLE_CONFIG, CONF_PORT: LEGACY_PORT}
-
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-@pytest.mark.parametrize("mock_remote_control", [6], indirect=True)
-async def test_user_flow_unconnectable(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    mock_remote_control,
-) -> None:
-    """Test we can setup an entry."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["step_id"] == "user"
-    assert result["type"] is FlowResultType.FORM
-
-    mock_remote_control._instance_mock.check_connectable = AsyncMock(
-        side_effect=SkyBoxConnectionError("Example")
-    )
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: SAMPLE_CONFIG[CONF_HOST]},
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "cannot_connect"}
-
-    assert len(mock_setup_entry.mock_calls) == 0
-
-    mock_remote_control._instance_mock.check_connectable = AsyncMock(True)
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: SAMPLE_CONFIG[CONF_HOST]},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["data"] == SAMPLE_CONFIG
-
-    assert len(mock_setup_entry.mock_calls) == 1
diff --git a/tests/components/sky_remote/test_init.py b/tests/components/sky_remote/test_init.py
deleted file mode 100644
index fe316baa6bf..00000000000
--- a/tests/components/sky_remote/test_init.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""Tests for the Sky Remote component."""
-
-from unittest.mock import AsyncMock
-
-from skyboxremote import SkyBoxConnectionError
-
-from homeassistant.components.sky_remote.const import DEFAULT_PORT, DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from . import setup_mock_entry
-
-from tests.common import MockConfigEntry
-
-
-async def test_setup_entry(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_remote_control,
-    device_registry: dr.DeviceRegistry,
-) -> None:
-    """Test successful setup of entry."""
-    await setup_mock_entry(hass, mock_config_entry)
-
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
-    mock_remote_control.assert_called_once_with("example.com", DEFAULT_PORT)
-    device_entry = device_registry.async_get_device(
-        identifiers={(DOMAIN, mock_config_entry.entry_id)}
-    )
-    assert device_entry is not None
-    assert device_entry.name == "example.com"
-
-
-async def test_setup_unconnectable_entry(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_remote_control,
-) -> None:
-    """Test unsuccessful setup of entry."""
-    mock_remote_control._instance_mock.check_connectable = AsyncMock(
-        side_effect=SkyBoxConnectionError()
-    )
-
-    await setup_mock_entry(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
-
-
-async def test_unload_entry(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_remote_control
-) -> None:
-    """Test unload an entry."""
-    await setup_mock_entry(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-    assert await hass.config_entries.async_unload(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/sky_remote/test_remote.py b/tests/components/sky_remote/test_remote.py
deleted file mode 100644
index 301375bc039..00000000000
--- a/tests/components/sky_remote/test_remote.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""Test sky_remote remote."""
-
-import pytest
-
-from homeassistant.components.remote import (
-    ATTR_COMMAND,
-    DOMAIN as REMOTE_DOMAIN,
-    SERVICE_SEND_COMMAND,
-)
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-
-from . import setup_mock_entry
-
-ENTITY_ID = "remote.example_com"
-
-
-async def test_send_command(
-    hass: HomeAssistant, mock_config_entry, mock_remote_control
-) -> None:
-    """Test "send_command" method."""
-    await setup_mock_entry(hass, mock_config_entry)
-    await hass.services.async_call(
-        REMOTE_DOMAIN,
-        SERVICE_SEND_COMMAND,
-        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_COMMAND: ["sky"]},
-        blocking=True,
-    )
-    mock_remote_control._instance_mock.send_keys.assert_called_once_with(["sky"])
-
-
-async def test_send_invalid_command(
-    hass: HomeAssistant, mock_config_entry, mock_remote_control
-) -> None:
-    """Test "send_command" method."""
-    await setup_mock_entry(hass, mock_config_entry)
-
-    with pytest.raises(ServiceValidationError):
-        await hass.services.async_call(
-            REMOTE_DOMAIN,
-            SERVICE_SEND_COMMAND,
-            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_COMMAND: ["apple"]},
-            blocking=True,
-        )
-    mock_remote_control._instance_mock.send_keys.assert_not_called()
diff --git a/tests/components/smartthings/conftest.py b/tests/components/smartthings/conftest.py
index 71a36c7885a..70fd9db0744 100644
--- a/tests/components/smartthings/conftest.py
+++ b/tests/components/smartthings/conftest.py
@@ -38,6 +38,7 @@ from homeassistant.components.smartthings.const import (
     STORAGE_KEY,
     STORAGE_VERSION,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.config_entries import SOURCE_USER, ConfigEntryState
 from homeassistant.const import (
     CONF_ACCESS_TOKEN,
@@ -46,7 +47,6 @@ from homeassistant.const import (
     CONF_WEBHOOK_ID,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/smartthings/test_config_flow.py b/tests/components/smartthings/test_config_flow.py
index 3621e58bc3d..49444e47780 100644
--- a/tests/components/smartthings/test_config_flow.py
+++ b/tests/components/smartthings/test_config_flow.py
@@ -16,9 +16,9 @@ from homeassistant.components.smartthings.const import (
     CONF_LOCATION_ID,
     DOMAIN,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/smartthings/test_init.py b/tests/components/smartthings/test_init.py
index e518f84aecb..fa30fa258cf 100644
--- a/tests/components/smartthings/test_init.py
+++ b/tests/components/smartthings/test_init.py
@@ -23,8 +23,8 @@ from homeassistant.components.smartthings.const import (
     PLATFORMS,
     SIGNAL_SMARTTHINGS_UPDATE,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
diff --git a/tests/components/smarty/__init__.py b/tests/components/smarty/__init__.py
deleted file mode 100644
index c5ae7f2d382..00000000000
--- a/tests/components/smarty/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""Tests for the Smarty integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
-    """Set up the component."""
-    config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/smarty/conftest.py b/tests/components/smarty/conftest.py
deleted file mode 100644
index a9b518d88f4..00000000000
--- a/tests/components/smarty/conftest.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""Smarty tests configuration."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
-
-import pytest
-
-from homeassistant.components.smarty import DOMAIN
-from homeassistant.const import CONF_HOST
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
-    """Override integration setup."""
-    with patch(
-        "homeassistant.components.smarty.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_smarty() -> Generator[AsyncMock]:
-    """Mock a Smarty client."""
-    with (
-        patch(
-            "homeassistant.components.smarty.coordinator.Smarty",
-            autospec=True,
-        ) as mock_client,
-        patch(
-            "homeassistant.components.smarty.config_flow.Smarty",
-            new=mock_client,
-        ),
-    ):
-        client = mock_client.return_value
-        client.update.return_value = True
-        client.fan_speed = 100
-        client.warning = False
-        client.alarm = False
-        client.boost = False
-        client.enable_boost.return_value = True
-        client.disable_boost.return_value = True
-        client.supply_air_temperature = 20
-        client.extract_air_temperature = 23
-        client.outdoor_air_temperature = 24
-        client.supply_fan_speed = 66
-        client.extract_fan_speed = 100
-        client.filter_timer = 31
-        client.get_configuration_version.return_value = 111
-        client.get_software_version.return_value = 127
-        client.reset_filters_timer.return_value = True
-        yield client
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Return the default mocked config entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        data={CONF_HOST: "192.168.0.2"},
-        entry_id="01JAZ5DPW8C62D620DGYNG2R8H",
-    )
diff --git a/tests/components/smarty/snapshots/test_binary_sensor.ambr b/tests/components/smarty/snapshots/test_binary_sensor.ambr
deleted file mode 100644
index 2f943a25012..00000000000
--- a/tests/components/smarty/snapshots/test_binary_sensor.ambr
+++ /dev/null
@@ -1,141 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[binary_sensor.mock_title_alarm-entry]
-  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.mock_title_alarm',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Alarm',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'alarm',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_alarm',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.mock_title_alarm-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': 'Mock Title Alarm',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.mock_title_alarm',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.mock_title_boost_state-entry]
-  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.mock_title_boost_state',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Boost state',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'boost_state',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_boost',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.mock_title_boost_state-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Title Boost state',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.mock_title_boost_state',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
-# name: test_all_entities[binary_sensor.mock_title_warning-entry]
-  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.mock_title_warning',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.PROBLEM: 'problem'>,
-    'original_icon': None,
-    'original_name': 'Warning',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'warning',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_warning',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[binary_sensor.mock_title_warning-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'problem',
-      'friendly_name': 'Mock Title Warning',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.mock_title_warning',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/smarty/snapshots/test_button.ambr b/tests/components/smarty/snapshots/test_button.ambr
deleted file mode 100644
index 38849bd2b2e..00000000000
--- a/tests/components/smarty/snapshots/test_button.ambr
+++ /dev/null
@@ -1,47 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[button.mock_title_reset_filters_timer-entry]
-  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.mock_title_reset_filters_timer',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Reset filters timer',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'reset_filters_timer',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_reset_filters_timer',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[button.mock_title_reset_filters_timer-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Title Reset filters timer',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.mock_title_reset_filters_timer',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
diff --git a/tests/components/smarty/snapshots/test_fan.ambr b/tests/components/smarty/snapshots/test_fan.ambr
deleted file mode 100644
index 8ca95beeb86..00000000000
--- a/tests/components/smarty/snapshots/test_fan.ambr
+++ /dev/null
@@ -1,54 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[fan.mock_title-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'preset_modes': None,
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'fan',
-    'entity_category': None,
-    'entity_id': 'fan.mock_title',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': None,
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': <FanEntityFeature: 49>,
-    'translation_key': 'fan',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[fan.mock_title-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Title',
-      'percentage': 0,
-      'percentage_step': 33.333333333333336,
-      'preset_mode': None,
-      'preset_modes': None,
-      'supported_features': <FanEntityFeature: 49>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'fan.mock_title',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/smarty/snapshots/test_init.ambr b/tests/components/smarty/snapshots/test_init.ambr
deleted file mode 100644
index b25cdb9dc3a..00000000000
--- a/tests/components/smarty/snapshots/test_init.ambr
+++ /dev/null
@@ -1,33 +0,0 @@
-# serializer version: 1
-# name: test_device
-  DeviceRegistryEntrySnapshot({
-    'area_id': None,
-    'config_entries': <ANY>,
-    'configuration_url': None,
-    'connections': set({
-    }),
-    'disabled_by': None,
-    'entry_type': None,
-    'hw_version': 111,
-    'id': <ANY>,
-    'identifiers': set({
-      tuple(
-        'smarty',
-        '01JAZ5DPW8C62D620DGYNG2R8H',
-      ),
-    }),
-    'is_new': False,
-    'labels': set({
-    }),
-    'manufacturer': 'Salda',
-    'model': None,
-    'model_id': None,
-    'name': 'Mock Title',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': None,
-    'suggested_area': None,
-    'sw_version': 127,
-    'via_device_id': None,
-  })
-# ---
diff --git a/tests/components/smarty/snapshots/test_sensor.ambr b/tests/components/smarty/snapshots/test_sensor.ambr
deleted file mode 100644
index 2f713db7f83..00000000000
--- a/tests/components/smarty/snapshots/test_sensor.ambr
+++ /dev/null
@@ -1,286 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[sensor.mock_title_extract_air_temperature-entry]
-  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.mock_title_extract_air_temperature',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
-    'original_icon': None,
-    'original_name': 'Extract air temperature',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'extract_air_temperature',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_extract_air_temperature',
-    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_extract_air_temperature-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'temperature',
-      'friendly_name': 'Mock Title Extract air temperature',
-      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.mock_title_extract_air_temperature',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '23',
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_extract_fan_speed-entry]
-  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.mock_title_extract_fan_speed',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Extract fan speed',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'extract_fan_speed',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_extract_fan_speed',
-    'unit_of_measurement': 'rpm',
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_extract_fan_speed-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Title Extract fan speed',
-      'unit_of_measurement': 'rpm',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.mock_title_extract_fan_speed',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '100',
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_filter_days_left-entry]
-  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.mock_title_filter_days_left',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Filter days left',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'filter_days_left',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_filter_days_left',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_filter_days_left-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'Mock Title Filter days left',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.mock_title_filter_days_left',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2023-11-21T01:00:00+00:00',
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_outdoor_air_temperature-entry]
-  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.mock_title_outdoor_air_temperature',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
-    'original_icon': None,
-    'original_name': 'Outdoor air temperature',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'outdoor_air_temperature',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_outdoor_air_temperature',
-    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_outdoor_air_temperature-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'temperature',
-      'friendly_name': 'Mock Title Outdoor air temperature',
-      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.mock_title_outdoor_air_temperature',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '24',
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_supply_air_temperature-entry]
-  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.mock_title_supply_air_temperature',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
-    'original_icon': None,
-    'original_name': 'Supply air temperature',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'supply_air_temperature',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_supply_air_temperature',
-    'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_supply_air_temperature-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'temperature',
-      'friendly_name': 'Mock Title Supply air temperature',
-      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.mock_title_supply_air_temperature',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '20',
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_supply_fan_speed-entry]
-  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.mock_title_supply_fan_speed',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Supply fan speed',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'supply_fan_speed',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_supply_fan_speed',
-    'unit_of_measurement': 'rpm',
-  })
-# ---
-# name: test_all_entities[sensor.mock_title_supply_fan_speed-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Title Supply fan speed',
-      'unit_of_measurement': 'rpm',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.mock_title_supply_fan_speed',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '66',
-  })
-# ---
diff --git a/tests/components/smarty/snapshots/test_switch.ambr b/tests/components/smarty/snapshots/test_switch.ambr
deleted file mode 100644
index be1da7c6961..00000000000
--- a/tests/components/smarty/snapshots/test_switch.ambr
+++ /dev/null
@@ -1,47 +0,0 @@
-# serializer version: 1
-# name: test_all_entities[switch.mock_title_boost-entry]
-  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_boost',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Boost',
-    'platform': 'smarty',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'boost',
-    'unique_id': '01JAZ5DPW8C62D620DGYNG2R8H_boost',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_all_entities[switch.mock_title_boost-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Mock Title Boost',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.mock_title_boost',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/smarty/test_binary_sensor.py b/tests/components/smarty/test_binary_sensor.py
deleted file mode 100644
index d28fb44e1ce..00000000000
--- a/tests/components/smarty/test_binary_sensor.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""Tests for the Smarty binary sensor platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.smarty.PLATFORMS", [Platform.BINARY_SENSOR]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/smarty/test_button.py b/tests/components/smarty/test_button.py
deleted file mode 100644
index 0a7b67f2be6..00000000000
--- a/tests/components/smarty/test_button.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""Tests for the Smarty button platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
-from homeassistant.const import ATTR_ENTITY_ID, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.smarty.PLATFORMS", [Platform.BUTTON]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-async def test_setting_value(
-    hass: HomeAssistant,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test setting value."""
-    await setup_integration(hass, mock_config_entry)
-
-    await hass.services.async_call(
-        BUTTON_DOMAIN,
-        SERVICE_PRESS,
-        target={ATTR_ENTITY_ID: "button.mock_title_reset_filters_timer"},
-        blocking=True,
-    )
-    mock_smarty.reset_filters_timer.assert_called_once_with()
diff --git a/tests/components/smarty/test_config_flow.py b/tests/components/smarty/test_config_flow.py
deleted file mode 100644
index fad4f27ca1c..00000000000
--- a/tests/components/smarty/test_config_flow.py
+++ /dev/null
@@ -1,165 +0,0 @@
-"""Test the smarty config flow."""
-
-from unittest.mock import AsyncMock
-
-from homeassistant.components.smarty.const import DOMAIN
-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
-from homeassistant.const import CONF_HOST, CONF_NAME
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from tests.common import MockConfigEntry
-
-
-async def test_full_flow(
-    hass: HomeAssistant, mock_smarty: AsyncMock, mock_setup_entry: AsyncMock
-) -> None:
-    """Test the full flow."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: "192.168.0.2"},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "192.168.0.2"
-    assert result["data"] == {CONF_HOST: "192.168.0.2"}
-
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_cannot_connect(
-    hass: HomeAssistant, mock_smarty: AsyncMock, mock_setup_entry: AsyncMock
-) -> None:
-    """Test we handle cannot connect error."""
-
-    mock_smarty.update.return_value = False
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: "192.168.0.2"},
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "cannot_connect"}
-
-    mock_smarty.update.return_value = True
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: "192.168.0.2"},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-
-
-async def test_unknown_error(
-    hass: HomeAssistant, mock_smarty: AsyncMock, mock_setup_entry: AsyncMock
-) -> None:
-    """Test we handle unknown error."""
-
-    mock_smarty.update.side_effect = Exception
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: "192.168.0.2"},
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "unknown"}
-
-    mock_smarty.update.side_effect = None
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: "192.168.0.2"},
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-
-
-async def test_existing_entry(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
-) -> None:
-    """Test we handle existing entry."""
-    mock_config_entry.add_to_hass(hass)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {CONF_HOST: "192.168.0.2"},
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_import_flow(
-    hass: HomeAssistant, mock_smarty: AsyncMock, mock_setup_entry: AsyncMock
-) -> None:
-    """Test the import flow."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data={CONF_HOST: "192.168.0.2", CONF_NAME: "Smarty"},
-    )
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Smarty"
-    assert result["data"] == {CONF_HOST: "192.168.0.2"}
-
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_import_cannot_connect(
-    hass: HomeAssistant, mock_smarty: AsyncMock
-) -> None:
-    """Test we handle cannot connect error."""
-
-    mock_smarty.update.return_value = False
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data={CONF_HOST: "192.168.0.2", CONF_NAME: "Smarty"},
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "cannot_connect"
-
-
-async def test_import_unknown_error(
-    hass: HomeAssistant, mock_smarty: AsyncMock
-) -> None:
-    """Test we handle unknown error."""
-
-    mock_smarty.update.side_effect = Exception
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data={CONF_HOST: "192.168.0.2", CONF_NAME: "Smarty"},
-    )
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "unknown"
diff --git a/tests/components/smarty/test_fan.py b/tests/components/smarty/test_fan.py
deleted file mode 100644
index 2c0135b7aa2..00000000000
--- a/tests/components/smarty/test_fan.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""Tests for the Smarty fan platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.smarty.PLATFORMS", [Platform.FAN]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/smarty/test_init.py b/tests/components/smarty/test_init.py
deleted file mode 100644
index 0366ea9eade..00000000000
--- a/tests/components/smarty/test_init.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""Tests for the Smarty component."""
-
-from unittest.mock import AsyncMock
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.smarty import DOMAIN
-from homeassistant.const import CONF_HOST, CONF_NAME
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-from homeassistant.helpers import device_registry as dr, issue_registry as ir
-from homeassistant.setup import async_setup_component
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry
-
-
-async def test_import_flow(
-    hass: HomeAssistant,
-    mock_smarty: AsyncMock,
-    issue_registry: ir.IssueRegistry,
-    mock_setup_entry: AsyncMock,
-) -> None:
-    """Test import flow."""
-    assert await async_setup_component(
-        hass, DOMAIN, {DOMAIN: {CONF_HOST: "192.168.0.2", CONF_NAME: "smarty"}}
-    )
-    await hass.async_block_till_done()
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
-    assert (HOMEASSISTANT_DOMAIN, "deprecated_yaml_smarty") in issue_registry.issues
-
-
-async def test_import_flow_already_exists(
-    hass: HomeAssistant,
-    mock_smarty: AsyncMock,
-    issue_registry: ir.IssueRegistry,
-    mock_setup_entry: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test import flow when entry already exists."""
-    mock_config_entry.add_to_hass(hass)
-    assert await async_setup_component(
-        hass, DOMAIN, {DOMAIN: {CONF_HOST: "192.168.0.2", CONF_NAME: "smarty"}}
-    )
-    await hass.async_block_till_done()
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
-    assert (HOMEASSISTANT_DOMAIN, "deprecated_yaml_smarty") in issue_registry.issues
-
-
-async def test_import_flow_error(
-    hass: HomeAssistant,
-    mock_smarty: AsyncMock,
-    issue_registry: ir.IssueRegistry,
-    mock_setup_entry: AsyncMock,
-) -> None:
-    """Test import flow when error occurs."""
-    mock_smarty.update.return_value = False
-    assert await async_setup_component(
-        hass, DOMAIN, {DOMAIN: {CONF_HOST: "192.168.0.2", CONF_NAME: "smarty"}}
-    )
-    await hass.async_block_till_done()
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 0
-    assert (
-        DOMAIN,
-        "deprecated_yaml_import_issue_cannot_connect",
-    ) in issue_registry.issues
-
-
-async def test_device(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    device_registry: dr.DeviceRegistry,
-) -> None:
-    """Test device."""
-    await setup_integration(hass, mock_config_entry)
-    device = device_registry.async_get_device(
-        identifiers={(DOMAIN, mock_config_entry.entry_id)}
-    )
-    assert device
-    assert device == snapshot
diff --git a/tests/components/smarty/test_sensor.py b/tests/components/smarty/test_sensor.py
deleted file mode 100644
index a534a2ebb0f..00000000000
--- a/tests/components/smarty/test_sensor.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Tests for the Smarty sensor platform."""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-@pytest.mark.freeze_time("2023-10-21")
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.smarty.PLATFORMS", [Platform.SENSOR]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
diff --git a/tests/components/smarty/test_switch.py b/tests/components/smarty/test_switch.py
deleted file mode 100644
index 1a6748e2d23..00000000000
--- a/tests/components/smarty/test_switch.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""Tests for the Smarty switch platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
-from homeassistant.const import (
-    ATTR_ENTITY_ID,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-    Platform,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, snapshot_platform
-
-
-async def test_all_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test all entities."""
-    with patch("homeassistant.components.smarty.PLATFORMS", [Platform.SWITCH]):
-        await setup_integration(hass, mock_config_entry)
-
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-async def test_setting_value(
-    hass: HomeAssistant,
-    mock_smarty: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test setting value."""
-    await setup_integration(hass, mock_config_entry)
-
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_ON,
-        target={ATTR_ENTITY_ID: "switch.mock_title_boost"},
-        blocking=True,
-    )
-    mock_smarty.enable_boost.assert_called_once_with()
-
-    await hass.services.async_call(
-        SWITCH_DOMAIN,
-        SERVICE_TURN_OFF,
-        target={ATTR_ENTITY_ID: "switch.mock_title_boost"},
-        blocking=True,
-    )
-    mock_smarty.disable_boost.assert_called_once_with()
diff --git a/tests/components/smhi/common.py b/tests/components/smhi/common.py
new file mode 100644
index 00000000000..7339ba76ac1
--- /dev/null
+++ b/tests/components/smhi/common.py
@@ -0,0 +1,11 @@
+"""Common test utilities."""
+
+from unittest.mock import Mock
+
+
+class AsyncMock(Mock):
+    """Implements Mock async."""
+
+    async def __call__(self, *args, **kwargs):
+        """Hack for async support for Mock."""
+        return super().__call__(*args, **kwargs)
diff --git a/tests/components/smlight/snapshots/test_update.ambr b/tests/components/smlight/snapshots/test_update.ambr
index ed0085dcdc8..e5f7c34ccf5 100644
--- a/tests/components/smlight/snapshots/test_update.ambr
+++ b/tests/components/smlight/snapshots/test_update.ambr
@@ -37,7 +37,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/smlight/icon.png',
       'friendly_name': 'Mock Title Core firmware',
       'in_progress': False,
@@ -96,7 +95,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/smlight/icon.png',
       'friendly_name': 'Mock Title Zigbee firmware',
       'in_progress': False,
diff --git a/tests/components/smlight/test_update.py b/tests/components/smlight/test_update.py
index 0bb2e34d7ca..714caefd91c 100644
--- a/tests/components/smlight/test_update.py
+++ b/tests/components/smlight/test_update.py
@@ -1,7 +1,6 @@
 """Tests for the SMLIGHT update platform."""
 
-from datetime import timedelta
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
 
 from freezegun.api import FrozenDateTimeFactory
 from pysmlight import Firmware, Info
@@ -89,9 +88,7 @@ async def test_update_setup(
     await hass.config_entries.async_unload(entry.entry_id)
 
 
-@patch("homeassistant.components.smlight.update.asyncio.sleep", return_value=None)
 async def test_update_firmware(
-    mock_sleep: MagicMock,
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
     mock_config_entry: MockConfigEntry,
@@ -129,7 +126,7 @@ async def test_update_firmware(
         sw_version="v2.5.2",
     )
 
-    freezer.tick(timedelta(seconds=5))
+    freezer.tick(SCAN_FIRMWARE_INTERVAL)
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
@@ -219,54 +216,6 @@ async def test_update_firmware_failed(
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
 
 
-@patch("homeassistant.components.smlight.const.LOGGER.warning")
-async def test_update_reboot_timeout(
-    mock_warning: MagicMock,
-    hass: HomeAssistant,
-    freezer: FrozenDateTimeFactory,
-    mock_config_entry: MockConfigEntry,
-    mock_smlight_client: MagicMock,
-) -> None:
-    """Test firmware updates."""
-    await setup_integration(hass, mock_config_entry)
-    entity_id = "update.mock_title_core_firmware"
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-    assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
-    assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
-
-    with (
-        patch(
-            "homeassistant.components.smlight.update.asyncio.timeout",
-            side_effect=TimeoutError,
-        ),
-        patch(
-            "homeassistant.components.smlight.update.asyncio.sleep",
-            return_value=None,
-        ),
-    ):
-        await hass.services.async_call(
-            PLATFORM,
-            SERVICE_INSTALL,
-            {ATTR_ENTITY_ID: entity_id},
-            blocking=False,
-        )
-
-        assert len(mock_smlight_client.fw_update.mock_calls) == 1
-
-        event_function = get_mock_event_function(
-            mock_smlight_client, SmEvents.FW_UPD_done
-        )
-
-        event_function(MOCK_FIRMWARE_DONE)
-
-        freezer.tick(timedelta(seconds=5))
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done()
-
-        mock_warning.assert_called_once()
-
-
 async def test_update_release_notes(
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
diff --git a/tests/components/solarlog/conftest.py b/tests/components/solarlog/conftest.py
index 2d4b4e32522..22b85a590ff 100644
--- a/tests/components/solarlog/conftest.py
+++ b/tests/components/solarlog/conftest.py
@@ -65,7 +65,7 @@ def mock_solarlog_connector():
     mock_solarlog_api.update_device_list.return_value = DEVICE_LIST
     mock_solarlog_api.update_inverter_data.return_value = INVERTER_DATA
     mock_solarlog_api.device_name = {0: "Inverter 1", 1: "Inverter 2"}.get
-    mock_solarlog_api.device_enabled = {0: True, 1: True}.get
+    mock_solarlog_api.device_enabled = {0: True, 1: False}.get
     mock_solarlog_api.password.return_value = "pwd"
 
     with (
diff --git a/tests/components/solarlog/snapshots/test_sensor.ambr b/tests/components/solarlog/snapshots/test_sensor.ambr
index 32be560fc62..38356a00de7 100644
--- a/tests/components/solarlog/snapshots/test_sensor.ambr
+++ b/tests/components/solarlog/snapshots/test_sensor.ambr
@@ -4,9 +4,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -45,7 +43,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'Inverter 1 Consumption year',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
@@ -112,9 +109,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -153,7 +148,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'Inverter 2 Consumption year',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
@@ -376,9 +370,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -417,7 +409,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'solarlog Consumption day',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
@@ -433,9 +424,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -474,7 +463,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'solarlog Consumption month',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
@@ -547,9 +535,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -588,7 +574,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'solarlog Consumption year',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
@@ -712,9 +697,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -747,7 +730,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'power',
       'friendly_name': 'solarlog Installed peak power',
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
       'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
     }),
     'context': <ANY>,
@@ -1170,9 +1152,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -1211,7 +1191,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'solarlog Yield day',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
@@ -1227,9 +1206,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -1268,7 +1245,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'solarlog Yield month',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
@@ -1341,9 +1317,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
@@ -1379,7 +1353,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'energy',
       'friendly_name': 'solarlog Yield year',
-      'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
       'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
     }),
     'context': <ANY>,
diff --git a/tests/components/solarlog/test_sensor.py b/tests/components/solarlog/test_sensor.py
index 77aa0308cda..bc90e8b25c0 100644
--- a/tests/components/solarlog/test_sensor.py
+++ b/tests/components/solarlog/test_sensor.py
@@ -9,13 +9,11 @@ from solarlog_cli.solarlog_exceptions import (
     SolarLogConnectionError,
     SolarLogUpdateError,
 )
-from solarlog_cli.solarlog_models import InverterData
 from syrupy import SnapshotAssertion
 
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceRegistry
-from homeassistant.helpers.entity_registry import EntityRegistry
+from homeassistant.helpers import entity_registry as er
 
 from . import setup_platform
 
@@ -27,7 +25,7 @@ async def test_all_entities(
     snapshot: SnapshotAssertion,
     mock_solarlog_connector: AsyncMock,
     mock_config_entry: MockConfigEntry,
-    entity_registry: EntityRegistry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
     """Test all entities."""
 
@@ -35,49 +33,6 @@ async def test_all_entities(
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
 
 
-async def test_add_remove_entities(
-    hass: HomeAssistant,
-    mock_solarlog_connector: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    device_registry: DeviceRegistry,
-    entity_registry: EntityRegistry,
-    freezer: FrozenDateTimeFactory,
-) -> None:
-    """Test if entities are added and old are removed."""
-    await setup_platform(hass, mock_config_entry, [Platform.SENSOR])
-
-    assert hass.states.get("sensor.inverter_1_consumption_year").state == "354.687"
-
-    # test no changes (coordinator.py line 114)
-    freezer.tick(delta=timedelta(minutes=1))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    mock_solarlog_connector.update_device_list.return_value = {
-        0: InverterData(name="Inv 1", enabled=True),
-        2: InverterData(name="Inverter 3", enabled=True),
-    }
-    mock_solarlog_connector.update_inverter_data.return_value = {
-        0: InverterData(
-            name="Inv 1", enabled=True, consumption_year=354687, current_power=5
-        ),
-        2: InverterData(
-            name="Inverter 3", enabled=True, consumption_year=454, current_power=7
-        ),
-    }
-    mock_solarlog_connector.device_name = {0: "Inv 1", 2: "Inverter 3"}.get
-    mock_solarlog_connector.device_enabled = {0: True, 2: True}.get
-
-    freezer.tick(delta=timedelta(minutes=1))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
-
-    assert hass.states.get("sensor.inverter_1_consumption_year") is None
-    assert hass.states.get("sensor.inv_1_consumption_year").state == "354.687"
-    assert hass.states.get("sensor.inverter_2_consumption_year") is None
-    assert hass.states.get("sensor.inverter_3_consumption_year").state == "0.454"
-
-
 @pytest.mark.parametrize(
     "exception",
     [
diff --git a/tests/components/sonarr/__init__.py b/tests/components/sonarr/__init__.py
index 660102ed082..b6050808a34 100644
--- a/tests/components/sonarr/__init__.py
+++ b/tests/components/sonarr/__init__.py
@@ -5,6 +5,6 @@ from homeassistant.const import CONF_API_KEY, CONF_URL
 MOCK_REAUTH_INPUT = {CONF_API_KEY: "test-api-key-reauth"}
 
 MOCK_USER_INPUT = {
-    CONF_URL: "http://192.168.1.189:8989/",
+    CONF_URL: "http://192.168.1.189:8989",
     CONF_API_KEY: "MOCK_API_KEY",
 }
diff --git a/tests/components/sonarr/test_config_flow.py b/tests/components/sonarr/test_config_flow.py
index efbfbd749b3..118d5020cba 100644
--- a/tests/components/sonarr/test_config_flow.py
+++ b/tests/components/sonarr/test_config_flow.py
@@ -50,34 +50,6 @@ async def test_cannot_connect(
     assert result["errors"] == {"base": "cannot_connect"}
 
 
-async def test_url_rewrite(
-    hass: HomeAssistant,
-    mock_sonarr_config_flow: MagicMock,
-    mock_setup_entry: None,
-) -> 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"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    user_input = MOCK_USER_INPUT.copy()
-    user_input[CONF_URL] = "https://192.168.1.189"
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input=user_input,
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "192.168.1.189"
-
-    assert result["data"]
-    assert result["data"][CONF_URL] == "https://192.168.1.189:443/"
-
-
 async def test_invalid_auth(
     hass: HomeAssistant, mock_sonarr_config_flow: MagicMock
 ) -> None:
@@ -173,7 +145,7 @@ async def test_full_user_flow_implementation(
     assert result["title"] == "192.168.1.189"
 
     assert result["data"]
-    assert result["data"][CONF_URL] == "http://192.168.1.189:8989/"
+    assert result["data"][CONF_URL] == "http://192.168.1.189:8989"
 
 
 async def test_full_user_flow_advanced_options(
@@ -203,7 +175,7 @@ async def test_full_user_flow_advanced_options(
     assert result["title"] == "192.168.1.189"
 
     assert result["data"]
-    assert result["data"][CONF_URL] == "http://192.168.1.189:8989/"
+    assert result["data"][CONF_URL] == "http://192.168.1.189:8989"
     assert result["data"][CONF_VERIFY_SSL]
 
 
diff --git a/tests/components/spc/test_alarm_control_panel.py b/tests/components/spc/test_alarm_control_panel.py
index 12fb885b92b..7b1ab4ff947 100644
--- a/tests/components/spc/test_alarm_control_panel.py
+++ b/tests/components/spc/test_alarm_control_panel.py
@@ -4,7 +4,7 @@ from unittest.mock import AsyncMock
 
 from pyspcwebgw.const import AreaMode
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
+from homeassistant.const import STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -19,7 +19,7 @@ async def test_update_alarm_device(hass: HomeAssistant, mock_client: AsyncMock)
 
     entity_id = "alarm_control_panel.house"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
     assert hass.states.get(entity_id).attributes["changed_by"] == "Sven"
 
     mock_area = mock_client.return_value.areas["1"]
@@ -30,5 +30,5 @@ async def test_update_alarm_device(hass: HomeAssistant, mock_client: AsyncMock)
     await mock_client.call_args_list[0][1]["async_callback"](mock_area)
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     assert hass.states.get(entity_id).attributes["changed_by"] == "Anna"
diff --git a/tests/components/spotify/conftest.py b/tests/components/spotify/conftest.py
index d3fc418f1cd..5d86045e5a8 100644
--- a/tests/components/spotify/conftest.py
+++ b/tests/components/spotify/conftest.py
@@ -84,13 +84,6 @@ async def setup_credentials(hass: HomeAssistant) -> None:
     )
 
 
-@pytest.fixture(autouse=True)
-async def patch_sleep() -> Generator[AsyncMock]:
-    """Fixture to setup credentials."""
-    with patch("homeassistant.components.spotify.media_player.AFTER_REQUEST_SLEEP", 0):
-        yield
-
-
 @pytest.fixture
 def mock_spotify() -> Generator[AsyncMock]:
     """Mock the Spotify API."""
diff --git a/tests/components/spotify/fixtures/audio_features.json b/tests/components/spotify/fixtures/audio_features.json
index 52dfee060f7..1263d231f5e 100644
--- a/tests/components/spotify/fixtures/audio_features.json
+++ b/tests/components/spotify/fixtures/audio_features.json
@@ -1,7 +1,7 @@
 {
   "danceability": 0.696,
   "energy": 0.905,
-  "key": 3,
+  "key": 2,
   "loudness": -2.743,
   "mode": 1,
   "speechiness": 0.103,
diff --git a/tests/components/spotify/snapshots/test_diagnostics.ambr b/tests/components/spotify/snapshots/test_diagnostics.ambr
index 161b6025ff3..264f99bed60 100644
--- a/tests/components/spotify/snapshots/test_diagnostics.ambr
+++ b/tests/components/spotify/snapshots/test_diagnostics.ambr
@@ -19,7 +19,7 @@
         'danceability': 0.696,
         'energy': 0.905,
         'instrumentalness': 0.000905,
-        'key': 3,
+        'key': 2,
         'liveness': 0.302,
         'loudness': -2.743,
         'mode': 1,
diff --git a/tests/components/spotify/snapshots/test_sensor.ambr b/tests/components/spotify/snapshots/test_sensor.ambr
index ce77dda479f..5c99c878286 100644
--- a/tests/components/spotify/snapshots/test_sensor.ambr
+++ b/tests/components/spotify/snapshots/test_sensor.ambr
@@ -1,436 +1,4 @@
 # serializer version: 1
-# name: test_entities[sensor.spotify_spotify_1_song_acousticness-entry]
-  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.spotify_spotify_1_song_acousticness',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Song acousticness',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'acousticness',
-    'unique_id': '1112264111_acousticness',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_acousticness-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Spotify spotify_1 Song acousticness',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_acousticness',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.1',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_danceability-entry]
-  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.spotify_spotify_1_song_danceability',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Song danceability',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'danceability',
-    'unique_id': '1112264111_danceability',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_danceability-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Spotify spotify_1 Song danceability',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_danceability',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '69.6',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_energy-entry]
-  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.spotify_spotify_1_song_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Song energy',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'energy',
-    'unique_id': '1112264111_energy',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Spotify spotify_1 Song energy',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '90.5',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_instrumentalness-entry]
-  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.spotify_spotify_1_song_instrumentalness',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Song instrumentalness',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'instrumentalness',
-    'unique_id': '1112264111_instrumentalness',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_instrumentalness-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Spotify spotify_1 Song instrumentalness',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_instrumentalness',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '0.0905',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_key-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        'C',
-        'C♯/D♭',
-        'D',
-        'D♯/E♭',
-        'E',
-        'F',
-        'F♯/G♭',
-        'G',
-        'G♯/A♭',
-        'A',
-        'A♯/B♭',
-        'B',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.spotify_spotify_1_song_key',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
-    'original_icon': None,
-    'original_name': 'Song key',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'key',
-    'unique_id': '1112264111_key',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_key-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'enum',
-      'friendly_name': 'Spotify spotify_1 Song key',
-      'options': list([
-        'C',
-        'C♯/D♭',
-        'D',
-        'D♯/E♭',
-        'E',
-        'F',
-        'F♯/G♭',
-        'G',
-        'G♯/A♭',
-        'A',
-        'A♯/B♭',
-        'B',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_key',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'D♯/E♭',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_liveness-entry]
-  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.spotify_spotify_1_song_liveness',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Song liveness',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'liveness',
-    'unique_id': '1112264111_liveness',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_liveness-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Spotify spotify_1 Song liveness',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_liveness',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '30.2',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_mode-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        'major',
-        'minor',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.spotify_spotify_1_song_mode',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
-    'original_icon': None,
-    'original_name': 'Song mode',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'mode',
-    'unique_id': '1112264111_mode',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_mode-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'enum',
-      'friendly_name': 'Spotify spotify_1 Song mode',
-      'options': list([
-        'major',
-        'minor',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_mode',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'major',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_speechiness-entry]
-  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.spotify_spotify_1_song_speechiness',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Song speechiness',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'speechiness',
-    'unique_id': '1112264111_speechiness',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_speechiness-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Spotify spotify_1 Song speechiness',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_speechiness',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '10.3',
-  })
-# ---
 # name: test_entities[sensor.spotify_spotify_1_song_tempo-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -481,115 +49,3 @@
     'state': '114.944',
   })
 # ---
-# name: test_entities[sensor.spotify_spotify_1_song_time_signature-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'options': list([
-        '3/4',
-        '4/4',
-        '5/4',
-        '6/4',
-        '7/4',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.spotify_spotify_1_song_time_signature',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
-    'original_icon': None,
-    'original_name': 'Song time signature',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'time_signature',
-    'unique_id': '1112264111_time_signature',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_time_signature-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'enum',
-      'friendly_name': 'Spotify spotify_1 Song time signature',
-      'options': list([
-        '3/4',
-        '4/4',
-        '5/4',
-        '6/4',
-        '7/4',
-      ]),
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_time_signature',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '4/4',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_valence-entry]
-  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.spotify_spotify_1_song_valence',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 0,
-      }),
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Song valence',
-    'platform': 'spotify',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'valence',
-    'unique_id': '1112264111_valence',
-    'unit_of_measurement': '%',
-  })
-# ---
-# name: test_entities[sensor.spotify_spotify_1_song_valence-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Spotify spotify_1 Song valence',
-      'unit_of_measurement': '%',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.spotify_spotify_1_song_valence',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '62.5',
-  })
-# ---
diff --git a/tests/components/spotify/test_sensor.py b/tests/components/spotify/test_sensor.py
index 11ce361034a..b5fd2389e69 100644
--- a/tests/components/spotify/test_sensor.py
+++ b/tests/components/spotify/test_sensor.py
@@ -17,7 +17,6 @@ from tests.common import MockConfigEntry, load_fixture, snapshot_platform
 
 
 @pytest.mark.usefixtures("setup_credentials")
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_entities(
     hass: HomeAssistant,
     mock_spotify: MagicMock,
diff --git a/tests/components/squeezebox/conftest.py b/tests/components/squeezebox/conftest.py
index 2dc0cabeaa6..39b705a7de2 100644
--- a/tests/components/squeezebox/conftest.py
+++ b/tests/components/squeezebox/conftest.py
@@ -207,7 +207,7 @@ def player_factory() -> MagicMock:
 def mock_pysqueezebox_player(uuid: str) -> MagicMock:
     """Mock a Lyrion Media Server player."""
     with patch(
-        "homeassistant.components.squeezebox.Player", autospec=True
+        "homeassistant.components.squeezebox.media_player.Player", autospec=True
     ) as mock_player:
         mock_player.async_browse = AsyncMock(side_effect=mock_async_browse)
         mock_player.generate_image_url_from_track_id = MagicMock(
diff --git a/tests/components/squeezebox/test_media_player.py b/tests/components/squeezebox/test_media_player.py
index 080a2161b4d..7721a2b86b4 100644
--- a/tests/components/squeezebox/test_media_player.py
+++ b/tests/components/squeezebox/test_media_player.py
@@ -30,14 +30,10 @@ from homeassistant.components.media_player import (
     MediaType,
     RepeatMode,
 )
-from homeassistant.components.squeezebox.const import (
-    DISCOVERY_INTERVAL,
-    DOMAIN,
-    PLAYER_UPDATE_INTERVAL,
-    SENSOR_UPDATE_INTERVAL,
-)
+from homeassistant.components.squeezebox.const import DOMAIN, SENSOR_UPDATE_INTERVAL
 from homeassistant.components.squeezebox.media_player import (
     ATTR_PARAMETERS,
+    DISCOVERY_INTERVAL,
     SERVICE_CALL_METHOD,
     SERVICE_CALL_QUERY,
 )
@@ -105,9 +101,12 @@ async def test_squeezebox_player_rediscovery(
 
     # Make the player appear unavailable
     configured_player.connected = False
-    freezer.tick(timedelta(seconds=PLAYER_UPDATE_INTERVAL))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "media_player.test_player"},
+        blocking=True,
+    )
     assert hass.states.get("media_player.test_player").state == STATE_UNAVAILABLE
 
     # Make the player available again
@@ -116,7 +115,7 @@ async def test_squeezebox_player_rediscovery(
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
 
-    freezer.tick(timedelta(seconds=PLAYER_UPDATE_INTERVAL))
+    freezer.tick(timedelta(seconds=SENSOR_UPDATE_INTERVAL))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
     assert hass.states.get("media_player.test_player").state == MediaPlayerState.IDLE
diff --git a/tests/components/srp_energy/test_config_flow.py b/tests/components/srp_energy/test_config_flow.py
index e3abb3c98df..149e08014ac 100644
--- a/tests/components/srp_energy/test_config_flow.py
+++ b/tests/components/srp_energy/test_config_flow.py
@@ -100,6 +100,10 @@ async def test_form_invalid_auth(
     assert result["errors"] == {"base": "invalid_auth"}
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.srp_energy.config.abort.unknown"],
+)
 async def test_form_unknown_error(
     hass: HomeAssistant,
     mock_srp_energy_config_flow: MagicMock,
diff --git a/tests/components/statistics/snapshots/test_config_flow.ambr b/tests/components/statistics/snapshots/test_config_flow.ambr
index 5f79c56dec7..8d274cd86c6 100644
--- a/tests/components/statistics/snapshots/test_config_flow.ambr
+++ b/tests/components/statistics/snapshots/test_config_flow.ambr
@@ -4,6 +4,7 @@
     'attributes': dict({
       'friendly_name': 'Statistical characteristic',
       'icon': 'mdi:calculator',
+      'state_class': 'measurement',
     }),
     'state': 'unavailable',
   })
diff --git a/tests/components/statistics/test_sensor.py b/tests/components/statistics/test_sensor.py
index 7e2bc1cb16b..c90d685714c 100644
--- a/tests/components/statistics/test_sensor.py
+++ b/tests/components/statistics/test_sensor.py
@@ -2,11 +2,9 @@
 
 from __future__ import annotations
 
-from asyncio import Event as AsyncioEvent
 from collections.abc import Sequence
 from datetime import datetime, timedelta
 import statistics
-from threading import Event
 from typing import Any
 from unittest.mock import patch
 
@@ -14,7 +12,7 @@ from freezegun import freeze_time
 import pytest
 
 from homeassistant import config as hass_config
-from homeassistant.components.recorder import Recorder, history
+from homeassistant.components.recorder import Recorder
 from homeassistant.components.sensor import (
     ATTR_STATE_CLASS,
     SensorDeviceClass,
@@ -52,7 +50,6 @@ from tests.components.recorder.common import async_wait_recording_done
 
 VALUES_BINARY = ["on", "off", "on", "off", "on", "off", "on", "off", "on"]
 VALUES_NUMERIC = [17, 20, 15.2, 5, 3.8, 9.2, 6.7, 14, 6]
-VALUES_NUMERIC_LINEAR = [1, 2, 3, 4, 5, 6, 7, 8, 9]
 
 
 async def test_unique_id(
@@ -250,15 +247,8 @@ async def test_sensor_defaults_binary(hass: HomeAssistant) -> None:
     assert "age_coverage_ratio" not in state.attributes
 
 
-async def test_sensor_state_reported(hass: HomeAssistant) -> None:
-    """Test the behavior of the sensor with a sequence of identical values.
-
-    Forced updates no longer make a difference, since the statistics are now reacting not
-    only to state change events but also to state report events (EVENT_STATE_REPORTED).
-    This means repeating values will be added to the buffer repeatedly in both cases.
-    This fixes problems with time based averages and some other functions that behave
-    differently when repeating values are reported.
-    """
+async def test_sensor_source_with_force_update(hass: HomeAssistant) -> None:
+    """Test the behavior of the sensor when the source sensor force-updates with same value."""
     repeating_values = [18, 0, 0, 0, 0, 0, 0, 0, 9]
     assert await async_setup_component(
         hass,
@@ -301,9 +291,9 @@ async def test_sensor_state_reported(hass: HomeAssistant) -> None:
     state_normal = hass.states.get("sensor.test_normal")
     state_force = hass.states.get("sensor.test_force")
     assert state_normal and state_force
-    assert state_normal.state == str(round(sum(repeating_values) / 9, 2))
+    assert state_normal.state == str(round(sum(repeating_values) / 3, 2))
     assert state_force.state == str(round(sum(repeating_values) / 9, 2))
-    assert state_normal.attributes.get("buffer_usage_ratio") == round(9 / 20, 2)
+    assert state_normal.attributes.get("buffer_usage_ratio") == round(3 / 20, 2)
     assert state_force.attributes.get("buffer_usage_ratio") == round(9 / 20, 2)
 
 
@@ -1023,7 +1013,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "average_linear",
             "value_0": STATE_UNKNOWN,
-            "value_1": 6.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": 10.68,
             "unit": "°C",
         },
@@ -1031,7 +1021,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "average_step",
             "value_0": STATE_UNKNOWN,
-            "value_1": 6.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": 11.36,
             "unit": "°C",
         },
@@ -1123,7 +1113,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "distance_95_percent_of_values",
             "value_0": STATE_UNKNOWN,
-            "value_1": 0.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": float(round(2 * 1.96 * statistics.stdev(VALUES_NUMERIC), 2)),
             "unit": "°C",
         },
@@ -1131,7 +1121,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "distance_99_percent_of_values",
             "value_0": STATE_UNKNOWN,
-            "value_1": 0.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": float(round(2 * 2.58 * statistics.stdev(VALUES_NUMERIC), 2)),
             "unit": "°C",
         },
@@ -1171,7 +1161,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "noisiness",
             "value_0": STATE_UNKNOWN,
-            "value_1": 0.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": float(round(sum([3, 4.8, 10.2, 1.2, 5.4, 2.5, 7.3, 8]) / 8, 2)),
             "unit": "°C",
         },
@@ -1179,7 +1169,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "percentile",
             "value_0": STATE_UNKNOWN,
-            "value_1": 6.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": 9.2,
             "unit": "°C",
         },
@@ -1187,7 +1177,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "standard_deviation",
             "value_0": STATE_UNKNOWN,
-            "value_1": 0.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": float(round(statistics.stdev(VALUES_NUMERIC), 2)),
             "unit": "°C",
         },
@@ -1203,7 +1193,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "sum_differences",
             "value_0": STATE_UNKNOWN,
-            "value_1": 0.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": float(
                 sum(
                     [
@@ -1224,7 +1214,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "sum_differences_nonnegative",
             "value_0": STATE_UNKNOWN,
-            "value_1": 0.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": float(
                 sum(
                     [
@@ -1269,7 +1259,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "sensor",
             "name": "variance",
             "value_0": STATE_UNKNOWN,
-            "value_1": 0.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": float(round(statistics.variance(VALUES_NUMERIC), 2)),
             "unit": "°C²",
         },
@@ -1277,7 +1267,7 @@ async def test_state_characteristics(hass: HomeAssistant) -> None:
             "source_sensor_domain": "binary_sensor",
             "name": "average_step",
             "value_0": STATE_UNKNOWN,
-            "value_1": 100.0,
+            "value_1": STATE_UNKNOWN,
             "value_9": 50.0,
             "unit": "%",
         },
@@ -1711,324 +1701,3 @@ async def test_device_id(
     statistics_entity = entity_registry.async_get("sensor.statistics")
     assert statistics_entity is not None
     assert statistics_entity.device_id == source_entity.device_id
-
-
-async def test_update_before_load(recorder_mock: Recorder, hass: HomeAssistant) -> None:
-    """Verify that updates happening before reloading from the database are handled correctly."""
-
-    current_time = dt_util.utcnow()
-
-    # enable and pre-fill the recorder
-    await hass.async_block_till_done()
-    await async_wait_recording_done(hass)
-
-    with (
-        freeze_time(current_time) as freezer,
-    ):
-        for value in VALUES_NUMERIC_LINEAR:
-            hass.states.async_set(
-                "sensor.test_monitored",
-                str(value),
-                {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS},
-            )
-            await hass.async_block_till_done()
-            current_time += timedelta(seconds=1)
-            freezer.move_to(current_time)
-
-        await async_wait_recording_done(hass)
-
-        # some synchronisation is needed to prevent that loading from the database finishes too soon
-        # we want this to take long enough to be able to try to add a value BEFORE loading is done
-        state_changes_during_period_called_evt = AsyncioEvent()
-        state_changes_during_period_stall_evt = Event()
-        real_state_changes_during_period = history.state_changes_during_period
-
-        def mock_state_changes_during_period(*args, **kwargs):
-            states = real_state_changes_during_period(*args, **kwargs)
-            hass.loop.call_soon_threadsafe(state_changes_during_period_called_evt.set)
-            state_changes_during_period_stall_evt.wait()
-            return states
-
-        # create the statistics component, get filled from database
-        with patch(
-            "homeassistant.components.statistics.sensor.history.state_changes_during_period",
-            mock_state_changes_during_period,
-        ):
-            assert await async_setup_component(
-                hass,
-                "sensor",
-                {
-                    "sensor": [
-                        {
-                            "platform": "statistics",
-                            "name": "test",
-                            "entity_id": "sensor.test_monitored",
-                            "state_characteristic": "average_step",
-                            "max_age": {"seconds": 10},
-                        },
-                    ]
-                },
-            )
-            # adding this value is going to be ignored, since loading from the database hasn't finished yet
-            # if this value would be added before loading from the database is done
-            # it would mess up the order of the internal queue which is supposed to be sorted by time
-            await state_changes_during_period_called_evt.wait()
-            hass.states.async_set(
-                "sensor.test_monitored",
-                "10",
-                {ATTR_UNIT_OF_MEASUREMENT: DEGREE},
-            )
-            state_changes_during_period_stall_evt.set()
-            await hass.async_block_till_done()
-
-    # we will end up with a buffer of [1 .. 9] (10 wasn't added)
-    # so the computed average_step is 1+2+3+4+5+6+7+8/8 = 4.5
-    assert float(hass.states.get("sensor.test").state) == pytest.approx(4.5)
-
-
-async def test_average_linear_unevenly_timed(hass: HomeAssistant) -> None:
-    """Test the average_linear state characteristic with unevenly distributed values.
-
-    This also implicitly tests the correct timing of repeating values.
-    """
-    values_and_times = [[5.0, 2], [10.0, 1], [10.0, 1], [10.0, 2], [5.0, 1]]
-
-    current_time = dt_util.utcnow()
-
-    with (
-        freeze_time(current_time) as freezer,
-    ):
-        assert await async_setup_component(
-            hass,
-            "sensor",
-            {
-                "sensor": [
-                    {
-                        "platform": "statistics",
-                        "name": "test_sensor_average_linear",
-                        "entity_id": "sensor.test_monitored",
-                        "state_characteristic": "average_linear",
-                        "max_age": {"seconds": 10},
-                    },
-                ]
-            },
-        )
-        await hass.async_block_till_done()
-
-        for value_and_time in values_and_times:
-            hass.states.async_set(
-                "sensor.test_monitored",
-                str(value_and_time[0]),
-                {ATTR_UNIT_OF_MEASUREMENT: DEGREE},
-            )
-            current_time += timedelta(seconds=value_and_time[1])
-            freezer.move_to(current_time)
-
-        await hass.async_block_till_done()
-
-        state = hass.states.get("sensor.test_sensor_average_linear")
-        assert state is not None
-        assert state.state == "8.33", (
-            "value mismatch for characteristic 'sensor/average_linear' - "
-            f"assert {state.state} == 8.33"
-        )
-
-
-async def test_sensor_unit_gets_removed(hass: HomeAssistant) -> None:
-    """Test when input lose its unit of measurement."""
-    assert await async_setup_component(
-        hass,
-        "sensor",
-        {
-            "sensor": [
-                {
-                    "platform": "statistics",
-                    "name": "test",
-                    "entity_id": "sensor.test_monitored",
-                    "state_characteristic": "mean",
-                    "sampling_size": 10,
-                },
-            ]
-        },
-    )
-    await hass.async_block_till_done()
-
-    input_attributes = {
-        ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT,
-        ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE,
-        ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS,
-    }
-
-    for value in VALUES_NUMERIC:
-        hass.states.async_set(
-            "sensor.test_monitored",
-            str(value),
-            input_attributes,
-        )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == str(round(sum(VALUES_NUMERIC) / len(VALUES_NUMERIC), 2))
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
-    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-
-    hass.states.async_set(
-        "sensor.test_monitored",
-        str(VALUES_NUMERIC[0]),
-        {
-            ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT,
-            ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE,
-        },
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == "11.39"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None
-    # Temperature device class is not valid with no unit of measurement
-    assert state.attributes.get(ATTR_DEVICE_CLASS) is None
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-
-    for value in VALUES_NUMERIC:
-        hass.states.async_set(
-            "sensor.test_monitored",
-            str(value),
-            input_attributes,
-        )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == "11.39"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
-    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-
-
-async def test_sensor_device_class_gets_removed(hass: HomeAssistant) -> None:
-    """Test when device class gets removed."""
-    assert await async_setup_component(
-        hass,
-        "sensor",
-        {
-            "sensor": [
-                {
-                    "platform": "statistics",
-                    "name": "test",
-                    "entity_id": "sensor.test_monitored",
-                    "state_characteristic": "mean",
-                    "sampling_size": 10,
-                },
-            ]
-        },
-    )
-    await hass.async_block_till_done()
-
-    input_attributes = {
-        ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT,
-        ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE,
-        ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS,
-    }
-
-    for value in VALUES_NUMERIC:
-        hass.states.async_set(
-            "sensor.test_monitored",
-            str(value),
-            input_attributes,
-        )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == str(round(sum(VALUES_NUMERIC) / len(VALUES_NUMERIC), 2))
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
-    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-
-    hass.states.async_set(
-        "sensor.test_monitored",
-        str(VALUES_NUMERIC[0]),
-        {
-            ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT,
-            ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS,
-        },
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == "11.39"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
-    assert state.attributes.get(ATTR_DEVICE_CLASS) is None
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-
-    for value in VALUES_NUMERIC:
-        hass.states.async_set(
-            "sensor.test_monitored",
-            str(value),
-            input_attributes,
-        )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == "11.39"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
-    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-
-
-async def test_not_valid_device_class(hass: HomeAssistant) -> None:
-    """Test when not valid device class."""
-    assert await async_setup_component(
-        hass,
-        "sensor",
-        {
-            "sensor": [
-                {
-                    "platform": "statistics",
-                    "name": "test",
-                    "entity_id": "sensor.test_monitored",
-                    "state_characteristic": "mean",
-                    "sampling_size": 10,
-                },
-            ]
-        },
-    )
-    await hass.async_block_till_done()
-
-    for value in VALUES_NUMERIC:
-        hass.states.async_set(
-            "sensor.test_monitored",
-            str(value),
-            {
-                ATTR_DEVICE_CLASS: SensorDeviceClass.DATE,
-            },
-        )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == str(round(sum(VALUES_NUMERIC) / len(VALUES_NUMERIC), 2))
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None
-    assert state.attributes.get(ATTR_DEVICE_CLASS) is None
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-
-    hass.states.async_set(
-        "sensor.test_monitored",
-        str(10),
-        {
-            ATTR_DEVICE_CLASS: "not_exist",
-        },
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("sensor.test")
-    assert state is not None
-    assert state.state == "10.69"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None
-    assert state.attributes.get(ATTR_DEVICE_CLASS) is None
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
diff --git a/tests/components/subaru/test_config_flow.py b/tests/components/subaru/test_config_flow.py
index 6abc544c92a..d930aafbdfb 100644
--- a/tests/components/subaru/test_config_flow.py
+++ b/tests/components/subaru/test_config_flow.py
@@ -192,6 +192,10 @@ async def test_two_factor_request_success(
     assert len(mock_two_factor_request.mock_calls) == 1
 
 
+@pytest.mark.parametrize(  # Remove when translations fixed
+    "ignore_translations",
+    ["component.subaru.config.abort.two_factor_request_failed"],
+)
 async def test_two_factor_request_fail(
     hass: HomeAssistant, two_factor_start_form
 ) -> None:
diff --git a/tests/components/suez_water/__init__.py b/tests/components/suez_water/__init__.py
index a90df738454..4605e06344a 100644
--- a/tests/components/suez_water/__init__.py
+++ b/tests/components/suez_water/__init__.py
@@ -1,15 +1 @@
 """Tests for the Suez Water integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
-) -> None:
-    """Init suez water integration."""
-    mock_config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/suez_water/conftest.py b/tests/components/suez_water/conftest.py
index f634a053c65..f218fb7d833 100644
--- a/tests/components/suez_water/conftest.py
+++ b/tests/components/suez_water/conftest.py
@@ -3,31 +3,8 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
-from pysuez import AggregatedData, PriceResult
-from pysuez.const import ATTRIBUTION
 import pytest
 
-from homeassistant.components.suez_water.const import DOMAIN
-
-from tests.common import MockConfigEntry
-
-MOCK_DATA = {
-    "username": "test-username",
-    "password": "test-password",
-    "counter_id": "test-counter",
-}
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Create mock config_entry needed by suez_water integration."""
-    return MockConfigEntry(
-        unique_id=MOCK_DATA["username"],
-        domain=DOMAIN,
-        title="Suez mock device",
-        data=MOCK_DATA,
-    )
-
 
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
@@ -36,45 +13,3 @@ def mock_setup_entry() -> Generator[AsyncMock]:
         "homeassistant.components.suez_water.async_setup_entry", return_value=True
     ) as mock_setup_entry:
         yield mock_setup_entry
-
-
-@pytest.fixture(name="suez_client")
-def mock_suez_client() -> Generator[AsyncMock]:
-    """Create mock for suez_water external api."""
-    with (
-        patch(
-            "homeassistant.components.suez_water.coordinator.SuezClient", autospec=True
-        ) as mock_client,
-        patch(
-            "homeassistant.components.suez_water.config_flow.SuezClient",
-            new=mock_client,
-        ),
-    ):
-        suez_client = mock_client.return_value
-        suez_client.check_credentials.return_value = True
-
-        result = AggregatedData(
-            value=160,
-            current_month={
-                "2024-01-01": 130,
-                "2024-01-02": 145,
-            },
-            previous_month={
-                "2024-12-01": 154,
-                "2024-12-02": 166,
-            },
-            current_year=1500,
-            previous_year=1000,
-            attribution=ATTRIBUTION,
-            highest_monthly_consumption=2558,
-            history={
-                "2024-01-01": 130,
-                "2024-01-02": 145,
-                "2024-12-01": 154,
-                "2024-12-02": 166,
-            },
-        )
-
-        suez_client.fetch_aggregated_data.return_value = result
-        suez_client.get_price.return_value = PriceResult("4.74")
-        yield suez_client
diff --git a/tests/components/suez_water/snapshots/test_sensor.ambr b/tests/components/suez_water/snapshots/test_sensor.ambr
deleted file mode 100644
index da0ed3df7dd..00000000000
--- a/tests/components/suez_water/snapshots/test_sensor.ambr
+++ /dev/null
@@ -1,116 +0,0 @@
-# serializer version: 1
-# name: test_sensors_valid_state[sensor.suez_mock_device_water_price-entry]
-  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.suez_mock_device_water_price',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.MONETARY: 'monetary'>,
-    'original_icon': None,
-    'original_name': 'Water price',
-    'platform': 'suez_water',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'water_price',
-    'unique_id': 'test-counter_water_price',
-    'unit_of_measurement': '€',
-  })
-# ---
-# name: test_sensors_valid_state[sensor.suez_mock_device_water_price-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by toutsurmoneau.fr',
-      'device_class': 'monetary',
-      'friendly_name': 'Suez mock device Water price',
-      'unit_of_measurement': '€',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.suez_mock_device_water_price',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '4.74',
-  })
-# ---
-# name: test_sensors_valid_state[sensor.suez_mock_device_water_usage_yesterday-entry]
-  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.suez_mock_device_water_usage_yesterday',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.WATER: 'water'>,
-    'original_icon': None,
-    'original_name': 'Water usage yesterday',
-    'platform': 'suez_water',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'water_usage_yesterday',
-    'unique_id': 'test-counter_water_usage_yesterday',
-    'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
-  })
-# ---
-# name: test_sensors_valid_state[sensor.suez_mock_device_water_usage_yesterday-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by toutsurmoneau.fr',
-      'device_class': 'water',
-      'friendly_name': 'Suez mock device Water usage yesterday',
-      'highest_monthly_consumption': 2558,
-      'history': dict({
-        '2024-01-01': 130,
-        '2024-01-02': 145,
-        '2024-12-01': 154,
-        '2024-12-02': 166,
-      }),
-      'last_year_overall': 1000,
-      'previous_month_consumption': dict({
-        '2024-12-01': 154,
-        '2024-12-02': 166,
-      }),
-      'this_month_consumption': dict({
-        '2024-01-01': 130,
-        '2024-01-02': 145,
-      }),
-      'this_year_overall': 1500,
-      'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.suez_mock_device_water_usage_yesterday',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '160',
-  })
-# ---
diff --git a/tests/components/suez_water/test_config_flow.py b/tests/components/suez_water/test_config_flow.py
index 6779b4c7d02..3170a6779f0 100644
--- a/tests/components/suez_water/test_config_flow.py
+++ b/tests/components/suez_water/test_config_flow.py
@@ -1,23 +1,25 @@
 """Test the Suez Water config flow."""
 
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, patch
 
-from pysuez.exception import PySuezError
+from pysuez.client import PySuezError
 import pytest
 
 from homeassistant import config_entries
-from homeassistant.components.suez_water.const import CONF_COUNTER_ID, DOMAIN
+from homeassistant.components.suez_water.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-from .conftest import MOCK_DATA
-
 from tests.common import MockConfigEntry
 
+MOCK_DATA = {
+    "username": "test-username",
+    "password": "test-password",
+    "counter_id": "test-counter",
+}
 
-async def test_form(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, suez_client: AsyncMock
-) -> None:
+
+async def test_form(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}
@@ -25,11 +27,12 @@ async def test_form(
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {}
 
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        MOCK_DATA,
-    )
-    await hass.async_block_till_done()
+    with patch("homeassistant.components.suez_water.config_flow.SuezClient"):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            MOCK_DATA,
+        )
+        await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["title"] == "test-username"
@@ -39,28 +42,37 @@ async def test_form(
 
 
 async def test_form_invalid_auth(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, suez_client: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
 ) -> None:
     """Test we handle invalid auth."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
-    suez_client.check_credentials.return_value = False
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        MOCK_DATA,
-    )
+    with (
+        patch(
+            "homeassistant.components.suez_water.config_flow.SuezClient.__init__",
+            return_value=None,
+        ),
+        patch(
+            "homeassistant.components.suez_water.config_flow.SuezClient.check_credentials",
+            return_value=False,
+        ),
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            MOCK_DATA,
+        )
 
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {"base": "invalid_auth"}
 
-    suez_client.check_credentials.return_value = True
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        MOCK_DATA,
-    )
-    await hass.async_block_till_done()
+    with patch("homeassistant.components.suez_water.config_flow.SuezClient"):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            MOCK_DATA,
+        )
+        await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["title"] == "test-username"
@@ -96,71 +108,34 @@ async def test_form_already_configured(hass: HomeAssistant) -> None:
     ("exception", "error"), [(PySuezError, "cannot_connect"), (Exception, "unknown")]
 )
 async def test_form_error(
-    hass: HomeAssistant,
-    mock_setup_entry: AsyncMock,
-    exception: Exception,
-    suez_client: AsyncMock,
-    error: str,
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, exception: Exception, error: str
 ) -> None:
     """Test we handle errors."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
-    suez_client.check_credentials.side_effect = exception
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        MOCK_DATA,
-    )
+    with patch(
+        "homeassistant.components.suez_water.config_flow.SuezClient",
+        side_effect=exception,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            MOCK_DATA,
+        )
 
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {"base": error}
 
-    suez_client.check_credentials.return_value = True
-    suez_client.check_credentials.side_effect = None
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        MOCK_DATA,
-    )
+    with patch(
+        "homeassistant.components.suez_water.config_flow.SuezClient",
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            MOCK_DATA,
+        )
 
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["title"] == "test-username"
     assert result["data"] == MOCK_DATA
     assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_auto_counter(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, suez_client: AsyncMock
-) -> None:
-    """Test form set counter if not set by user."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {}
-
-    partial_form = {**MOCK_DATA}
-    partial_form.pop(CONF_COUNTER_ID)
-    suez_client.find_counter.side_effect = PySuezError("test counter not found")
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        partial_form,
-    )
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "counter_not_found"}
-
-    suez_client.find_counter.side_effect = None
-    suez_client.find_counter.return_value = MOCK_DATA[CONF_COUNTER_ID]
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        partial_form,
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "test-username"
-    assert result["result"].unique_id == "test-username"
-    assert result["data"] == MOCK_DATA
-    assert len(mock_setup_entry.mock_calls) == 1
diff --git a/tests/components/suez_water/test_init.py b/tests/components/suez_water/test_init.py
deleted file mode 100644
index 78d086af38f..00000000000
--- a/tests/components/suez_water/test_init.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""Test Suez_water integration initialization."""
-
-from unittest.mock import AsyncMock
-
-from homeassistant.components.suez_water.coordinator import PySuezError
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry
-
-
-async def test_initialization_invalid_credentials(
-    hass: HomeAssistant,
-    suez_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test that suez_water can't be loaded with invalid credentials."""
-
-    suez_client.check_credentials.return_value = False
-    await setup_integration(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
-
-
-async def test_initialization_setup_api_error(
-    hass: HomeAssistant,
-    suez_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test that suez_water needs to retry loading if api failed to connect."""
-
-    suez_client.check_credentials.side_effect = PySuezError("Test failure")
-    await setup_integration(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/suez_water/test_sensor.py b/tests/components/suez_water/test_sensor.py
deleted file mode 100644
index cb578432f62..00000000000
--- a/tests/components/suez_water/test_sensor.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""Test Suez_water sensor platform."""
-
-from unittest.mock import AsyncMock, patch
-
-from freezegun.api import FrozenDateTimeFactory
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.suez_water.const import DATA_REFRESH_INTERVAL
-from homeassistant.components.suez_water.coordinator import PySuezError
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_UNAVAILABLE, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
-
-
-async def test_sensors_valid_state(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    suez_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-) -> None:
-    """Test that suez_water sensor is loaded and in a valid state."""
-    with patch("homeassistant.components.suez_water.PLATFORMS", [Platform.SENSOR]):
-        await setup_integration(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-@pytest.mark.parametrize("method", [("fetch_aggregated_data"), ("get_price")])
-async def test_sensors_failed_update(
-    hass: HomeAssistant,
-    suez_client: AsyncMock,
-    mock_config_entry: MockConfigEntry,
-    freezer: FrozenDateTimeFactory,
-    method: str,
-) -> None:
-    """Test that suez_water sensor reflect failure when api fails."""
-
-    await setup_integration(hass, mock_config_entry)
-
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    entity_ids = await hass.async_add_executor_job(hass.states.entity_ids)
-    assert len(entity_ids) == 2
-
-    for entity in entity_ids:
-        state = hass.states.get(entity)
-        assert entity
-        assert state.state != STATE_UNAVAILABLE
-
-    getattr(suez_client, method).side_effect = PySuezError("Should fail to update")
-
-    freezer.tick(DATA_REFRESH_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done(True)
-
-    for entity in entity_ids:
-        state = hass.states.get(entity)
-        assert entity
-        assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/switchbot/__init__.py b/tests/components/switchbot/__init__.py
index bd3985ff062..b2a8445546e 100644
--- a/tests/components/switchbot/__init__.py
+++ b/tests/components/switchbot/__init__.py
@@ -205,28 +205,3 @@ NOT_SWITCHBOT_INFO = BluetoothServiceInfoBleak(
     connectable=True,
     tx_power=-127,
 )
-
-
-WOMETERTHPC_SERVICE_INFO = BluetoothServiceInfoBleak(
-    name="WoTHPc",
-    manufacturer_data={
-        2409: b"\xb0\xe9\xfeT2\x15\xb7\xe4\x07\x9b\xa4\x007\x02\xd5\x00"
-    },
-    service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": b"5\x00d"},
-    service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
-    address="AA:BB:CC:DD:EE:AA",
-    rssi=-60,
-    source="local",
-    advertisement=generate_advertisement_data(
-        local_name="WoTHPc",
-        manufacturer_data={
-            2409: b"\xb0\xe9\xfeT2\x15\xb7\xe4\x07\x9b\xa4\x007\x02\xd5\x00"
-        },
-        service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": b"5\x00d"},
-        service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
-    ),
-    device=generate_ble_device("AA:BB:CC:DD:EE:AA", "WoTHPc"),
-    time=0,
-    connectable=True,
-    tx_power=-127,
-)
diff --git a/tests/components/switchbot/test_sensor.py b/tests/components/switchbot/test_sensor.py
index 3adeaef936c..030a477596c 100644
--- a/tests/components/switchbot/test_sensor.py
+++ b/tests/components/switchbot/test_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from . import WOHAND_SERVICE_INFO, WOMETERTHPC_SERVICE_INFO
+from . import WOHAND_SERVICE_INFO
 
 from tests.common import MockConfigEntry
 from tests.components.bluetooth import inject_bluetooth_service_info
@@ -59,49 +59,3 @@ async def test_sensors(hass: HomeAssistant) -> None:
 
     assert await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
-
-
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_co2_sensor(hass: HomeAssistant) -> None:
-    """Test setting up creates the co2 sensor for a WoTHPc."""
-    await async_setup_component(hass, DOMAIN, {})
-    inject_bluetooth_service_info(hass, WOMETERTHPC_SERVICE_INFO)
-
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_ADDRESS: "AA:BB:CC:DD:EE:AA",
-            CONF_NAME: "test-name",
-            CONF_PASSWORD: "test-password",
-            CONF_SENSOR_TYPE: "hygrometer_co2",
-        },
-        unique_id="aabbccddeeaa",
-    )
-    entry.add_to_hass(hass)
-
-    assert await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert len(hass.states.async_all("sensor")) == 5
-
-    battery_sensor = hass.states.get("sensor.test_name_battery")
-    battery_sensor_attrs = battery_sensor.attributes
-    assert battery_sensor.state == "100"
-    assert battery_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Battery"
-    assert battery_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "%"
-    assert battery_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
-
-    rssi_sensor = hass.states.get("sensor.test_name_bluetooth_signal")
-    rssi_sensor_attrs = rssi_sensor.attributes
-    assert rssi_sensor.state == "-60"
-    assert rssi_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Bluetooth signal"
-    assert rssi_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "dBm"
-
-    co2_sensor = hass.states.get("sensor.test_name_carbon_dioxide")
-    co2_sensor_attrs = co2_sensor.attributes
-    assert co2_sensor.state == "725"
-    assert co2_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Carbon dioxide"
-    assert co2_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "ppm"
-
-    assert await hass.config_entries.async_unload(entry.entry_id)
-    await hass.async_block_till_done()
diff --git a/tests/components/switchbot_cloud/conftest.py b/tests/components/switchbot_cloud/conftest.py
index 09c953da06b..b559930dedb 100644
--- a/tests/components/switchbot_cloud/conftest.py
+++ b/tests/components/switchbot_cloud/conftest.py
@@ -5,8 +5,6 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 
-from homeassistant.components.switchbot_cloud import SwitchBotAPI
-
 
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
@@ -16,17 +14,3 @@ def mock_setup_entry() -> Generator[AsyncMock]:
         return_value=True,
     ) as mock_setup_entry:
         yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_list_devices():
-    """Mock list_devices."""
-    with patch.object(SwitchBotAPI, "list_devices") as mock_list_devices:
-        yield mock_list_devices
-
-
-@pytest.fixture
-def mock_get_status():
-    """Mock get_status."""
-    with patch.object(SwitchBotAPI, "get_status") as mock_get_status:
-        yield mock_get_status
diff --git a/tests/components/switchbot_cloud/test_init.py b/tests/components/switchbot_cloud/test_init.py
index 43431ae04c0..25ea370efe5 100644
--- a/tests/components/switchbot_cloud/test_init.py
+++ b/tests/components/switchbot_cloud/test_init.py
@@ -50,18 +50,6 @@ async def test_setup_entry_success(
             remoteType="DIY Plug",
             hubDeviceId="test-hub-id",
         ),
-        Remote(
-            deviceId="meter-pro-1",
-            deviceName="meter-pro-name-1",
-            deviceType="MeterPro(CO2)",
-            hubDeviceId="test-hub-id",
-        ),
-        Remote(
-            deviceId="hub2-1",
-            deviceName="hub2-name-1",
-            deviceType="Hub 2",
-            hubDeviceId="test-hub-id",
-        ),
     ]
     mock_get_status.return_value = {"power": PowerState.ON.value}
     entry = configure_integration(hass)
diff --git a/tests/components/switchbot_cloud/test_lock.py b/tests/components/switchbot_cloud/test_lock.py
deleted file mode 100644
index a09d7241794..00000000000
--- a/tests/components/switchbot_cloud/test_lock.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""Test for the switchbot_cloud lock."""
-
-from unittest.mock import patch
-
-from switchbot_api import Device
-
-from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN, LockState
-from homeassistant.components.switchbot_cloud import SwitchBotAPI
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID, SERVICE_LOCK, SERVICE_UNLOCK
-from homeassistant.core import HomeAssistant
-
-from . import configure_integration
-
-
-async def test_lock(hass: HomeAssistant, mock_list_devices, mock_get_status) -> None:
-    """Test locking and unlocking."""
-    mock_list_devices.return_value = [
-        Device(
-            deviceId="lock-id-1",
-            deviceName="lock-1",
-            deviceType="Smart Lock",
-            hubDeviceId="test-hub-id",
-        ),
-    ]
-
-    mock_get_status.return_value = {"lockState": "locked"}
-
-    entry = configure_integration(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert entry.state is ConfigEntryState.LOADED
-
-    lock_id = "lock.lock_1"
-    assert hass.states.get(lock_id).state == LockState.LOCKED
-
-    with patch.object(SwitchBotAPI, "send_command"):
-        await hass.services.async_call(
-            LOCK_DOMAIN, SERVICE_UNLOCK, {ATTR_ENTITY_ID: lock_id}, blocking=True
-        )
-    assert hass.states.get(lock_id).state == LockState.UNLOCKED
-
-    with patch.object(SwitchBotAPI, "send_command"):
-        await hass.services.async_call(
-            LOCK_DOMAIN, SERVICE_LOCK, {ATTR_ENTITY_ID: lock_id}, blocking=True
-        )
-    assert hass.states.get(lock_id).state == LockState.LOCKED
diff --git a/tests/components/switcher_kis/consts.py b/tests/components/switcher_kis/consts.py
index fe77ee0236b..7b0b5c28f3f 100644
--- a/tests/components/switcher_kis/consts.py
+++ b/tests/components/switcher_kis/consts.py
@@ -4,8 +4,6 @@ from aioswitcher.device import (
     DeviceState,
     DeviceType,
     ShutterDirection,
-    SwitcherDualShutterSingleLight,
-    SwitcherLight,
     SwitcherPowerPlug,
     SwitcherShutter,
     SwitcherSingleShutterDualLight,
@@ -23,28 +21,16 @@ DUMMY_DEVICE_ID2 = "cafe12"
 DUMMY_DEVICE_ID3 = "bada77"
 DUMMY_DEVICE_ID4 = "bbd164"
 DUMMY_DEVICE_ID5 = "bcdb64"
-DUMMY_DEVICE_ID6 = "bcdc64"
-DUMMY_DEVICE_ID7 = "bcdd64"
-DUMMY_DEVICE_ID8 = "bcde64"
-DUMMY_DEVICE_ID9 = "bcdf64"
 DUMMY_DEVICE_KEY1 = "18"
 DUMMY_DEVICE_KEY2 = "01"
 DUMMY_DEVICE_KEY3 = "12"
 DUMMY_DEVICE_KEY4 = "07"
 DUMMY_DEVICE_KEY5 = "15"
-DUMMY_DEVICE_KEY6 = "16"
-DUMMY_DEVICE_KEY7 = "17"
-DUMMY_DEVICE_KEY8 = "18"
-DUMMY_DEVICE_KEY9 = "19"
 DUMMY_DEVICE_NAME1 = "Plug 23BC"
 DUMMY_DEVICE_NAME2 = "Heater FE12"
 DUMMY_DEVICE_NAME3 = "Breeze AB39"
 DUMMY_DEVICE_NAME4 = "Runner DD77"
 DUMMY_DEVICE_NAME5 = "RunnerS11 6CF5"
-DUMMY_DEVICE_NAME6 = "RunnerS12 A9BE"
-DUMMY_DEVICE_NAME7 = "Light 36BB"
-DUMMY_DEVICE_NAME8 = "Light 36CB"
-DUMMY_DEVICE_NAME9 = "Light 36DB"
 DUMMY_DEVICE_PASSWORD = "12345678"
 DUMMY_ELECTRIC_CURRENT1 = 0.5
 DUMMY_ELECTRIC_CURRENT2 = 12.8
@@ -53,28 +39,16 @@ DUMMY_IP_ADDRESS2 = "192.168.100.158"
 DUMMY_IP_ADDRESS3 = "192.168.100.159"
 DUMMY_IP_ADDRESS4 = "192.168.100.160"
 DUMMY_IP_ADDRESS5 = "192.168.100.161"
-DUMMY_IP_ADDRESS6 = "192.168.100.162"
-DUMMY_IP_ADDRESS7 = "192.168.100.163"
-DUMMY_IP_ADDRESS8 = "192.168.100.164"
-DUMMY_IP_ADDRESS9 = "192.168.100.165"
 DUMMY_MAC_ADDRESS1 = "A1:B2:C3:45:67:D8"
 DUMMY_MAC_ADDRESS2 = "A1:B2:C3:45:67:D9"
 DUMMY_MAC_ADDRESS3 = "A1:B2:C3:45:67:DA"
 DUMMY_MAC_ADDRESS4 = "A1:B2:C3:45:67:DB"
 DUMMY_MAC_ADDRESS5 = "A1:B2:C3:45:67:DC"
-DUMMY_MAC_ADDRESS6 = "A1:B2:C3:45:67:DD"
-DUMMY_MAC_ADDRESS7 = "A1:B2:C3:45:67:DE"
-DUMMY_MAC_ADDRESS8 = "A1:B2:C3:45:67:DF"
-DUMMY_MAC_ADDRESS9 = "A1:B2:C3:45:67:DG"
 DUMMY_TOKEN_NEEDED1 = False
 DUMMY_TOKEN_NEEDED2 = False
 DUMMY_TOKEN_NEEDED3 = False
 DUMMY_TOKEN_NEEDED4 = False
 DUMMY_TOKEN_NEEDED5 = True
-DUMMY_TOKEN_NEEDED6 = True
-DUMMY_TOKEN_NEEDED7 = True
-DUMMY_TOKEN_NEEDED8 = True
-DUMMY_TOKEN_NEEDED9 = True
 DUMMY_PHONE_ID = "1234"
 DUMMY_POWER_CONSUMPTION1 = 100
 DUMMY_POWER_CONSUMPTION2 = 2780
@@ -86,15 +60,11 @@ DUMMY_TARGET_TEMPERATURE = 23
 DUMMY_FAN_LEVEL = ThermostatFanLevel.LOW
 DUMMY_SWING = ThermostatSwing.OFF
 DUMMY_REMOTE_ID = "ELEC7001"
-DUMMY_POSITION = [54]
-DUMMY_POSITION_2 = [54, 54]
-DUMMY_DIRECTION = [ShutterDirection.SHUTTER_STOP]
-DUMMY_DIRECTION_2 = [ShutterDirection.SHUTTER_STOP, ShutterDirection.SHUTTER_STOP]
+DUMMY_POSITION = 54
+DUMMY_DIRECTION = ShutterDirection.SHUTTER_STOP
 DUMMY_USERNAME = "email"
 DUMMY_TOKEN = "zvVvd7JxtN7CgvkD1Psujw=="
-DUMMY_LIGHT = [DeviceState.ON]
-DUMMY_LIGHT_2 = [DeviceState.ON, DeviceState.ON]
-DUMMY_LIGHT_3 = [DeviceState.ON, DeviceState.ON, DeviceState.ON]
+DUMMY_LIGHTS = [DeviceState.ON, DeviceState.ON]
 
 DUMMY_PLUG_DEVICE = SwitcherPowerPlug(
     DeviceType.POWER_PLUG,
@@ -148,21 +118,7 @@ DUMMY_SINGLE_SHUTTER_DUAL_LIGHT_DEVICE = SwitcherSingleShutterDualLight(
     DUMMY_TOKEN_NEEDED5,
     DUMMY_POSITION,
     DUMMY_DIRECTION,
-    DUMMY_LIGHT_2,
-)
-
-DUMMY_DUAL_SHUTTER_SINGLE_LIGHT_DEVICE = SwitcherDualShutterSingleLight(
-    DeviceType.RUNNER_S12,
-    DeviceState.ON,
-    DUMMY_DEVICE_ID6,
-    DUMMY_DEVICE_KEY6,
-    DUMMY_IP_ADDRESS6,
-    DUMMY_MAC_ADDRESS6,
-    DUMMY_DEVICE_NAME6,
-    DUMMY_TOKEN_NEEDED6,
-    DUMMY_POSITION_2,
-    DUMMY_DIRECTION_2,
-    DUMMY_LIGHT,
+    DUMMY_LIGHTS,
 )
 
 DUMMY_THERMOSTAT_DEVICE = SwitcherThermostat(
@@ -182,40 +138,4 @@ DUMMY_THERMOSTAT_DEVICE = SwitcherThermostat(
     DUMMY_REMOTE_ID,
 )
 
-DUMMY_LIGHT_DEVICE = SwitcherLight(
-    DeviceType.LIGHT_SL01,
-    DeviceState.ON,
-    DUMMY_DEVICE_ID7,
-    DUMMY_DEVICE_KEY7,
-    DUMMY_IP_ADDRESS7,
-    DUMMY_MAC_ADDRESS7,
-    DUMMY_DEVICE_NAME7,
-    DUMMY_TOKEN_NEEDED7,
-    DUMMY_LIGHT,
-)
-
-DUMMY_DUAL_LIGHT_DEVICE = SwitcherLight(
-    DeviceType.LIGHT_SL02,
-    DeviceState.ON,
-    DUMMY_DEVICE_ID8,
-    DUMMY_DEVICE_KEY8,
-    DUMMY_IP_ADDRESS8,
-    DUMMY_MAC_ADDRESS8,
-    DUMMY_DEVICE_NAME8,
-    DUMMY_TOKEN_NEEDED8,
-    DUMMY_LIGHT_2,
-)
-
-DUMMY_TRIPLE_LIGHT_DEVICE = SwitcherLight(
-    DeviceType.LIGHT_SL03,
-    DeviceState.ON,
-    DUMMY_DEVICE_ID9,
-    DUMMY_DEVICE_KEY9,
-    DUMMY_IP_ADDRESS9,
-    DUMMY_MAC_ADDRESS9,
-    DUMMY_DEVICE_NAME9,
-    DUMMY_TOKEN_NEEDED9,
-    DUMMY_LIGHT_3,
-)
-
 DUMMY_SWITCHER_DEVICES = [DUMMY_PLUG_DEVICE, DUMMY_WATER_HEATER_DEVICE]
diff --git a/tests/components/switcher_kis/test_config_flow.py b/tests/components/switcher_kis/test_config_flow.py
index 48cc0beacb8..e1c017b2b96 100644
--- a/tests/components/switcher_kis/test_config_flow.py
+++ b/tests/components/switcher_kis/test_config_flow.py
@@ -11,7 +11,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
 from .consts import (
-    DUMMY_DUAL_SHUTTER_SINGLE_LIGHT_DEVICE,
     DUMMY_PLUG_DEVICE,
     DUMMY_SINGLE_SHUTTER_DUAL_LIGHT_DEVICE,
     DUMMY_TOKEN,
@@ -63,7 +62,6 @@ async def test_user_setup(
     [
         [
             DUMMY_SINGLE_SHUTTER_DUAL_LIGHT_DEVICE,
-            DUMMY_DUAL_SHUTTER_SINGLE_LIGHT_DEVICE,
         ]
     ],
     indirect=True,
@@ -108,7 +106,6 @@ async def test_user_setup_found_token_device_valid_token(
     [
         [
             DUMMY_SINGLE_SHUTTER_DUAL_LIGHT_DEVICE,
-            DUMMY_DUAL_SHUTTER_SINGLE_LIGHT_DEVICE,
         ]
     ],
     indirect=True,
diff --git a/tests/components/switcher_kis/test_cover.py b/tests/components/switcher_kis/test_cover.py
index d26fff8754c..5e0e6c53f5a 100644
--- a/tests/components/switcher_kis/test_cover.py
+++ b/tests/components/switcher_kis/test_cover.py
@@ -23,7 +23,6 @@ from homeassistant.util import slugify
 
 from . import init_integration
 from .consts import (
-    DUMMY_DUAL_SHUTTER_SINGLE_LIGHT_DEVICE as DEVICE3,
     DUMMY_SHUTTER_DEVICE as DEVICE,
     DUMMY_SINGLE_SHUTTER_DUAL_LIGHT_DEVICE as DEVICE2,
     DUMMY_TOKEN as TOKEN,
@@ -32,78 +31,23 @@ from .consts import (
 
 ENTITY_ID = f"{COVER_DOMAIN}.{slugify(DEVICE.name)}"
 ENTITY_ID2 = f"{COVER_DOMAIN}.{slugify(DEVICE2.name)}"
-ENTITY_ID3 = f"{COVER_DOMAIN}.{slugify(DEVICE3.name)}_cover_1"
-ENTITY_ID3_2 = f"{COVER_DOMAIN}.{slugify(DEVICE3.name)}_cover_2"
 
 
 @pytest.mark.parametrize(
-    (
-        "device",
-        "entity_id",
-        "cover_id",
-        "position_open",
-        "position_close",
-        "direction_open",
-        "direction_close",
-        "direction_stop",
-    ),
+    ("device", "entity_id"),
     [
-        (
-            DEVICE,
-            ENTITY_ID,
-            0,
-            [77],
-            [0],
-            [ShutterDirection.SHUTTER_UP],
-            [ShutterDirection.SHUTTER_DOWN],
-            [ShutterDirection.SHUTTER_STOP],
-        ),
-        (
-            DEVICE2,
-            ENTITY_ID2,
-            0,
-            [77],
-            [0],
-            [ShutterDirection.SHUTTER_UP],
-            [ShutterDirection.SHUTTER_DOWN],
-            [ShutterDirection.SHUTTER_STOP],
-        ),
-        (
-            DEVICE3,
-            ENTITY_ID3,
-            0,
-            [77, 0],
-            [0, 0],
-            [ShutterDirection.SHUTTER_UP, ShutterDirection.SHUTTER_STOP],
-            [ShutterDirection.SHUTTER_DOWN, ShutterDirection.SHUTTER_STOP],
-            [ShutterDirection.SHUTTER_STOP, ShutterDirection.SHUTTER_STOP],
-        ),
-        (
-            DEVICE3,
-            ENTITY_ID3_2,
-            1,
-            [0, 77],
-            [0, 0],
-            [ShutterDirection.SHUTTER_STOP, ShutterDirection.SHUTTER_UP],
-            [ShutterDirection.SHUTTER_STOP, ShutterDirection.SHUTTER_DOWN],
-            [ShutterDirection.SHUTTER_STOP, ShutterDirection.SHUTTER_STOP],
-        ),
+        (DEVICE, ENTITY_ID),
+        (DEVICE2, ENTITY_ID2),
     ],
 )
-@pytest.mark.parametrize("mock_bridge", [[DEVICE, DEVICE2, DEVICE3]], indirect=True)
+@pytest.mark.parametrize("mock_bridge", [[DEVICE, DEVICE2]], indirect=True)
 async def test_cover(
     hass: HomeAssistant,
     mock_bridge,
     mock_api,
     monkeypatch: pytest.MonkeyPatch,
     device,
-    entity_id: str,
-    cover_id: int,
-    position_open: list[int],
-    position_close: list[int],
-    direction_open: list[ShutterDirection],
-    direction_close: list[ShutterDirection],
-    direction_stop: list[ShutterDirection],
+    entity_id,
 ) -> None:
     """Test cover services."""
     await init_integration(hass, USERNAME, TOKEN)
@@ -124,12 +68,12 @@ async def test_cover(
             blocking=True,
         )
 
-        monkeypatch.setattr(device, "position", position_open)
+        monkeypatch.setattr(device, "position", 77)
         mock_bridge.mock_callbacks([device])
         await hass.async_block_till_done()
 
         assert mock_api.call_count == 2
-        mock_control_device.assert_called_once_with(77, cover_id)
+        mock_control_device.assert_called_once_with(77, 0)
         state = hass.states.get(entity_id)
         assert state.state == CoverState.OPEN
         assert state.attributes[ATTR_CURRENT_POSITION] == 77
@@ -145,12 +89,12 @@ async def test_cover(
             blocking=True,
         )
 
-        monkeypatch.setattr(device, "direction", direction_open)
+        monkeypatch.setattr(device, "direction", ShutterDirection.SHUTTER_UP)
         mock_bridge.mock_callbacks([device])
         await hass.async_block_till_done()
 
         assert mock_api.call_count == 4
-        mock_control_device.assert_called_once_with(100, cover_id)
+        mock_control_device.assert_called_once_with(100, 0)
         state = hass.states.get(entity_id)
         assert state.state == CoverState.OPENING
 
@@ -165,12 +109,12 @@ async def test_cover(
             blocking=True,
         )
 
-        monkeypatch.setattr(device, "direction", direction_close)
+        monkeypatch.setattr(device, "direction", ShutterDirection.SHUTTER_DOWN)
         mock_bridge.mock_callbacks([device])
         await hass.async_block_till_done()
 
         assert mock_api.call_count == 6
-        mock_control_device.assert_called_once_with(0, cover_id)
+        mock_control_device.assert_called_once_with(0, 0)
         state = hass.states.get(entity_id)
         assert state.state == CoverState.CLOSING
 
@@ -185,17 +129,17 @@ async def test_cover(
             blocking=True,
         )
 
-        monkeypatch.setattr(device, "direction", direction_stop)
+        monkeypatch.setattr(device, "direction", ShutterDirection.SHUTTER_STOP)
         mock_bridge.mock_callbacks([device])
         await hass.async_block_till_done()
 
         assert mock_api.call_count == 8
-        mock_control_device.assert_called_once_with(cover_id)
+        mock_control_device.assert_called_once_with(0)
         state = hass.states.get(entity_id)
         assert state.state == CoverState.OPEN
 
     # Test closed on position == 0
-    monkeypatch.setattr(device, "position", position_close)
+    monkeypatch.setattr(device, "position", 0)
     mock_bridge.mock_callbacks([device])
     await hass.async_block_till_done()
 
@@ -205,22 +149,19 @@ async def test_cover(
 
 
 @pytest.mark.parametrize(
-    ("device", "entity_id", "cover_id"),
+    ("device", "entity_id"),
     [
-        (DEVICE, ENTITY_ID, 0),
-        (DEVICE2, ENTITY_ID2, 0),
-        (DEVICE3, ENTITY_ID3, 0),
-        (DEVICE3, ENTITY_ID3_2, 1),
+        (DEVICE, ENTITY_ID),
+        (DEVICE2, ENTITY_ID2),
     ],
 )
-@pytest.mark.parametrize("mock_bridge", [[DEVICE, DEVICE2, DEVICE3]], indirect=True)
+@pytest.mark.parametrize("mock_bridge", [[DEVICE, DEVICE2]], indirect=True)
 async def test_cover_control_fail(
     hass: HomeAssistant,
     mock_bridge,
     mock_api,
     device,
-    entity_id: str,
-    cover_id: int,
+    entity_id,
 ) -> None:
     """Test cover control fail."""
     await init_integration(hass, USERNAME, TOKEN)
@@ -244,7 +185,7 @@ async def test_cover_control_fail(
             )
 
         assert mock_api.call_count == 2
-        mock_control_device.assert_called_once_with(44, cover_id)
+        mock_control_device.assert_called_once_with(44, 0)
         state = hass.states.get(entity_id)
         assert state.state == STATE_UNAVAILABLE
 
@@ -269,16 +210,16 @@ async def test_cover_control_fail(
             )
 
         assert mock_api.call_count == 4
-        mock_control_device.assert_called_once_with(27, cover_id)
+        mock_control_device.assert_called_once_with(27, 0)
         state = hass.states.get(entity_id)
         assert state.state == STATE_UNAVAILABLE
 
 
-@pytest.mark.parametrize("mock_bridge", [[DEVICE2, DEVICE3]], indirect=True)
+@pytest.mark.parametrize("mock_bridge", [[DEVICE2]], indirect=True)
 async def test_cover2_no_token(
     hass: HomeAssistant, mock_bridge, mock_api, monkeypatch: pytest.MonkeyPatch
 ) -> None:
-    """Test cover with token needed without token specified."""
+    """Test single cover dual light without token services."""
     await init_integration(hass)
     assert mock_bridge
 
diff --git a/tests/components/switcher_kis/test_light.py b/tests/components/switcher_kis/test_light.py
index 60c851bf6a9..0fb036967e7 100644
--- a/tests/components/switcher_kis/test_light.py
+++ b/tests/components/switcher_kis/test_light.py
@@ -21,49 +21,28 @@ from homeassistant.util import slugify
 
 from . import init_integration
 from .consts import (
-    DUMMY_DUAL_LIGHT_DEVICE as DEVICE4,
-    DUMMY_DUAL_SHUTTER_SINGLE_LIGHT_DEVICE as DEVICE2,
-    DUMMY_LIGHT_DEVICE as DEVICE3,
     DUMMY_SINGLE_SHUTTER_DUAL_LIGHT_DEVICE as DEVICE,
     DUMMY_TOKEN as TOKEN,
-    DUMMY_TRIPLE_LIGHT_DEVICE as DEVICE5,
     DUMMY_USERNAME as USERNAME,
 )
 
 ENTITY_ID = f"{LIGHT_DOMAIN}.{slugify(DEVICE.name)}_light_1"
-ENTITY_ID_2 = f"{LIGHT_DOMAIN}.{slugify(DEVICE.name)}_light_2"
-ENTITY_ID2 = f"{LIGHT_DOMAIN}.{slugify(DEVICE2.name)}"
-ENTITY_ID3 = f"{LIGHT_DOMAIN}.{slugify(DEVICE3.name)}"
-ENTITY_ID4 = f"{LIGHT_DOMAIN}.{slugify(DEVICE4.name)}_light_1"
-ENTITY_ID4_2 = f"{LIGHT_DOMAIN}.{slugify(DEVICE4.name)}_light_2"
-ENTITY_ID5 = f"{LIGHT_DOMAIN}.{slugify(DEVICE5.name)}_light_1"
-ENTITY_ID5_2 = f"{LIGHT_DOMAIN}.{slugify(DEVICE5.name)}_light_2"
-ENTITY_ID5_3 = f"{LIGHT_DOMAIN}.{slugify(DEVICE5.name)}_light_3"
+ENTITY_ID2 = f"{LIGHT_DOMAIN}.{slugify(DEVICE.name)}_light_2"
 
 
+@pytest.mark.parametrize("mock_bridge", [[DEVICE]], indirect=True)
 @pytest.mark.parametrize(
-    ("device", "entity_id", "light_id", "device_state"),
+    ("entity_id", "light_id", "device_state"),
     [
-        (DEVICE, ENTITY_ID, 0, [DeviceState.OFF, DeviceState.ON]),
-        (DEVICE, ENTITY_ID_2, 1, [DeviceState.ON, DeviceState.OFF]),
-        (DEVICE2, ENTITY_ID2, 0, [DeviceState.OFF]),
-        (DEVICE3, ENTITY_ID3, 0, [DeviceState.OFF]),
-        (DEVICE4, ENTITY_ID4, 0, [DeviceState.OFF, DeviceState.ON]),
-        (DEVICE4, ENTITY_ID4_2, 1, [DeviceState.ON, DeviceState.OFF]),
-        (DEVICE5, ENTITY_ID5, 0, [DeviceState.OFF, DeviceState.ON, DeviceState.ON]),
-        (DEVICE5, ENTITY_ID5_2, 1, [DeviceState.ON, DeviceState.OFF, DeviceState.ON]),
-        (DEVICE5, ENTITY_ID5_3, 2, [DeviceState.ON, DeviceState.ON, DeviceState.OFF]),
+        (ENTITY_ID, 0, [DeviceState.OFF, DeviceState.ON]),
+        (ENTITY_ID2, 1, [DeviceState.ON, DeviceState.OFF]),
     ],
 )
-@pytest.mark.parametrize(
-    "mock_bridge", [[DEVICE, DEVICE2, DEVICE3, DEVICE4, DEVICE5]], indirect=True
-)
 async def test_light(
     hass: HomeAssistant,
     mock_bridge,
     mock_api,
     monkeypatch: pytest.MonkeyPatch,
-    device,
     entity_id: str,
     light_id: int,
     device_state: list[DeviceState],
@@ -77,8 +56,8 @@ async def test_light(
     assert state.state == STATE_ON
 
     # Test state change on --> off for light
-    monkeypatch.setattr(device, "light", device_state)
-    mock_bridge.mock_callbacks([device])
+    monkeypatch.setattr(DEVICE, "lights", device_state)
+    mock_bridge.mock_callbacks([DEVICE])
     await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
@@ -111,44 +90,24 @@ async def test_light(
         assert state.state == STATE_OFF
 
 
-@pytest.mark.parametrize(
-    ("device", "entity_id", "light_id", "device_state"),
-    [
-        (DEVICE, ENTITY_ID, 0, [DeviceState.OFF, DeviceState.ON]),
-        (DEVICE, ENTITY_ID_2, 1, [DeviceState.ON, DeviceState.OFF]),
-        (DEVICE2, ENTITY_ID2, 0, [DeviceState.OFF]),
-        (DEVICE3, ENTITY_ID3, 0, [DeviceState.OFF]),
-        (DEVICE4, ENTITY_ID4, 0, [DeviceState.OFF, DeviceState.ON]),
-        (DEVICE4, ENTITY_ID4_2, 1, [DeviceState.ON, DeviceState.OFF]),
-        (DEVICE5, ENTITY_ID5, 0, [DeviceState.OFF, DeviceState.ON, DeviceState.ON]),
-        (DEVICE5, ENTITY_ID5_2, 1, [DeviceState.ON, DeviceState.OFF, DeviceState.ON]),
-        (DEVICE5, ENTITY_ID5_3, 2, [DeviceState.ON, DeviceState.ON, DeviceState.OFF]),
-    ],
-)
-@pytest.mark.parametrize(
-    "mock_bridge", [[DEVICE, DEVICE2, DEVICE3, DEVICE4, DEVICE5]], indirect=True
-)
+@pytest.mark.parametrize("mock_bridge", [[DEVICE]], indirect=True)
 async def test_light_control_fail(
     hass: HomeAssistant,
     mock_bridge,
     mock_api,
     monkeypatch: pytest.MonkeyPatch,
     caplog: pytest.LogCaptureFixture,
-    device,
-    entity_id: str,
-    light_id: int,
-    device_state: list[DeviceState],
 ) -> None:
     """Test light control fail."""
     await init_integration(hass, USERNAME, TOKEN)
     assert mock_bridge
 
     # Test initial state - light off
-    monkeypatch.setattr(device, "light", device_state)
-    mock_bridge.mock_callbacks([device])
+    monkeypatch.setattr(DEVICE, "lights", [DeviceState.OFF, DeviceState.ON])
+    mock_bridge.mock_callbacks([DEVICE])
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    state = hass.states.get(ENTITY_ID)
     assert state.state == STATE_OFF
 
     # Test exception during turn on
@@ -160,20 +119,20 @@ async def test_light_control_fail(
             await hass.services.async_call(
                 LIGHT_DOMAIN,
                 SERVICE_TURN_ON,
-                {ATTR_ENTITY_ID: entity_id},
+                {ATTR_ENTITY_ID: ENTITY_ID},
                 blocking=True,
             )
 
         assert mock_api.call_count == 2
-        mock_control_device.assert_called_once_with(DeviceState.ON, light_id)
-        state = hass.states.get(entity_id)
+        mock_control_device.assert_called_once_with(DeviceState.ON, 0)
+        state = hass.states.get(ENTITY_ID)
         assert state.state == STATE_UNAVAILABLE
 
     # Make device available again
-    mock_bridge.mock_callbacks([device])
+    mock_bridge.mock_callbacks([DEVICE])
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    state = hass.states.get(ENTITY_ID)
     assert state.state == STATE_OFF
 
     # Test error response during turn on
@@ -185,11 +144,11 @@ async def test_light_control_fail(
             await hass.services.async_call(
                 LIGHT_DOMAIN,
                 SERVICE_TURN_ON,
-                {ATTR_ENTITY_ID: entity_id},
+                {ATTR_ENTITY_ID: ENTITY_ID},
                 blocking=True,
             )
 
         assert mock_api.call_count == 4
-        mock_control_device.assert_called_once_with(DeviceState.ON, light_id)
-        state = hass.states.get(entity_id)
+        mock_control_device.assert_called_once_with(DeviceState.ON, 0)
+        state = hass.states.get(ENTITY_ID)
         assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/system_bridge/test_config_flow.py b/tests/components/system_bridge/test_config_flow.py
index ada44de2d12..727d93de893 100644
--- a/tests/components/system_bridge/test_config_flow.py
+++ b/tests/components/system_bridge/test_config_flow.py
@@ -259,12 +259,9 @@ async def test_form_unknown_error(hass: HomeAssistant) -> None:
 
 async def test_reauth_authorization_error(hass: HomeAssistant) -> None:
     """Test we show user form on authorization error."""
-    mock_config = MockConfigEntry(
-        domain=DOMAIN, unique_id=FIXTURE_UUID, data=FIXTURE_USER_INPUT
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "reauth"}, data=FIXTURE_USER_INPUT
     )
-    mock_config.add_to_hass(hass)
-
-    result = await mock_config.start_reauth_flow(hass)
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "authenticate"
@@ -294,12 +291,9 @@ async def test_reauth_authorization_error(hass: HomeAssistant) -> None:
 
 async def test_reauth_connection_error(hass: HomeAssistant) -> None:
     """Test we show user form on connection error."""
-    mock_config = MockConfigEntry(
-        domain=DOMAIN, unique_id=FIXTURE_UUID, data=FIXTURE_USER_INPUT
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "reauth"}, data=FIXTURE_USER_INPUT
     )
-    mock_config.add_to_hass(hass)
-
-    result = await mock_config.start_reauth_flow(hass)
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "authenticate"
@@ -342,12 +336,9 @@ async def test_reauth_connection_error(hass: HomeAssistant) -> None:
 
 async def test_reauth_connection_closed_error(hass: HomeAssistant) -> None:
     """Test we show user form on connection error."""
-    mock_config = MockConfigEntry(
-        domain=DOMAIN, unique_id=FIXTURE_UUID, data=FIXTURE_USER_INPUT
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "reauth"}, data=FIXTURE_USER_INPUT
     )
-    mock_config.add_to_hass(hass)
-
-    result = await mock_config.start_reauth_flow(hass)
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "authenticate"
@@ -382,7 +373,9 @@ async def test_reauth_flow(hass: HomeAssistant) -> None:
     )
     mock_config.add_to_hass(hass)
 
-    result = await mock_config.start_reauth_flow(hass)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "reauth"}, data=FIXTURE_USER_INPUT
+    )
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "authenticate"
diff --git a/tests/components/tado/fixtures/home.json b/tests/components/tado/fixtures/home.json
deleted file mode 100644
index 3431c1c2471..00000000000
--- a/tests/components/tado/fixtures/home.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": 1,
-  "name": "My Home",
-  "dateTimeZone": "Europe/Berlin",
-  "dateCreated": "2019-03-24T16:16:19.541Z",
-  "temperatureUnit": "CELSIUS",
-  "partner": null,
-  "simpleSmartScheduleEnabled": true,
-  "awayRadiusInMeters": 100.0,
-  "installationCompleted": true,
-  "incidentDetection": { "supported": true, "enabled": true },
-  "generation": "PRE_LINE_X",
-  "zonesCount": 7,
-  "language": "de-DE",
-  "skills": ["AUTO_ASSIST"],
-  "christmasModeEnabled": true,
-  "showAutoAssistReminders": true,
-  "contactDetails": {
-    "name": "Max Mustermann",
-    "email": "max@example.com",
-    "phone": "+493023125431"
-  },
-  "address": {
-    "addressLine1": "Musterstrasse 123",
-    "addressLine2": null,
-    "zipCode": "12345",
-    "city": "Berlin",
-    "state": null,
-    "country": "DEU"
-  },
-  "geolocation": { "latitude": 52.0, "longitude": 13.0 },
-  "consentGrantSkippable": true,
-  "enabledFeatures": [
-    "EIQ_SETTINGS_AS_WEBVIEW",
-    "HIDE_BOILER_REPAIR_SERVICE",
-    "INTERCOM_ENABLED",
-    "MORE_AS_WEBVIEW",
-    "OWD_SETTINGS_AS_WEBVIEW",
-    "SETTINGS_OVERVIEW_AS_WEBVIEW"
-  ],
-  "isAirComfortEligible": true,
-  "isBalanceAcEligible": false,
-  "isEnergyIqEligible": true,
-  "isHeatSourceInstalled": false,
-  "isHeatPumpInstalled": false,
-  "supportsFlowTemperatureOptimization": false
-}
diff --git a/tests/components/tado/util.py b/tests/components/tado/util.py
index a76858ab98e..de4fd515e5a 100644
--- a/tests/components/tado/util.py
+++ b/tests/components/tado/util.py
@@ -20,7 +20,6 @@ async def async_init_integration(
     mobile_devices_fixture = "tado/mobile_devices.json"
     me_fixture = "tado/me.json"
     weather_fixture = "tado/weather.json"
-    home_fixture = "tado/home.json"
     home_state_fixture = "tado/home_state.json"
     zones_fixture = "tado/zones.json"
     zone_states_fixture = "tado/zone_states.json"
@@ -66,10 +65,6 @@ async def async_init_integration(
             "https://my.tado.com/api/v2/me",
             text=load_fixture(me_fixture),
         )
-        m.get(
-            "https://my.tado.com/api/v2/homes/1/",
-            text=load_fixture(home_fixture),
-        )
         m.get(
             "https://my.tado.com/api/v2/homes/1/weather",
             text=load_fixture(weather_fixture),
diff --git a/tests/components/tedee/conftest.py b/tests/components/tedee/conftest.py
index 8e028cb5300..68444de640c 100644
--- a/tests/components/tedee/conftest.py
+++ b/tests/components/tedee/conftest.py
@@ -6,8 +6,8 @@ from collections.abc import Generator
 import json
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from aiotedee.bridge import TedeeBridge
-from aiotedee.lock import TedeeLock
+from pytedee_async.bridge import TedeeBridge
+from pytedee_async.lock import TedeeLock
 import pytest
 
 from homeassistant.components.tedee.const import CONF_LOCAL_ACCESS_TOKEN, DOMAIN
diff --git a/tests/components/tedee/test_binary_sensor.py b/tests/components/tedee/test_binary_sensor.py
index dfe70e7a2ea..788d31c84d2 100644
--- a/tests/components/tedee/test_binary_sensor.py
+++ b/tests/components/tedee/test_binary_sensor.py
@@ -3,8 +3,8 @@
 from datetime import timedelta
 from unittest.mock import MagicMock
 
-from aiotedee import TedeeLock
 from freezegun.api import FrozenDateTimeFactory
+from pytedee_async import TedeeLock
 import pytest
 from syrupy import SnapshotAssertion
 
diff --git a/tests/components/tedee/test_config_flow.py b/tests/components/tedee/test_config_flow.py
index 825e01aca70..d3654783bd6 100644
--- a/tests/components/tedee/test_config_flow.py
+++ b/tests/components/tedee/test_config_flow.py
@@ -2,16 +2,15 @@
 
 from unittest.mock import MagicMock, patch
 
-from aiotedee import (
+from pytedee_async import (
     TedeeClientException,
     TedeeDataUpdateException,
     TedeeLocalAuthException,
 )
-from aiotedee.bridge import TedeeBridge
 import pytest
 
 from homeassistant.components.tedee.const import CONF_LOCAL_ACCESS_TOKEN, DOMAIN
-from homeassistant.config_entries import SOURCE_USER, ConfigFlowResult
+from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_HOST, CONF_WEBHOOK_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -135,10 +134,11 @@ async def test_reauth_flow(
     assert result["reason"] == "reauth_successful"
 
 
-async def __do_reconfigure_flow(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
-) -> ConfigFlowResult:
-    """Initialize a reconfigure flow."""
+async def test_reconfigure_flow(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_tedee: MagicMock
+) -> None:
+    """Test that the reconfigure flow works."""
+
     mock_config_entry.add_to_hass(hass)
 
     reconfigure_result = await mock_config_entry.start_reconfigure_flow(hass)
@@ -146,19 +146,11 @@ async def __do_reconfigure_flow(
     assert reconfigure_result["type"] is FlowResultType.FORM
     assert reconfigure_result["step_id"] == "reconfigure"
 
-    return await hass.config_entries.flow.async_configure(
+    result = await hass.config_entries.flow.async_configure(
         reconfigure_result["flow_id"],
         {CONF_LOCAL_ACCESS_TOKEN: LOCAL_ACCESS_TOKEN, CONF_HOST: "192.168.1.43"},
     )
 
-
-async def test_reconfigure_flow(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_tedee: MagicMock
-) -> None:
-    """Test that the reconfigure flow works."""
-
-    result = await __do_reconfigure_flow(hass, mock_config_entry)
-
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reconfigure_successful"
 
@@ -170,18 +162,3 @@ async def test_reconfigure_flow(
         CONF_LOCAL_ACCESS_TOKEN: LOCAL_ACCESS_TOKEN,
         CONF_WEBHOOK_ID: WEBHOOK_ID,
     }
-
-
-async def test_reconfigure_unique_id_mismatch(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_tedee: MagicMock
-) -> None:
-    """Ensure reconfigure flow aborts when the bride changes."""
-
-    mock_tedee.get_local_bridge.return_value = TedeeBridge(
-        0, "1111-1111", "Bridge-R2D2"
-    )
-
-    result = await __do_reconfigure_flow(hass, mock_config_entry)
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "unique_id_mismatch"
diff --git a/tests/components/tedee/test_init.py b/tests/components/tedee/test_init.py
index 63701bb1788..d4ac1c9d290 100644
--- a/tests/components/tedee/test_init.py
+++ b/tests/components/tedee/test_init.py
@@ -5,7 +5,7 @@ from typing import Any
 from unittest.mock import MagicMock, patch
 from urllib.parse import urlparse
 
-from aiotedee.exception import (
+from pytedee_async.exception import (
     TedeeAuthException,
     TedeeClientException,
     TedeeWebhookException,
diff --git a/tests/components/tedee/test_lock.py b/tests/components/tedee/test_lock.py
index 45eae6e22d9..3f6b97e2c70 100644
--- a/tests/components/tedee/test_lock.py
+++ b/tests/components/tedee/test_lock.py
@@ -4,13 +4,13 @@ from datetime import timedelta
 from unittest.mock import MagicMock
 from urllib.parse import urlparse
 
-from aiotedee import TedeeLock, TedeeLockState
-from aiotedee.exception import (
+from freezegun.api import FrozenDateTimeFactory
+from pytedee_async import TedeeLock, TedeeLockState
+from pytedee_async.exception import (
     TedeeClientException,
     TedeeDataUpdateException,
     TedeeLocalAuthException,
 )
-from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
diff --git a/tests/components/tedee/test_sensor.py b/tests/components/tedee/test_sensor.py
index ddbcd5086af..72fbd9cbe8d 100644
--- a/tests/components/tedee/test_sensor.py
+++ b/tests/components/tedee/test_sensor.py
@@ -3,8 +3,8 @@
 from datetime import timedelta
 from unittest.mock import MagicMock
 
-from aiotedee import TedeeLock
 from freezegun.api import FrozenDateTimeFactory
+from pytedee_async import TedeeLock
 import pytest
 from syrupy import SnapshotAssertion
 
diff --git a/tests/components/template/test_alarm_control_panel.py b/tests/components/template/test_alarm_control_panel.py
index 4b259fabac2..666dfe744a2 100644
--- a/tests/components/template/test_alarm_control_panel.py
+++ b/tests/components/template/test_alarm_control_panel.py
@@ -4,15 +4,21 @@ import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components import template
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_DOMAIN,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN
 from homeassistant.const import (
     ATTR_DOMAIN,
     ATTR_ENTITY_ID,
     ATTR_SERVICE_DATA,
     EVENT_CALL_SERVICE,
+    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_PENDING,
+    STATE_ALARM_TRIGGERED,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
@@ -107,15 +113,15 @@ async def test_template_state_text(hass: HomeAssistant) -> None:
     """Test the state text of a template."""
 
     for set_state in (
-        AlarmControlPanelState.ARMED_HOME,
-        AlarmControlPanelState.ARMED_AWAY,
-        AlarmControlPanelState.ARMED_NIGHT,
-        AlarmControlPanelState.ARMED_VACATION,
-        AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        AlarmControlPanelState.ARMING,
-        AlarmControlPanelState.DISARMED,
-        AlarmControlPanelState.PENDING,
-        AlarmControlPanelState.TRIGGERED,
+        STATE_ALARM_ARMED_HOME,
+        STATE_ALARM_ARMED_AWAY,
+        STATE_ALARM_ARMED_NIGHT,
+        STATE_ALARM_ARMED_VACATION,
+        STATE_ALARM_ARMED_CUSTOM_BYPASS,
+        STATE_ALARM_ARMING,
+        STATE_ALARM_DISARMED,
+        STATE_ALARM_PENDING,
+        STATE_ALARM_TRIGGERED,
     ):
         hass.states.async_set(PANEL_NAME, set_state)
         await hass.async_block_till_done()
@@ -160,7 +166,7 @@ async def test_setup_config_entry(
     hass.states.async_set("alarm_control_panel.one", "disarmed", {})
     await hass.async_block_till_done()
     state = hass.states.get("alarm_control_panel.my_template")
-    assert state.state == AlarmControlPanelState.DISARMED
+    assert state.state == STATE_ALARM_DISARMED
 
 
 @pytest.mark.parametrize(("count", "domain"), [(1, "alarm_control_panel")])
@@ -184,13 +190,13 @@ async def test_optimistic_states(hass: HomeAssistant) -> None:
     assert state.state == "unknown"
 
     for service, set_state in (
-        ("alarm_arm_away", AlarmControlPanelState.ARMED_AWAY),
-        ("alarm_arm_home", AlarmControlPanelState.ARMED_HOME),
-        ("alarm_arm_night", AlarmControlPanelState.ARMED_NIGHT),
-        ("alarm_arm_vacation", AlarmControlPanelState.ARMED_VACATION),
-        ("alarm_arm_custom_bypass", AlarmControlPanelState.ARMED_CUSTOM_BYPASS),
-        ("alarm_disarm", AlarmControlPanelState.DISARMED),
-        ("alarm_trigger", AlarmControlPanelState.TRIGGERED),
+        ("alarm_arm_away", STATE_ALARM_ARMED_AWAY),
+        ("alarm_arm_home", STATE_ALARM_ARMED_HOME),
+        ("alarm_arm_night", STATE_ALARM_ARMED_NIGHT),
+        ("alarm_arm_vacation", STATE_ALARM_ARMED_VACATION),
+        ("alarm_arm_custom_bypass", STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        ("alarm_disarm", STATE_ALARM_DISARMED),
+        ("alarm_trigger", STATE_ALARM_TRIGGERED),
     ):
         await hass.services.async_call(
             ALARM_DOMAIN,
@@ -459,33 +465,15 @@ async def test_code_config(hass: HomeAssistant, code_format, code_arm_required)
 @pytest.mark.parametrize(
     ("restored_state", "initial_state"),
     [
-        (
-            AlarmControlPanelState.ARMED_AWAY,
-            AlarmControlPanelState.ARMED_AWAY,
-        ),
-        (
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-        ),
-        (
-            AlarmControlPanelState.ARMED_HOME,
-            AlarmControlPanelState.ARMED_HOME,
-        ),
-        (
-            AlarmControlPanelState.ARMED_NIGHT,
-            AlarmControlPanelState.ARMED_NIGHT,
-        ),
-        (
-            AlarmControlPanelState.ARMED_VACATION,
-            AlarmControlPanelState.ARMED_VACATION,
-        ),
-        (AlarmControlPanelState.ARMING, AlarmControlPanelState.ARMING),
-        (AlarmControlPanelState.DISARMED, AlarmControlPanelState.DISARMED),
-        (AlarmControlPanelState.PENDING, AlarmControlPanelState.PENDING),
-        (
-            AlarmControlPanelState.TRIGGERED,
-            AlarmControlPanelState.TRIGGERED,
-        ),
+        (STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_AWAY),
+        (STATE_ALARM_ARMED_CUSTOM_BYPASS, STATE_ALARM_ARMED_CUSTOM_BYPASS),
+        (STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_HOME),
+        (STATE_ALARM_ARMED_NIGHT, STATE_ALARM_ARMED_NIGHT),
+        (STATE_ALARM_ARMED_VACATION, STATE_ALARM_ARMED_VACATION),
+        (STATE_ALARM_ARMING, STATE_ALARM_ARMING),
+        (STATE_ALARM_DISARMED, STATE_ALARM_DISARMED),
+        (STATE_ALARM_PENDING, STATE_ALARM_PENDING),
+        (STATE_ALARM_TRIGGERED, STATE_ALARM_TRIGGERED),
         (STATE_UNAVAILABLE, STATE_UNKNOWN),
         (STATE_UNKNOWN, STATE_UNKNOWN),
         ("faulty_state", STATE_UNKNOWN),
diff --git a/tests/components/template/test_config_flow.py b/tests/components/template/test_config_flow.py
index a3e53aab9e1..72c453d48dc 100644
--- a/tests/components/template/test_config_flow.py
+++ b/tests/components/template/test_config_flow.py
@@ -794,7 +794,7 @@ EARLY_END_ERROR = "invalid template (TemplateSyntaxError: unexpected 'end of tem
                 ),
                 "unit_of_measurement": (
                     "'None' is not a valid unit for device class 'energy'; "
-                    "expected one of 'cal', 'Gcal', 'GJ', 'GWh', 'J', 'kcal', 'kJ', 'kWh', 'Mcal', 'MJ', 'MWh', 'TWh', 'Wh'"
+                    "expected one of 'cal', 'Gcal', 'GJ', 'J', 'kcal', 'kJ', 'kWh', 'Mcal', 'MJ', 'MWh', 'Wh'"
                 ),
             },
         ),
diff --git a/tests/helpers/test_trigger_template_entity.py b/tests/components/template/test_manual_trigger_entity.py
similarity index 100%
rename from tests/helpers/test_trigger_template_entity.py
rename to tests/components/template/test_manual_trigger_entity.py
diff --git a/tests/components/template/test_sensor.py b/tests/components/template/test_sensor.py
index 929a890ab38..5a7521f98c7 100644
--- a/tests/components/template/test_sensor.py
+++ b/tests/components/template/test_sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components import sensor, template
 from homeassistant.components.template.sensor import TriggerSensorEntity
 from homeassistant.const import (
     ATTR_ENTITY_PICTURE,
-    ATTR_FRIENDLY_NAME,
     ATTR_ICON,
     EVENT_COMPONENT_LOADED,
     EVENT_HOMEASSISTANT_START,
@@ -984,7 +983,6 @@ async def test_self_referencing_sensor_with_icon_and_picture_entity_loop(
                     "test": {
                         "value_template": "{{ 1 }}",
                         "entity_picture_template": "{{ ((states.sensor.test.attributes['entity_picture'] or 0) | int) + 1 }}",
-                        "friendly_name_template": "{{ ((states.sensor.test.attributes['friendly_name'] or 0) | int) + 1 }}",
                     },
                 },
             }
@@ -1009,8 +1007,7 @@ async def test_self_referencing_entity_picture_loop(
 
     state = hass.states.get("sensor.test")
     assert int(state.state) == 1
-    assert state.attributes[ATTR_ENTITY_PICTURE] == "3"
-    assert state.attributes[ATTR_FRIENDLY_NAME] == "3"
+    assert state.attributes[ATTR_ENTITY_PICTURE] == 2
 
     await hass.async_block_till_done()
     assert int(state.state) == 1
diff --git a/tests/components/tesla_fleet/conftest.py b/tests/components/tesla_fleet/conftest.py
index 0dc5d87984f..cc580212233 100644
--- a/tests/components/tesla_fleet/conftest.py
+++ b/tests/components/tesla_fleet/conftest.py
@@ -167,13 +167,3 @@ def mock_request():
         return_value=COMMAND_OK,
     ) as mock_request:
         yield mock_request
-
-
-@pytest.fixture(autouse=True)
-def mock_signed_command() -> Generator[AsyncMock]:
-    """Mock Tesla Fleet Api signed_command method."""
-    with patch(
-        "homeassistant.components.tesla_fleet.VehicleSigned.signed_command",
-        return_value=COMMAND_OK,
-    ) as mock_signed_command:
-        yield mock_signed_command
diff --git a/tests/components/tesla_fleet/fixtures/vehicle_data.json b/tests/components/tesla_fleet/fixtures/vehicle_data.json
index d99bc8de5a8..3845ae48559 100644
--- a/tests/components/tesla_fleet/fixtures/vehicle_data.json
+++ b/tests/components/tesla_fleet/fixtures/vehicle_data.json
@@ -112,7 +112,6 @@
       "wiper_blade_heater": false
     },
     "drive_state": {
-      "active_route_destination": "Home",
       "active_route_latitude": 30.2226265,
       "active_route_longitude": -97.6236871,
       "active_route_miles_to_arrival": 0.039491,
diff --git a/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr b/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr
index 02ad4b01002..194eda6fcff 100644
--- a/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_device_tracker.ambr
@@ -96,6 +96,6 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'home',
+    'state': 'not_home',
   })
 # ---
diff --git a/tests/components/tesla_fleet/snapshots/test_diagnostics.ambr b/tests/components/tesla_fleet/snapshots/test_diagnostics.ambr
index eb8c57910a4..902c7af131e 100644
--- a/tests/components/tesla_fleet/snapshots/test_diagnostics.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_diagnostics.ambr
@@ -269,7 +269,6 @@
           'climate_state_timestamp': 1705707520649,
           'climate_state_wiper_blade_heater': False,
           'color': None,
-          'drive_state_active_route_destination': 'Home',
           'drive_state_active_route_latitude': '**REDACTED**',
           'drive_state_active_route_longitude': '**REDACTED**',
           'drive_state_active_route_miles_to_arrival': 0.039491,
diff --git a/tests/components/tesla_fleet/snapshots/test_media_player.ambr b/tests/components/tesla_fleet/snapshots/test_media_player.ambr
index cc3018364a5..d6f3f3e4825 100644
--- a/tests/components/tesla_fleet/snapshots/test_media_player.ambr
+++ b/tests/components/tesla_fleet/snapshots/test_media_player.ambr
@@ -105,7 +105,7 @@
     'original_name': 'Media player',
     'platform': 'tesla_fleet',
     'previous_unique_id': None,
-    'supported_features': 0,
+    'supported_features': <MediaPlayerEntityFeature: 16437>,
     'translation_key': 'media',
     'unique_id': 'LRWXF7EK4KC700000-media',
     'unit_of_measurement': None,
@@ -123,7 +123,7 @@
       'media_position': 1.0,
       'media_title': 'Chapter 51: Cybertruck: Tesla, 2018–2019',
       'source': 'Audible',
-      'supported_features': <MediaPlayerEntityFeature: 0>,
+      'supported_features': <MediaPlayerEntityFeature: 16437>,
       'volume_level': 0.16129355359011466,
     }),
     'context': <ANY>,
diff --git a/tests/components/tesla_fleet/test_button.py b/tests/components/tesla_fleet/test_button.py
index ef1cfd90357..addba00b93d 100644
--- a/tests/components/tesla_fleet/test_button.py
+++ b/tests/components/tesla_fleet/test_button.py
@@ -1,16 +1,13 @@
 """Test the Tesla Fleet button platform."""
 
-from copy import deepcopy
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 from syrupy import SnapshotAssertion
-from tesla_fleet_api.exceptions import NotOnWhitelistFault
 
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from . import assert_entities, setup_platform
@@ -66,34 +63,3 @@ async def test_press(
             blocking=True,
         )
         command.assert_called_once()
-
-
-async def test_press_signing_error(
-    hass: HomeAssistant, normal_config_entry: MockConfigEntry, mock_products: AsyncMock
-) -> None:
-    """Test pressing a button with a signing error."""
-    # Enable Signing
-    new_product = deepcopy(mock_products.return_value)
-    new_product["response"][0]["command_signing"] = "required"
-    mock_products.return_value = new_product
-
-    with (
-        patch("homeassistant.components.tesla_fleet.TeslaFleetApi.get_private_key"),
-    ):
-        await setup_platform(hass, normal_config_entry, [Platform.BUTTON])
-
-    with (
-        patch("homeassistant.components.tesla_fleet.TeslaFleetApi.get_private_key"),
-        patch(
-            "homeassistant.components.tesla_fleet.VehicleSigned.flash_lights",
-            side_effect=NotOnWhitelistFault,
-        ),
-        pytest.raises(HomeAssistantError) as error,
-    ):
-        await hass.services.async_call(
-            BUTTON_DOMAIN,
-            SERVICE_PRESS,
-            {ATTR_ENTITY_ID: ["button.test_flash_lights"]},
-            blocking=True,
-        )
-    assert error.from_exception(NotOnWhitelistFault)
diff --git a/tests/components/tesla_fleet/test_init.py b/tests/components/tesla_fleet/test_init.py
index 7c17f986663..9dcac4ec388 100644
--- a/tests/components/tesla_fleet/test_init.py
+++ b/tests/components/tesla_fleet/test_init.py
@@ -1,6 +1,5 @@
 """Test the Tesla Fleet init."""
 
-from copy import deepcopy
 from unittest.mock import AsyncMock, patch
 
 from aiohttp import RequestInfo
@@ -405,22 +404,3 @@ async def test_init_region_issue_failed(
     await setup_platform(hass, normal_config_entry)
     mock_find_server.assert_called_once()
     assert normal_config_entry.state is ConfigEntryState.SETUP_ERROR
-
-
-async def test_signing(
-    hass: HomeAssistant,
-    normal_config_entry: MockConfigEntry,
-    mock_products: AsyncMock,
-) -> None:
-    """Tests when a vehicle requires signing."""
-
-    # Make the vehicle require command signing
-    products = deepcopy(mock_products.return_value)
-    products["response"][0]["command_signing"] = "required"
-    mock_products.return_value = products
-
-    with patch(
-        "homeassistant.components.tesla_fleet.TeslaFleetApi.get_private_key"
-    ) as mock_get_private_key:
-        await setup_platform(hass, normal_config_entry)
-        mock_get_private_key.assert_called_once()
diff --git a/tests/components/tesla_fleet/test_sensor.py b/tests/components/tesla_fleet/test_sensor.py
index 5faebbc47e2..377179ca26a 100644
--- a/tests/components/tesla_fleet/test_sensor.py
+++ b/tests/components/tesla_fleet/test_sensor.py
@@ -1,14 +1,13 @@
 """Test the Tesla Fleet sensor platform."""
 
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
-from tesla_fleet_api.exceptions import VehicleOffline
 
 from homeassistant.components.tesla_fleet.coordinator import VEHICLE_INTERVAL
-from homeassistant.const import STATE_UNAVAILABLE, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
@@ -42,38 +41,3 @@ async def test_sensors(
     await hass.async_block_till_done()
 
     assert_entities_alt(hass, normal_config_entry.entry_id, entity_registry, snapshot)
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "initial", "restored"),
-    [
-        ("sensor.test_battery_level", "77", "77"),
-        ("sensor.test_outside_temperature", "30", "30"),
-        ("sensor.test_time_to_arrival", "2024-01-01T00:00:06+00:00", STATE_UNAVAILABLE),
-    ],
-)
-async def test_sensors_restore(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    normal_config_entry: MockConfigEntry,
-    entity_registry: er.EntityRegistry,
-    freezer: FrozenDateTimeFactory,
-    mock_vehicle_data: AsyncMock,
-    entity_id: str,
-    initial: str,
-    restored: str,
-) -> None:
-    """Test if the sensor should restore it's state or not when vehicle is offline."""
-
-    freezer.move_to("2024-01-01 00:00:00+00:00")
-
-    await setup_platform(hass, normal_config_entry, [Platform.SENSOR])
-
-    assert hass.states.get(entity_id).state == initial
-
-    mock_vehicle_data.side_effect = VehicleOffline
-
-    with patch("homeassistant.components.tesla_fleet.PLATFORMS", [Platform.SENSOR]):
-        assert await hass.config_entries.async_reload(normal_config_entry.entry_id)
-
-    assert hass.states.get(entity_id).state == restored
diff --git a/tests/components/tesla_fleet/test_switch.py b/tests/components/tesla_fleet/test_switch.py
index fba4fc05cc4..5cf812439a5 100644
--- a/tests/components/tesla_fleet/test_switch.py
+++ b/tests/components/tesla_fleet/test_switch.py
@@ -1,5 +1,6 @@
 """Test the tesla_fleet switch platform."""
 
+from copy import deepcopy
 from unittest.mock import AsyncMock, patch
 
 import pytest
@@ -165,3 +166,29 @@ async def test_switch_no_scope(
             {ATTR_ENTITY_ID: "switch.test_auto_steering_wheel_heater"},
             blocking=True,
         )
+
+
+async def test_switch_no_signing(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    normal_config_entry: MockConfigEntry,
+    mock_products: AsyncMock,
+) -> None:
+    """Tests that the switch entities are correct."""
+
+    # Make the vehicle require command signing
+    products = deepcopy(mock_products.return_value)
+    products["response"][0]["command_signing"] = "required"
+    mock_products.return_value = products
+
+    await setup_platform(hass, normal_config_entry, [Platform.SWITCH])
+    with pytest.raises(
+        ServiceValidationError,
+        match="Vehicle requires command signing. Please see documentation for more details",
+    ):
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "switch.test_auto_steering_wheel_heater"},
+            blocking=True,
+        )
diff --git a/tests/components/teslemetry/conftest.py b/tests/components/teslemetry/conftest.py
index 256428aa703..d50986bdb43 100644
--- a/tests/components/teslemetry/conftest.py
+++ b/tests/components/teslemetry/conftest.py
@@ -1,4 +1,4 @@
-"""Fixtures for Teslemetry."""
+"""Fixtures for Tessie."""
 
 from __future__ import annotations
 
@@ -106,12 +106,3 @@ def mock_energy_history():
         return_value=ENERGY_HISTORY,
     ) as mock_live_status:
         yield mock_live_status
-
-
-@pytest.fixture(autouse=True)
-def mock_listen():
-    """Mock Teslemetry Stream listen method."""
-    with patch(
-        "homeassistant.components.teslemetry.TeslemetryStream.listen",
-    ) as mock_listen:
-        yield mock_listen
diff --git a/tests/components/teslemetry/fixtures/vehicle_data.json b/tests/components/teslemetry/fixtures/vehicle_data.json
index d99bc8de5a8..3845ae48559 100644
--- a/tests/components/teslemetry/fixtures/vehicle_data.json
+++ b/tests/components/teslemetry/fixtures/vehicle_data.json
@@ -112,7 +112,6 @@
       "wiper_blade_heater": false
     },
     "drive_state": {
-      "active_route_destination": "Home",
       "active_route_latitude": 30.2226265,
       "active_route_longitude": -97.6236871,
       "active_route_miles_to_arrival": 0.039491,
diff --git a/tests/components/teslemetry/snapshots/test_device_tracker.ambr b/tests/components/teslemetry/snapshots/test_device_tracker.ambr
index 6c18cdf75c6..9859d9db360 100644
--- a/tests/components/teslemetry/snapshots/test_device_tracker.ambr
+++ b/tests/components/teslemetry/snapshots/test_device_tracker.ambr
@@ -96,6 +96,6 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'home',
+    'state': 'not_home',
   })
 # ---
diff --git a/tests/components/teslemetry/snapshots/test_diagnostics.ambr b/tests/components/teslemetry/snapshots/test_diagnostics.ambr
index 3b96d6f70c0..11f8a91c1aa 100644
--- a/tests/components/teslemetry/snapshots/test_diagnostics.ambr
+++ b/tests/components/teslemetry/snapshots/test_diagnostics.ambr
@@ -270,7 +270,6 @@
           'climate_state_timestamp': 1705707520649,
           'climate_state_wiper_blade_heater': False,
           'color': None,
-          'drive_state_active_route_destination': 'Home',
           'drive_state_active_route_latitude': '**REDACTED**',
           'drive_state_active_route_longitude': '**REDACTED**',
           'drive_state_active_route_miles_to_arrival': 0.039491,
diff --git a/tests/components/teslemetry/snapshots/test_update.ambr b/tests/components/teslemetry/snapshots/test_update.ambr
index a1213f3d94b..ef66720a0ed 100644
--- a/tests/components/teslemetry/snapshots/test_update.ambr
+++ b/tests/components/teslemetry/snapshots/test_update.ambr
@@ -36,7 +36,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'auto_update': False,
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
       'friendly_name': 'Test Update',
       'in_progress': False,
@@ -94,7 +93,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'auto_update': False,
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/teslemetry/icon.png',
       'friendly_name': 'Test Update',
       'in_progress': False,
diff --git a/tests/components/teslemetry/test_init.py b/tests/components/teslemetry/test_init.py
index 2a33e1def66..a7afff9e341 100644
--- a/tests/components/teslemetry/test_init.py
+++ b/tests/components/teslemetry/test_init.py
@@ -18,7 +18,7 @@ from homeassistant.components.teslemetry.coordinator import (
 )
 from homeassistant.components.teslemetry.models import TeslemetryData
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_OFF, STATE_ON, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
@@ -214,47 +214,3 @@ async def test_energy_history_refresh_error(
     mock_energy_history.side_effect = side_effect
     entry = await setup_platform(hass)
     assert entry.state is state
-
-
-async def test_vehicle_stream(
-    hass: HomeAssistant,
-    mock_listen: AsyncMock,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test vehicle stream events."""
-
-    entry = await setup_platform(hass, [Platform.BINARY_SENSOR])
-    mock_listen.assert_called_once()
-
-    state = hass.states.get("binary_sensor.test_status")
-    assert state.state == STATE_ON
-
-    state = hass.states.get("binary_sensor.test_user_present")
-    assert state.state == STATE_OFF
-
-    runtime_data: TeslemetryData = entry.runtime_data
-    for listener, _ in runtime_data.vehicles[0].stream._listeners.values():
-        listener(
-            {
-                "vin": VEHICLE_DATA_ALT["response"]["vin"],
-                "vehicle_data": VEHICLE_DATA_ALT["response"],
-                "createdAt": "2024-10-04T10:45:17.537Z",
-            }
-        )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("binary_sensor.test_user_present")
-    assert state.state == STATE_ON
-
-    for listener, _ in runtime_data.vehicles[0].stream._listeners.values():
-        listener(
-            {
-                "vin": VEHICLE_DATA_ALT["response"]["vin"],
-                "state": "offline",
-                "createdAt": "2024-10-04T10:45:17.537Z",
-            }
-        )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("binary_sensor.test_status")
-    assert state.state == STATE_OFF
diff --git a/tests/components/tessie/snapshots/test_update.ambr b/tests/components/tessie/snapshots/test_update.ambr
index 1728c13b0ad..5f795007901 100644
--- a/tests/components/tessie/snapshots/test_update.ambr
+++ b/tests/components/tessie/snapshots/test_update.ambr
@@ -36,7 +36,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'auto_update': False,
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/tessie/icon.png',
       'friendly_name': 'Test Update',
       'in_progress': False,
diff --git a/tests/components/thethingsnetwork/test_init.py b/tests/components/thethingsnetwork/test_init.py
index e39c764d5f9..1e0b64c933d 100644
--- a/tests/components/thethingsnetwork/test_init.py
+++ b/tests/components/thethingsnetwork/test_init.py
@@ -4,6 +4,22 @@ import pytest
 from ttn_client import TTNAuthError
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.setup import async_setup_component
+
+from .conftest import DOMAIN
+
+
+async def test_error_configuration(
+    hass: HomeAssistant,
+    issue_registry: ir.IssueRegistry,
+) -> None:
+    """Test issue is logged when deprecated configuration is used."""
+    await async_setup_component(
+        hass, DOMAIN, {DOMAIN: {"app_id": "123", "access_key": "42"}}
+    )
+    await hass.async_block_till_done()
+    assert issue_registry.async_get_issue(DOMAIN, "manual_migration")
 
 
 @pytest.mark.parametrize(("exception_class"), [TTNAuthError, Exception])
diff --git a/tests/components/threshold/test_binary_sensor.py b/tests/components/threshold/test_binary_sensor.py
index 259009c6319..e0973c7a580 100644
--- a/tests/components/threshold/test_binary_sensor.py
+++ b/tests/components/threshold/test_binary_sensor.py
@@ -538,7 +538,7 @@ async def test_sensor_no_lower_upper(
     await async_setup_component(hass, Platform.BINARY_SENSOR, config)
     await hass.async_block_till_done()
 
-    assert "Lower or Upper thresholds are not provided" in caplog.text
+    assert "Lower or Upper thresholds not provided" in caplog.text
 
 
 async def test_device_id(
diff --git a/tests/components/tibber/test_diagnostics.py b/tests/components/tibber/test_diagnostics.py
index 16c735596d0..34ecb63dfec 100644
--- a/tests/components/tibber/test_diagnostics.py
+++ b/tests/components/tibber/test_diagnostics.py
@@ -19,9 +19,12 @@ async def test_entry_diagnostics(
     config_entry,
 ) -> None:
     """Test config entry diagnostics."""
-    with patch(
-        "tibber.Tibber.update_info",
-        return_value=None,
+    with (
+        patch(
+            "tibber.Tibber.update_info",
+            return_value=None,
+        ),
+        patch("homeassistant.components.tibber.discovery.async_load_platform"),
     ):
         assert await async_setup_component(hass, "tibber", {})
 
diff --git a/tests/components/tibber/test_notify.py b/tests/components/tibber/test_notify.py
index 9b731e78bf6..69af92c4d5d 100644
--- a/tests/components/tibber/test_notify.py
+++ b/tests/components/tibber/test_notify.py
@@ -6,6 +6,7 @@ from unittest.mock import MagicMock
 import pytest
 
 from homeassistant.components.recorder import Recorder
+from homeassistant.components.tibber import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
@@ -18,8 +19,18 @@ async def test_notification_services(
     notify_state = hass.states.get("notify.tibber")
     assert notify_state is not None
 
+    # Assert legacy notify service hass been added
+    assert hass.services.has_service("notify", DOMAIN)
+
+    # Test legacy notify service
+    service = "tibber"
+    service_data = {"message": "The message", "title": "A title"}
+    await hass.services.async_call("notify", service, service_data, blocking=True)
     calls: MagicMock = mock_tibber_setup.send_notification
 
+    calls.assert_called_once_with(message="The message", title="A title")
+    calls.reset_mock()
+
     # Test notify entity service
     service = "send_message"
     service_data = {
@@ -33,6 +44,15 @@ async def test_notification_services(
 
     calls.side_effect = TimeoutError
 
+    with pytest.raises(HomeAssistantError):
+        # Test legacy notify service
+        await hass.services.async_call(
+            "notify",
+            service="tibber",
+            service_data={"message": "The message", "title": "A title"},
+            blocking=True,
+        )
+
     with pytest.raises(HomeAssistantError):
         # Test notify entity service
         await hass.services.async_call(
diff --git a/tests/components/tibber/test_repairs.py b/tests/components/tibber/test_repairs.py
new file mode 100644
index 00000000000..5e5fde4569e
--- /dev/null
+++ b/tests/components/tibber/test_repairs.py
@@ -0,0 +1,56 @@
+"""Test loading of the Tibber config entry."""
+
+from unittest.mock import MagicMock
+
+from homeassistant.components.recorder import Recorder
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+
+from tests.components.repairs import process_repair_fix_flow, start_repair_fix_flow
+from tests.typing import ClientSessionGenerator
+
+
+async def test_repair_flow(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    issue_registry: ir.IssueRegistry,
+    mock_tibber_setup: MagicMock,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test unloading the entry."""
+
+    # Test legacy notify service
+    service = "tibber"
+    service_data = {"message": "The message", "title": "A title"}
+    await hass.services.async_call("notify", service, service_data, blocking=True)
+    calls: MagicMock = mock_tibber_setup.send_notification
+
+    calls.assert_called_once_with(message="The message", title="A title")
+    calls.reset_mock()
+
+    http_client = await hass_client()
+    # Assert the issue is present
+    assert issue_registry.async_get_issue(
+        domain="notify",
+        issue_id=f"migrate_notify_tibber_{service}",
+    )
+    assert len(issue_registry.issues) == 1
+
+    data = await start_repair_fix_flow(
+        http_client, "notify", f"migrate_notify_tibber_{service}"
+    )
+
+    flow_id = data["flow_id"]
+    assert data["step_id"] == "confirm"
+
+    # Simulate the users confirmed the repair flow
+    data = await process_repair_fix_flow(http_client, flow_id)
+    assert data["type"] == "create_entry"
+    await hass.async_block_till_done()
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(
+        domain="notify",
+        issue_id=f"migrate_notify_tibber_{service}",
+    )
+    assert len(issue_registry.issues) == 0
diff --git a/tests/components/tibber/test_services.py b/tests/components/tibber/test_services.py
index dc6f5d2789d..33dba9a0e8f 100644
--- a/tests/components/tibber/test_services.py
+++ b/tests/components/tibber/test_services.py
@@ -20,32 +20,84 @@ def generate_mock_home_data():
     mock_homes = [
         MagicMock(
             name="first_home",
-            price_total={
-                START_TIME.isoformat(): 0.36914,
-                (START_TIME + dt.timedelta(hours=1)).isoformat(): 0.36914,
-                tomorrow.isoformat(): 0.46914,
-                (tomorrow + dt.timedelta(hours=1)).isoformat(): 0.46914,
-            },
-            price_level={
-                START_TIME.isoformat(): "VERY_EXPENSIVE",
-                (START_TIME + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
-                tomorrow.isoformat(): "VERY_EXPENSIVE",
-                (tomorrow + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
+            info={
+                "viewer": {
+                    "home": {
+                        "currentSubscription": {
+                            "priceInfo": {
+                                "today": [
+                                    {
+                                        "startsAt": START_TIME.isoformat(),
+                                        "total": 0.36914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                    {
+                                        "startsAt": (
+                                            START_TIME + dt.timedelta(hours=1)
+                                        ).isoformat(),
+                                        "total": 0.36914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                ],
+                                "tomorrow": [
+                                    {
+                                        "startsAt": tomorrow.isoformat(),
+                                        "total": 0.46914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                    {
+                                        "startsAt": (
+                                            tomorrow + dt.timedelta(hours=1)
+                                        ).isoformat(),
+                                        "total": 0.46914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                ],
+                            }
+                        }
+                    }
+                }
             },
         ),
         MagicMock(
             name="second_home",
-            price_total={
-                START_TIME.isoformat(): 0.36914,
-                (START_TIME + dt.timedelta(hours=1)).isoformat(): 0.36914,
-                tomorrow.isoformat(): 0.46914,
-                (tomorrow + dt.timedelta(hours=1)).isoformat(): 0.46914,
-            },
-            price_level={
-                START_TIME.isoformat(): "VERY_EXPENSIVE",
-                (START_TIME + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
-                tomorrow.isoformat(): "VERY_EXPENSIVE",
-                (tomorrow + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
+            info={
+                "viewer": {
+                    "home": {
+                        "currentSubscription": {
+                            "priceInfo": {
+                                "today": [
+                                    {
+                                        "startsAt": START_TIME.isoformat(),
+                                        "total": 0.36914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                    {
+                                        "startsAt": (
+                                            START_TIME + dt.timedelta(hours=1)
+                                        ).isoformat(),
+                                        "total": 0.36914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                ],
+                                "tomorrow": [
+                                    {
+                                        "startsAt": tomorrow.isoformat(),
+                                        "total": 0.46914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                    {
+                                        "startsAt": (
+                                            tomorrow + dt.timedelta(hours=1)
+                                        ).isoformat(),
+                                        "total": 0.46914,
+                                        "level": "VERY_EXPENSIVE",
+                                    },
+                                ],
+                            }
+                        }
+                    }
+                }
             },
         ),
     ]
@@ -86,24 +138,29 @@ async def test_get_prices(
         "prices": {
             "first_home": [
                 {
-                    "start_time": START_TIME.isoformat(),
+                    "start_time": dt.datetime.fromisoformat(START_TIME.isoformat()),
+                    # back and forth conversion to deal with HAFakeDatetime vs real datetime being different types
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
                 {
-                    "start_time": (START_TIME + dt.timedelta(hours=1)).isoformat(),
+                    "start_time": dt.datetime.fromisoformat(
+                        (START_TIME + dt.timedelta(hours=1)).isoformat()
+                    ),
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
             ],
             "second_home": [
                 {
-                    "start_time": START_TIME.isoformat(),
+                    "start_time": dt.datetime.fromisoformat(START_TIME.isoformat()),
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
                 {
-                    "start_time": (START_TIME + dt.timedelta(hours=1)).isoformat(),
+                    "start_time": dt.datetime.fromisoformat(
+                        (START_TIME + dt.timedelta(hours=1)).isoformat()
+                    ),
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
@@ -136,24 +193,24 @@ async def test_get_prices_start_tomorrow(
         "prices": {
             "first_home": [
                 {
-                    "start_time": tomorrow.isoformat(),
+                    "start_time": tomorrow,
                     "price": 0.46914,
                     "level": "VERY_EXPENSIVE",
                 },
                 {
-                    "start_time": (tomorrow + dt.timedelta(hours=1)).isoformat(),
+                    "start_time": (tomorrow + dt.timedelta(hours=1)),
                     "price": 0.46914,
                     "level": "VERY_EXPENSIVE",
                 },
             ],
             "second_home": [
                 {
-                    "start_time": tomorrow.isoformat(),
+                    "start_time": tomorrow,
                     "price": 0.46914,
                     "level": "VERY_EXPENSIVE",
                 },
                 {
-                    "start_time": (tomorrow + dt.timedelta(hours=1)).isoformat(),
+                    "start_time": (tomorrow + dt.timedelta(hours=1)),
                     "price": 0.46914,
                     "level": "VERY_EXPENSIVE",
                 },
@@ -195,24 +252,24 @@ async def test_get_prices_with_timezones(
         "prices": {
             "first_home": [
                 {
-                    "start_time": START_TIME.isoformat(),
+                    "start_time": START_TIME,
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
                 {
-                    "start_time": (START_TIME + dt.timedelta(hours=1)).isoformat(),
+                    "start_time": START_TIME + dt.timedelta(hours=1),
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
             ],
             "second_home": [
                 {
-                    "start_time": START_TIME.isoformat(),
+                    "start_time": START_TIME,
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
                 {
-                    "start_time": (START_TIME + dt.timedelta(hours=1)).isoformat(),
+                    "start_time": START_TIME + dt.timedelta(hours=1),
                     "price": 0.36914,
                     "level": "VERY_EXPENSIVE",
                 },
diff --git a/tests/components/toon/test_config_flow.py b/tests/components/toon/test_config_flow.py
index 7855379db5b..70654377721 100644
--- a/tests/components/toon/test_config_flow.py
+++ b/tests/components/toon/test_config_flow.py
@@ -7,10 +7,10 @@ import pytest
 from toonapi import Agreement, ToonError
 
 from homeassistant.components.toon.const import CONF_AGREEMENT, DOMAIN
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
 from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/totalconnect/test_alarm_control_panel.py b/tests/components/totalconnect/test_alarm_control_panel.py
index bc76f7243ca..453c9be485a 100644
--- a/tests/components/totalconnect/test_alarm_control_panel.py
+++ b/tests/components/totalconnect/test_alarm_control_panel.py
@@ -12,10 +12,7 @@ from total_connect_client.exceptions import (
     TotalConnectError,
 )
 
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_DOMAIN,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN
 from homeassistant.components.totalconnect.alarm_control_panel import (
     SERVICE_ALARM_ARM_AWAY_INSTANT,
     SERVICE_ALARM_ARM_HOME_INSTANT,
@@ -29,6 +26,14 @@ from homeassistant.const import (
     SERVICE_ALARM_ARM_HOME,
     SERVICE_ALARM_ARM_NIGHT,
     SERVICE_ALARM_DISARM,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_DISARMING,
+    STATE_ALARM_TRIGGERED,
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
@@ -95,8 +100,8 @@ async def test_arm_home_success(
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
-        assert hass.states.get(ENTITY_ID_2).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
+        assert hass.states.get(ENTITY_ID_2).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -108,9 +113,9 @@ async def test_arm_home_success(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_HOME
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_HOME
         # second partition should not be armed
-        assert hass.states.get(ENTITY_ID_2).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID_2).state == STATE_ALARM_DISARMED
 
 
 async def test_arm_home_failure(hass: HomeAssistant) -> None:
@@ -120,7 +125,7 @@ async def test_arm_home_failure(hass: HomeAssistant) -> None:
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         with pytest.raises(HomeAssistantError) as err:
@@ -129,7 +134,7 @@ async def test_arm_home_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Failed to arm home test"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 2
 
         # config entry usercode is invalid
@@ -139,7 +144,7 @@ async def test_arm_home_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Usercode is invalid, did not arm home"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         # should have started a re-auth flow
         assert len(hass.config_entries.flow.async_progress_by_handler(DOMAIN)) == 1
         assert mock_request.call_count == 3
@@ -154,8 +159,8 @@ async def test_arm_home_instant_success(
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
-        assert hass.states.get(ENTITY_ID_2).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
+        assert hass.states.get(ENTITY_ID_2).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -167,7 +172,7 @@ async def test_arm_home_instant_success(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_HOME
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_HOME
 
 
 async def test_arm_home_instant_failure(hass: HomeAssistant) -> None:
@@ -177,7 +182,7 @@ async def test_arm_home_instant_failure(hass: HomeAssistant) -> None:
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         with pytest.raises(HomeAssistantError) as err:
@@ -186,7 +191,7 @@ async def test_arm_home_instant_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Failed to arm home instant test"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 2
 
         # usercode is invalid
@@ -196,7 +201,7 @@ async def test_arm_home_instant_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Usercode is invalid, did not arm home instant"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         # should have started a re-auth flow
         assert len(hass.config_entries.flow.async_progress_by_handler(DOMAIN)) == 1
         assert mock_request.call_count == 3
@@ -211,8 +216,8 @@ async def test_arm_away_instant_success(
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
-        assert hass.states.get(ENTITY_ID_2).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
+        assert hass.states.get(ENTITY_ID_2).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -224,7 +229,7 @@ async def test_arm_away_instant_success(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
 
 
 async def test_arm_away_instant_failure(hass: HomeAssistant) -> None:
@@ -234,7 +239,7 @@ async def test_arm_away_instant_failure(hass: HomeAssistant) -> None:
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         with pytest.raises(HomeAssistantError) as err:
@@ -243,7 +248,7 @@ async def test_arm_away_instant_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Failed to arm away instant test"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 2
 
         # usercode is invalid
@@ -253,7 +258,7 @@ async def test_arm_away_instant_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Usercode is invalid, did not arm away instant"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         # should have started a re-auth flow
         assert len(hass.config_entries.flow.async_progress_by_handler(DOMAIN)) == 1
         assert mock_request.call_count == 3
@@ -268,7 +273,7 @@ async def test_arm_away_success(
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -280,7 +285,7 @@ async def test_arm_away_success(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
 
 
 async def test_arm_away_failure(hass: HomeAssistant) -> None:
@@ -290,7 +295,7 @@ async def test_arm_away_failure(hass: HomeAssistant) -> None:
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         with pytest.raises(HomeAssistantError) as err:
@@ -299,7 +304,7 @@ async def test_arm_away_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Failed to arm away test"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 2
 
         # usercode is invalid
@@ -309,7 +314,7 @@ async def test_arm_away_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Usercode is invalid, did not arm away"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         # should have started a re-auth flow
         assert len(hass.config_entries.flow.async_progress_by_handler(DOMAIN)) == 1
         assert mock_request.call_count == 3
@@ -324,7 +329,7 @@ async def test_disarm_success(
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -336,7 +341,7 @@ async def test_disarm_success(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
 
 
 async def test_disarm_failure(hass: HomeAssistant) -> None:
@@ -350,7 +355,7 @@ async def test_disarm_failure(hass: HomeAssistant) -> None:
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
         assert mock_request.call_count == 1
 
         with pytest.raises(HomeAssistantError) as err:
@@ -359,7 +364,7 @@ async def test_disarm_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Failed to disarm test"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
         assert mock_request.call_count == 2
 
         # usercode is invalid
@@ -369,7 +374,7 @@ async def test_disarm_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Usercode is invalid, did not disarm"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
         # should have started a re-auth flow
         assert len(hass.config_entries.flow.async_progress_by_handler(DOMAIN)) == 1
         assert mock_request.call_count == 3
@@ -384,7 +389,7 @@ async def test_disarm_code_required(
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
         assert mock_request.call_count == 1
 
         # runtime user entered code is bad
@@ -394,7 +399,7 @@ async def test_disarm_code_required(
             await hass.services.async_call(
                 ALARM_DOMAIN, SERVICE_ALARM_DISARM, DATA_WITH_CODE, blocking=True
             )
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
         # code check means the call to total_connect never happens
         assert mock_request.call_count == 1
 
@@ -410,7 +415,7 @@ async def test_disarm_code_required(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
 
 
 async def test_arm_night_success(
@@ -422,7 +427,7 @@ async def test_arm_night_success(
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -434,7 +439,7 @@ async def test_arm_night_success(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_NIGHT
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_NIGHT
 
 
 async def test_arm_night_failure(hass: HomeAssistant) -> None:
@@ -444,7 +449,7 @@ async def test_arm_night_failure(hass: HomeAssistant) -> None:
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         with pytest.raises(HomeAssistantError) as err:
@@ -453,7 +458,7 @@ async def test_arm_night_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Failed to arm night test"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 2
 
         # usercode is invalid
@@ -463,7 +468,7 @@ async def test_arm_night_failure(hass: HomeAssistant) -> None:
             )
         await hass.async_block_till_done()
         assert f"{err.value}" == "Usercode is invalid, did not arm night"
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         # should have started a re-auth flow
         assert len(hass.config_entries.flow.async_progress_by_handler(DOMAIN)) == 1
         assert mock_request.call_count == 3
@@ -476,7 +481,7 @@ async def test_arming(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> No
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -488,7 +493,7 @@ async def test_arming(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> No
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMING
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMING
 
 
 async def test_disarming(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> None:
@@ -498,7 +503,7 @@ async def test_disarming(hass: HomeAssistant, freezer: FrozenDateTimeFactory) ->
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.ARMED_AWAY
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
         assert mock_request.call_count == 1
 
         await hass.services.async_call(
@@ -510,7 +515,7 @@ async def test_disarming(hass: HomeAssistant, freezer: FrozenDateTimeFactory) ->
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMING
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMING
 
 
 async def test_triggered_fire(hass: HomeAssistant) -> None:
@@ -521,7 +526,7 @@ async def test_triggered_fire(hass: HomeAssistant) -> None:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
         state = hass.states.get(ENTITY_ID)
-        assert state.state == AlarmControlPanelState.TRIGGERED
+        assert state.state == STATE_ALARM_TRIGGERED
         assert state.attributes.get("triggered_source") == "Fire/Smoke"
         assert mock_request.call_count == 1
 
@@ -534,7 +539,7 @@ async def test_triggered_police(hass: HomeAssistant) -> None:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
         state = hass.states.get(ENTITY_ID)
-        assert state.state == AlarmControlPanelState.TRIGGERED
+        assert state.state == STATE_ALARM_TRIGGERED
         assert state.attributes.get("triggered_source") == "Police/Medical"
         assert mock_request.call_count == 1
 
@@ -547,7 +552,7 @@ async def test_triggered_carbon_monoxide(hass: HomeAssistant) -> None:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
         state = hass.states.get(ENTITY_ID)
-        assert state.state == AlarmControlPanelState.TRIGGERED
+        assert state.state == STATE_ALARM_TRIGGERED
         assert state.attributes.get("triggered_source") == "Carbon Monoxide"
         assert mock_request.call_count == 1
 
@@ -559,10 +564,7 @@ async def test_armed_custom(hass: HomeAssistant) -> None:
     with patch(TOTALCONNECT_REQUEST, side_effect=responses) as mock_request:
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert (
-            hass.states.get(ENTITY_ID).state
-            == AlarmControlPanelState.ARMED_CUSTOM_BYPASS
-        )
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_CUSTOM_BYPASS
         assert mock_request.call_count == 1
 
 
@@ -594,7 +596,7 @@ async def test_other_update_failures(
         # first things work as planned
         await async_update_entity(hass, ENTITY_ID)
         await hass.async_block_till_done()
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 1
 
         # then an error: ServiceUnavailable --> UpdateFailed
@@ -608,7 +610,7 @@ async def test_other_update_failures(
         freezer.tick(SCAN_INTERVAL)
         async_fire_time_changed(hass)
         await hass.async_block_till_done(wait_background_tasks=True)
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 3
 
         # then an error: TotalConnectError --> UpdateFailed
@@ -622,7 +624,7 @@ async def test_other_update_failures(
         freezer.tick(SCAN_INTERVAL)
         async_fire_time_changed(hass)
         await hass.async_block_till_done(wait_background_tasks=True)
-        assert hass.states.get(ENTITY_ID).state == AlarmControlPanelState.DISARMED
+        assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 5
 
         # unknown TotalConnect status via ValueError
diff --git a/tests/components/tplink/conftest.py b/tests/components/tplink/conftest.py
index 25a4bd20270..f1586ee4a0a 100644
--- a/tests/components/tplink/conftest.py
+++ b/tests/components/tplink/conftest.py
@@ -32,12 +32,11 @@ def mock_discovery():
         "homeassistant.components.tplink.Discover",
         discover=DEFAULT,
         discover_single=DEFAULT,
-        try_connect_all=DEFAULT,
     ) as mock_discovery:
         device = _mocked_device(
             device_config=DeviceConfig.from_dict(DEVICE_CONFIG_KLAP.to_dict()),
             credentials_hash=CREDENTIALS_HASH_KLAP,
-            alias="My Bulb",
+            alias=None,
         )
         devices = {
             "127.0.0.1": _mocked_device(
@@ -48,7 +47,6 @@ def mock_discovery():
         }
         mock_discovery["discover"].return_value = devices
         mock_discovery["discover_single"].return_value = device
-        mock_discovery["try_connect_all"].return_value = device
         mock_discovery["mock_device"] = device
         yield mock_discovery
 
diff --git a/tests/components/tplink/fixtures/features.json b/tests/components/tplink/fixtures/features.json
index f60132fd2c2..30e1654001b 100644
--- a/tests/components/tplink/fixtures/features.json
+++ b/tests/components/tplink/fixtures/features.json
@@ -34,16 +34,6 @@
     "type": "Switch",
     "category": "Config"
   },
-  "child_lock": {
-    "value": true,
-    "type": "Switch",
-    "category": "Config"
-  },
-  "pir_enabled": {
-    "value": true,
-    "type": "Switch",
-    "category": "Config"
-  },
   "current_consumption": {
     "value": 5.23,
     "type": "Sensor",
@@ -210,11 +200,6 @@
     "type": "BinarySensor",
     "category": "Primary"
   },
-  "motion_detected": {
-    "value": false,
-    "type": "BinarySensor",
-    "category": "Primary"
-  },
   "alarm": {
     "value": false,
     "type": "BinarySensor",
@@ -313,10 +298,5 @@
     "type": "Choice",
     "category": "Config",
     "choices": ["low", "normal", "high"]
-  },
-  "water_alert_timestamp": {
-    "type": "Sensor",
-    "category": "Info",
-    "value": "2024-06-24 10:03:11.046643+01:00"
   }
 }
diff --git a/tests/components/tplink/snapshots/test_binary_sensor.ambr b/tests/components/tplink/snapshots/test_binary_sensor.ambr
index 4a1cfe5b411..832d300d66a 100644
--- a/tests/components/tplink/snapshots/test_binary_sensor.ambr
+++ b/tests/components/tplink/snapshots/test_binary_sensor.ambr
@@ -206,53 +206,6 @@
     'state': 'off',
   })
 # ---
-# name: test_states[binary_sensor.my_device_motion-entry]
-  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.my_device_motion',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.MOTION: 'motion'>,
-    'original_icon': None,
-    'original_name': 'Motion',
-    'platform': 'tplink',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'motion_detected',
-    'unique_id': '123456789ABCDEFGH_motion_detected',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_states[binary_sensor.my_device_motion-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'motion',
-      'friendly_name': 'my_device Motion',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.my_device_motion',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
 # name: test_states[binary_sensor.my_device_overheated-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/tplink/snapshots/test_sensor.ambr b/tests/components/tplink/snapshots/test_sensor.ambr
index 739f02e51f0..e639540e552 100644
--- a/tests/components/tplink/snapshots/test_sensor.ambr
+++ b/tests/components/tplink/snapshots/test_sensor.ambr
@@ -358,53 +358,6 @@
     'state': '12',
   })
 # ---
-# name: test_states[sensor.my_device_last_water_leak_alert-entry]
-  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': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-    'entity_id': 'sensor.my_device_last_water_leak_alert',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
-    'original_icon': None,
-    'original_name': 'Last water leak alert',
-    'platform': 'tplink',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'water_alert_timestamp',
-    'unique_id': '123456789ABCDEFGH_water_alert_timestamp',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_states[sensor.my_device_last_water_leak_alert-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'timestamp',
-      'friendly_name': 'my_device Last water leak alert',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.my_device_last_water_leak_alert',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '2024-06-24T09:03:11+00:00',
-  })
-# ---
 # name: test_states[sensor.my_device_on_since-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -593,9 +546,7 @@
     'aliases': set({
     }),
     'area_id': None,
-    'capabilities': dict({
-      'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
-    }),
+    'capabilities': None,
     'config_entry_id': <ANY>,
     'device_class': None,
     'device_id': <ANY>,
diff --git a/tests/components/tplink/snapshots/test_switch.ambr b/tests/components/tplink/snapshots/test_switch.ambr
index 36c630474c8..4354ea1905a 100644
--- a/tests/components/tplink/snapshots/test_switch.ambr
+++ b/tests/components/tplink/snapshots/test_switch.ambr
@@ -173,52 +173,6 @@
     'state': 'on',
   })
 # ---
-# name: test_states[switch.my_device_child_lock-entry]
-  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.my_device_child_lock',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Child lock',
-    'platform': 'tplink',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'child_lock',
-    'unique_id': '123456789ABCDEFGH_child_lock',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_states[switch.my_device_child_lock-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'my_device Child lock',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.my_device_child_lock',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
 # name: test_states[switch.my_device_fan_sleep_mode-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -311,52 +265,6 @@
     'state': 'on',
   })
 # ---
-# name: test_states[switch.my_device_motion_sensor-entry]
-  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.my_device_motion_sensor',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Motion sensor',
-    'platform': 'tplink',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': 'pir_enabled',
-    'unique_id': '123456789ABCDEFGH_pir_enabled',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_states[switch.my_device_motion_sensor-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'my_device Motion sensor',
-    }),
-    'context': <ANY>,
-    'entity_id': 'switch.my_device_motion_sensor',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
 # name: test_states[switch.my_device_smooth_transitions-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/tplink/test_config_flow.py b/tests/components/tplink/test_config_flow.py
index 2697696c667..40bd4383513 100644
--- a/tests/components/tplink/test_config_flow.py
+++ b/tests/components/tplink/test_config_flow.py
@@ -2,7 +2,7 @@
 
 from contextlib import contextmanager
 import logging
-from unittest.mock import ANY, AsyncMock, patch
+from unittest.mock import AsyncMock, patch
 
 from kasa import TimeoutError
 import pytest
@@ -30,7 +30,6 @@ from homeassistant.const import (
     CONF_HOST,
     CONF_MAC,
     CONF_PASSWORD,
-    CONF_PORT,
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
@@ -666,93 +665,6 @@ async def test_manual_auth_errors(
     await hass.async_block_till_done()
 
 
-@pytest.mark.parametrize(
-    ("host_str", "host", "port"),
-    [
-        (f"{IP_ADDRESS}:1234", IP_ADDRESS, 1234),
-        ("[2001:db8:0::1]:4321", "2001:db8:0::1", 4321),
-    ],
-)
-async def test_manual_port_override(
-    hass: HomeAssistant,
-    mock_connect: AsyncMock,
-    mock_discovery: AsyncMock,
-    host_str,
-    host,
-    port,
-) -> None:
-    """Test manually setup."""
-    mock_discovery["mock_device"].config.port_override = port
-    mock_discovery["mock_device"].host = host
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert not result["errors"]
-
-    # side_effects to cause auth confirm as the port override usually only
-    # works with direct connections.
-    mock_discovery["discover_single"].side_effect = TimeoutError
-    mock_connect["connect"].side_effect = AuthenticationError
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_HOST: host_str}
-    )
-    await hass.async_block_till_done()
-
-    assert result2["type"] is FlowResultType.FORM
-    assert result2["step_id"] == "user_auth_confirm"
-    assert not result2["errors"]
-
-    creds = Credentials("fake_username", "fake_password")
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
-        user_input={
-            CONF_USERNAME: "fake_username",
-            CONF_PASSWORD: "fake_password",
-        },
-    )
-    await hass.async_block_till_done()
-    mock_discovery["try_connect_all"].assert_called_once_with(
-        host, credentials=creds, port=port, http_client=ANY
-    )
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["title"] == DEFAULT_ENTRY_TITLE
-    assert result3["data"] == {
-        **CREATE_ENTRY_DATA_KLAP,
-        CONF_PORT: port,
-        CONF_HOST: host,
-    }
-    assert result3["context"]["unique_id"] == MAC_ADDRESS
-
-
-async def test_manual_port_override_invalid(
-    hass: HomeAssistant, mock_connect: AsyncMock, mock_discovery: AsyncMock
-) -> None:
-    """Test manually setup."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert not result["errors"]
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"], {CONF_HOST: f"{IP_ADDRESS}:foo"}
-    )
-    await hass.async_block_till_done()
-
-    mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.1", credentials=None, port=None
-    )
-
-    assert result2["type"] is FlowResultType.CREATE_ENTRY
-    assert result2["title"] == DEFAULT_ENTRY_TITLE
-    assert result2["data"] == CREATE_ENTRY_DATA_KLAP
-    assert result2["context"]["unique_id"] == MAC_ADDRESS
-
-
 async def test_discovered_by_discovery_and_dhcp(hass: HomeAssistant) -> None:
     """Test we get the form with discovery and abort for dhcp source when we get both."""
 
@@ -1111,30 +1023,6 @@ async def test_dhcp_discovery_with_ip_change(
     assert mock_config_entry.data[CONF_HOST] == "127.0.0.2"
 
 
-async def test_dhcp_discovery_discover_fail(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_discovery: AsyncMock,
-    mock_connect: AsyncMock,
-) -> None:
-    """Test dhcp discovery source cannot discover_single."""
-
-    flows = hass.config_entries.flow.async_progress()
-    assert len(flows) == 0
-    assert mock_config_entry.data[CONF_HOST] == "127.0.0.1"
-
-    with override_side_effect(mock_discovery["discover_single"], TimeoutError):
-        discovery_result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_DHCP},
-            data=dhcp.DhcpServiceInfo(
-                ip="127.0.0.2", macaddress=DHCP_FORMATTED_MAC_ADDRESS, hostname=ALIAS
-            ),
-        )
-    assert discovery_result["type"] is FlowResultType.ABORT
-    assert discovery_result["reason"] == "cannot_connect"
-
-
 async def test_reauth(
     hass: HomeAssistant,
     mock_added_config_entry: MockConfigEntry,
@@ -1160,7 +1048,7 @@ async def test_reauth(
     )
     credentials = Credentials("fake_username", "fake_password")
     mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.1", credentials=credentials, port=None
+        "127.0.0.1", credentials=credentials
     )
     mock_discovery["mock_device"].update.assert_called_once_with()
     assert result2["type"] is FlowResultType.ABORT
@@ -1169,76 +1057,6 @@ async def test_reauth(
     await hass.async_block_till_done()
 
 
-async def test_reauth_try_connect_all(
-    hass: HomeAssistant,
-    mock_added_config_entry: MockConfigEntry,
-    mock_discovery: AsyncMock,
-    mock_connect: AsyncMock,
-) -> None:
-    """Test reauth flow."""
-    mock_added_config_entry.async_start_reauth(hass)
-    await hass.async_block_till_done()
-
-    assert mock_added_config_entry.state is ConfigEntryState.LOADED
-    flows = hass.config_entries.flow.async_progress()
-    assert len(flows) == 1
-    [result] = flows
-    assert result["step_id"] == "reauth_confirm"
-
-    with override_side_effect(mock_discovery["discover_single"], TimeoutError):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_USERNAME: "fake_username",
-                CONF_PASSWORD: "fake_password",
-            },
-        )
-    credentials = Credentials("fake_username", "fake_password")
-    mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.1", credentials=credentials, port=None
-    )
-    mock_discovery["try_connect_all"].assert_called_once()
-    assert result2["type"] is FlowResultType.ABORT
-    assert result2["reason"] == "reauth_successful"
-
-    await hass.async_block_till_done()
-
-
-async def test_reauth_try_connect_all_fail(
-    hass: HomeAssistant,
-    mock_added_config_entry: MockConfigEntry,
-    mock_discovery: AsyncMock,
-    mock_connect: AsyncMock,
-) -> None:
-    """Test reauth flow."""
-    mock_added_config_entry.async_start_reauth(hass)
-    await hass.async_block_till_done()
-
-    assert mock_added_config_entry.state is ConfigEntryState.LOADED
-    flows = hass.config_entries.flow.async_progress()
-    assert len(flows) == 1
-    [result] = flows
-    assert result["step_id"] == "reauth_confirm"
-
-    with (
-        override_side_effect(mock_discovery["discover_single"], TimeoutError),
-        override_side_effect(mock_discovery["try_connect_all"], lambda *_, **__: None),
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_USERNAME: "fake_username",
-                CONF_PASSWORD: "fake_password",
-            },
-        )
-    credentials = Credentials("fake_username", "fake_password")
-    mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.1", credentials=credentials, port=None
-    )
-    mock_discovery["try_connect_all"].assert_called_once()
-    assert result2["errors"] == {"base": "cannot_connect"}
-
-
 async def test_reauth_update_with_encryption_change(
     hass: HomeAssistant,
     mock_discovery: AsyncMock,
@@ -1302,7 +1120,7 @@ async def test_reauth_update_with_encryption_change(
     assert "Connection type changed for 127.0.0.2" in caplog.text
     credentials = Credentials("fake_username", "fake_password")
     mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.2", credentials=credentials, port=None
+        "127.0.0.2", credentials=credentials
     )
     mock_discovery["mock_device"].update.assert_called_once_with()
     assert result2["type"] is FlowResultType.ABORT
@@ -1504,7 +1322,7 @@ async def test_reauth_errors(
     credentials = Credentials("fake_username", "fake_password")
 
     mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.1", credentials=credentials, port=None
+        "127.0.0.1", credentials=credentials
     )
     mock_discovery["mock_device"].update.assert_called_once_with()
     assert result2["type"] is FlowResultType.FORM
@@ -1522,7 +1340,7 @@ async def test_reauth_errors(
     )
 
     mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.1", credentials=credentials, port=None
+        "127.0.0.1", credentials=credentials
     )
     mock_discovery["mock_device"].update.assert_called_once_with()
 
@@ -1580,7 +1398,7 @@ async def test_pick_device_errors(
         assert result4["context"]["unique_id"] == MAC_ADDRESS
 
 
-async def test_discovery_timeout_try_connect_all(
+async def test_discovery_timeout_connect(
     hass: HomeAssistant,
     mock_discovery: AsyncMock,
     mock_connect: AsyncMock,
@@ -1606,7 +1424,7 @@ async def test_discovery_timeout_try_connect_all(
     assert mock_connect["connect"].call_count == 1
 
 
-async def test_discovery_timeout_try_connect_all_needs_creds(
+async def test_discovery_timeout_connect_legacy_error(
     hass: HomeAssistant,
     mock_discovery: AsyncMock,
     mock_connect: AsyncMock,
@@ -1628,57 +1446,8 @@ async def test_discovery_timeout_try_connect_all_needs_creds(
             result["flow_id"], {CONF_HOST: IP_ADDRESS}
         )
         await hass.async_block_till_done()
-    assert result2["step_id"] == "user_auth_confirm"
     assert result2["type"] is FlowResultType.FORM
-
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
-        user_input={
-            CONF_USERNAME: "fake_username",
-            CONF_PASSWORD: "fake_password",
-        },
-    )
-    await hass.async_block_till_done()
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["context"]["unique_id"] == MAC_ADDRESS
-    assert mock_connect["connect"].call_count == 1
-
-
-async def test_discovery_timeout_try_connect_all_fail(
-    hass: HomeAssistant,
-    mock_discovery: AsyncMock,
-    mock_connect: AsyncMock,
-    mock_init,
-) -> None:
-    """Test discovery tries legacy connect on timeout."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}
-    )
-    mock_discovery["discover_single"].side_effect = TimeoutError
-    await hass.async_block_till_done()
-    assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "user"
-    assert not result["errors"]
-    assert mock_connect["connect"].call_count == 0
-
-    with override_side_effect(mock_connect["connect"], KasaException):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"], {CONF_HOST: IP_ADDRESS}
-        )
-        await hass.async_block_till_done()
-    assert result2["step_id"] == "user_auth_confirm"
-    assert result2["type"] is FlowResultType.FORM
-
-    with override_side_effect(mock_discovery["try_connect_all"], lambda *_, **__: None):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            user_input={
-                CONF_USERNAME: "fake_username",
-                CONF_PASSWORD: "fake_password",
-            },
-        )
-        await hass.async_block_till_done()
-    assert result3["errors"] == {"base": "cannot_connect"}
+    assert result2["errors"] == {"base": "cannot_connect"}
     assert mock_connect["connect"].call_count == 1
 
 
@@ -1731,7 +1500,7 @@ async def test_reauth_update_other_flows(
     )
     credentials = Credentials("fake_username", "fake_password")
     mock_discovery["discover_single"].assert_called_once_with(
-        "127.0.0.1", credentials=credentials, port=None
+        "127.0.0.1", credentials=credentials
     )
     mock_discovery["mock_device"].update.assert_called_once_with()
     assert result2["type"] is FlowResultType.ABORT
diff --git a/tests/components/traccar/test_init.py b/tests/components/traccar/test_init.py
index fb90262a084..610e741f5f5 100644
--- a/tests/components/traccar/test_init.py
+++ b/tests/components/traccar/test_init.py
@@ -11,9 +11,9 @@ from homeassistant.components import traccar, zone
 from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
 from homeassistant.components.device_tracker.legacy import Device
 from homeassistant.components.traccar import DOMAIN, TRACKER_UPDATE
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import DATA_DISPATCHER
diff --git a/tests/components/transmission/test_config_flow.py b/tests/components/transmission/test_config_flow.py
index b724a91f7a1..b318862047e 100644
--- a/tests/components/transmission/test_config_flow.py
+++ b/tests/components/transmission/test_config_flow.py
@@ -164,10 +164,7 @@ async def test_reauth_success(hass: HomeAssistant) -> None:
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
-    assert result["description_placeholders"] == {
-        "username": "user",
-        "name": "Mock Title",
-    }
+    assert result["description_placeholders"] == {"username": "user"}
 
     with patch(
         "homeassistant.components.transmission.async_setup_entry",
@@ -197,10 +194,7 @@ async def test_reauth_failed(hass: HomeAssistant, mock_api: MagicMock) -> None:
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
-    assert result["description_placeholders"] == {
-        "username": "user",
-        "name": "Mock Title",
-    }
+    assert result["description_placeholders"] == {"username": "user"}
 
     mock_api.side_effect = TransmissionAuthError()
     result2 = await hass.config_entries.flow.async_configure(
@@ -228,10 +222,7 @@ async def test_reauth_failed_connection_error(
 
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "reauth_confirm"
-    assert result["description_placeholders"] == {
-        "username": "user",
-        "name": "Mock Title",
-    }
+    assert result["description_placeholders"] == {"username": "user"}
 
     mock_api.side_effect = TransmissionConnectError()
     result2 = await hass.config_entries.flow.async_configure(
diff --git a/tests/components/tts/conftest.py b/tests/components/tts/conftest.py
index ddef3ee0c28..16c24f006d7 100644
--- a/tests/components/tts/conftest.py
+++ b/tests/components/tts/conftest.py
@@ -10,9 +10,9 @@ from unittest.mock import MagicMock
 
 import pytest
 
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.config_entries import ConfigFlow
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 
 from .common import (
     DEFAULT_LANG,
diff --git a/tests/components/tts/test_notify.py b/tests/components/tts/test_notify.py
index 00cdae2934f..07ba2f2f3f5 100644
--- a/tests/components/tts/test_notify.py
+++ b/tests/components/tts/test_notify.py
@@ -9,8 +9,8 @@ from homeassistant.components.media_player import (
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
 )
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 
 from .common import MockTTSEntity, mock_config_entry_setup
diff --git a/tests/components/twilio/test_init.py b/tests/components/twilio/test_init.py
index 9c07bd6f3d8..8efa1c24742 100644
--- a/tests/components/twilio/test_init.py
+++ b/tests/components/twilio/test_init.py
@@ -2,8 +2,8 @@
 
 from homeassistant import config_entries
 from homeassistant.components import twilio
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.data_entry_flow import FlowResultType
 
 from tests.typing import ClientSessionGenerator
diff --git a/tests/components/twitch/conftest.py b/tests/components/twitch/conftest.py
index 07732de1b0c..25e443c2778 100644
--- a/tests/components/twitch/conftest.py
+++ b/tests/components/twitch/conftest.py
@@ -111,8 +111,8 @@ def twitch_mock() -> Generator[AsyncMock]:
         mock_client.return_value.get_followed_channels.return_value = TwitchIterObject(
             "get_followed_channels.json", FollowedChannel
         )
-        mock_client.return_value.get_followed_streams.return_value = get_generator(
-            "get_followed_streams.json", Stream
+        mock_client.return_value.get_streams.return_value = get_generator(
+            "get_streams.json", Stream
         )
         mock_client.return_value.check_user_subscription.return_value = (
             UserSubscription(
diff --git a/tests/components/twitch/fixtures/check_user_subscription.json b/tests/components/twitch/fixtures/check_user_subscription.json
index 5e710b72699..b1b2a3d852a 100644
--- a/tests/components/twitch/fixtures/check_user_subscription.json
+++ b/tests/components/twitch/fixtures/check_user_subscription.json
@@ -1,4 +1,3 @@
 {
-  "is_gift": true,
-  "tier": "2000"
+  "is_gift": true
 }
diff --git a/tests/components/twitch/fixtures/check_user_subscription_2.json b/tests/components/twitch/fixtures/check_user_subscription_2.json
index 38a1f063f96..94d56c5ee12 100644
--- a/tests/components/twitch/fixtures/check_user_subscription_2.json
+++ b/tests/components/twitch/fixtures/check_user_subscription_2.json
@@ -1,4 +1,3 @@
 {
-  "is_gift": false,
-  "tier": "1000"
+  "is_gift": false
 }
diff --git a/tests/components/twitch/fixtures/get_followed_channels.json b/tests/components/twitch/fixtures/get_followed_channels.json
index 990fac390e9..4add7cc0a98 100644
--- a/tests/components/twitch/fixtures/get_followed_channels.json
+++ b/tests/components/twitch/fixtures/get_followed_channels.json
@@ -1,11 +1,9 @@
 [
   {
-    "broadcaster_id": 123,
     "broadcaster_login": "internetofthings",
     "followed_at": "2023-08-01"
   },
   {
-    "broadcaster_id": 456,
     "broadcaster_login": "homeassistant",
     "followed_at": "2023-08-01"
   }
diff --git a/tests/components/twitch/fixtures/get_followed_streams.json b/tests/components/twitch/fixtures/get_streams.json
similarity index 89%
rename from tests/components/twitch/fixtures/get_followed_streams.json
rename to tests/components/twitch/fixtures/get_streams.json
index e02c594c4cc..73f6dc1b42a 100644
--- a/tests/components/twitch/fixtures/get_followed_streams.json
+++ b/tests/components/twitch/fixtures/get_streams.json
@@ -1,6 +1,5 @@
 [
   {
-    "user_id": 123,
     "game_name": "Good game",
     "title": "Title",
     "thumbnail_url": "stream-medium.png",
diff --git a/tests/components/twitch/test_sensor.py b/tests/components/twitch/test_sensor.py
index 613c0919c49..60024268a68 100644
--- a/tests/components/twitch/test_sensor.py
+++ b/tests/components/twitch/test_sensor.py
@@ -21,8 +21,8 @@ async def test_offline(
     hass: HomeAssistant, twitch_mock: AsyncMock, config_entry: MockConfigEntry
 ) -> None:
     """Test offline state."""
-    twitch_mock.return_value.get_followed_streams.return_value = (
-        get_generator_from_data([], Stream)
+    twitch_mock.return_value.get_streams.return_value = get_generator_from_data(
+        [], Stream
     )
     await setup_integration(hass, config_entry)
 
@@ -80,7 +80,6 @@ async def test_oauth_with_sub(
     sensor_state = hass.states.get(ENTITY_ID)
     assert sensor_state.attributes["subscribed"] is True
     assert sensor_state.attributes["subscription_is_gifted"] is False
-    assert sensor_state.attributes["subscription_tier"] == 1
     assert sensor_state.attributes["following"] is False
 
 
diff --git a/tests/components/unifi/snapshots/test_update.ambr b/tests/components/unifi/snapshots/test_update.ambr
index 405cb9d52a6..77fd2c7d8bc 100644
--- a/tests/components/unifi/snapshots/test_update.ambr
+++ b/tests/components/unifi/snapshots/test_update.ambr
@@ -37,7 +37,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/unifi/icon.png',
       'friendly_name': 'Device 1',
       'in_progress': False,
@@ -96,7 +95,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/unifi/icon.png',
       'friendly_name': 'Device 2',
       'in_progress': False,
@@ -155,7 +153,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/unifi/icon.png',
       'friendly_name': 'Device 1',
       'in_progress': False,
@@ -214,7 +211,6 @@
     'attributes': ReadOnlyDict({
       'auto_update': False,
       'device_class': 'firmware',
-      'display_precision': 0,
       'entity_picture': 'https://brands.home-assistant.io/_/unifi/icon.png',
       'friendly_name': 'Device 2',
       'in_progress': False,
diff --git a/tests/components/unifiprotect/test_camera.py b/tests/components/unifiprotect/test_camera.py
index 379f443923a..75a0beb23d9 100644
--- a/tests/components/unifiprotect/test_camera.py
+++ b/tests/components/unifiprotect/test_camera.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from unittest.mock import AsyncMock, Mock
 
-import pytest
 from uiprotect.api import DEVICE_UPDATE_INTERVAL
 from uiprotect.data import Camera as ProtectCamera, CameraChannel, StateType
 from uiprotect.exceptions import NvrError
@@ -13,13 +12,8 @@ from uiprotect.websocket import WebsocketState
 from homeassistant.components.camera import (
     CameraEntityFeature,
     CameraState,
-    CameraWebRTCProvider,
-    RTCIceCandidate,
-    StreamType,
-    WebRTCSendMessage,
     async_get_image,
     async_get_stream_source,
-    async_register_webrtc_provider,
 )
 from homeassistant.components.unifiprotect.const import (
     ATTR_BITRATE,
@@ -28,7 +22,6 @@ from homeassistant.components.unifiprotect.const import (
     ATTR_HEIGHT,
     ATTR_WIDTH,
     DEFAULT_ATTRIBUTION,
-    DOMAIN,
 )
 from homeassistant.components.unifiprotect.utils import get_camera_base_name
 from homeassistant.const import (
@@ -38,12 +31,11 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     Platform,
 )
-from homeassistant.core import HomeAssistant, callback
+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 .utils import (
-    Camera,
     MockUFPFixture,
     adopt_devices,
     assert_entity_counts,
@@ -54,45 +46,6 @@ from .utils import (
 )
 
 
-class MockWebRTCProvider(CameraWebRTCProvider):
-    """WebRTC provider."""
-
-    @property
-    def domain(self) -> str:
-        """Return the integration domain of the provider."""
-        return DOMAIN
-
-    @callback
-    def async_is_supported(self, stream_source: str) -> bool:
-        """Return if this provider is supports the Camera as source."""
-        return True
-
-    async def async_handle_async_webrtc_offer(
-        self,
-        camera: Camera,
-        offer_sdp: str,
-        session_id: str,
-        send_message: WebRTCSendMessage,
-    ) -> None:
-        """Handle the WebRTC offer and return the answer via the provided callback."""
-
-    async def async_on_webrtc_candidate(
-        self, session_id: str, candidate: RTCIceCandidate
-    ) -> None:
-        """Handle the WebRTC candidate."""
-
-    @callback
-    def async_close_session(self, session_id: str) -> None:
-        """Close the session."""
-
-
-@pytest.fixture
-async def web_rtc_provider(hass: HomeAssistant) -> None:
-    """Fixture to enable WebRTC provider for camera entities."""
-    await async_setup_component(hass, "camera", {})
-    async_register_webrtc_provider(hass, MockWebRTCProvider())
-
-
 def validate_default_camera_entity(
     hass: HomeAssistant,
     camera_obj: ProtectCamera,
@@ -196,7 +149,7 @@ async def validate_rtsps_camera_state(
     """Validate a camera's state."""
     channel = camera_obj.channels[channel_id]
 
-    assert await async_get_stream_source(hass, entity_id) == channel.rtsps_no_srtp_url
+    assert await async_get_stream_source(hass, entity_id) == channel.rtsps_url
     validate_common_camera_state(hass, channel, entity_id, features)
 
 
@@ -330,26 +283,6 @@ async def test_basic_setup(
     await validate_no_stream_camera_state(hass, doorbell, 3, entity_id, features=0)
 
 
-@pytest.mark.usefixtures("web_rtc_provider")
-async def test_webrtc_support(
-    hass: HomeAssistant,
-    ufp: MockUFPFixture,
-    camera_all: ProtectCamera,
-) -> None:
-    """Test webrtc support is available."""
-    camera_high_only = camera_all.copy()
-    camera_high_only.channels = [c.copy() for c in camera_all.channels]
-    camera_high_only.name = "Test Camera 1"
-    camera_high_only.channels[0].is_rtsp_enabled = True
-    camera_high_only.channels[1].is_rtsp_enabled = False
-    camera_high_only.channels[2].is_rtsp_enabled = False
-    await init_entry(hass, ufp, [camera_high_only])
-    entity_id = validate_default_camera_entity(hass, camera_high_only, 0)
-    state = hass.states.get(entity_id)
-    assert state
-    assert StreamType.WEB_RTC in state.attributes["frontend_stream_type"]
-
-
 async def test_adopt(
     hass: HomeAssistant, ufp: MockUFPFixture, camera: ProtectCamera
 ) -> None:
diff --git a/tests/components/unifiprotect/test_media_source.py b/tests/components/unifiprotect/test_media_source.py
index 18944460ca5..60cd3150884 100644
--- a/tests/components/unifiprotect/test_media_source.py
+++ b/tests/components/unifiprotect/test_media_source.py
@@ -669,7 +669,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.RING,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=[],
@@ -683,7 +683,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.MOTION,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=[],
@@ -697,7 +697,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["person"],
@@ -706,7 +706,7 @@ async def test_browse_media_recent_truncated(
                 metadata={
                     "detected_thumbnails": [
                         {
-                            "clock_best_wall": datetime(2000, 1, 1, 0, 0, 0),
+                            "clock_best_wall": datetime(1000, 1, 1, 0, 0, 0),
                             "type": "person",
                             "cropped_id": "event_id",
                         }
@@ -720,7 +720,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["vehicle", "person"],
@@ -734,7 +734,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["vehicle", "licensePlate"],
@@ -748,7 +748,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["vehicle", "licensePlate"],
@@ -758,7 +758,7 @@ async def test_browse_media_recent_truncated(
                     "license_plate": {"name": "ABC1234", "confidence_level": 95},
                     "detected_thumbnails": [
                         {
-                            "clock_best_wall": datetime(2000, 1, 1, 0, 0, 0),
+                            "clock_best_wall": datetime(1000, 1, 1, 0, 0, 0),
                             "type": "vehicle",
                             "cropped_id": "event_id",
                         }
@@ -772,7 +772,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["vehicle", "licensePlate"],
@@ -782,7 +782,7 @@ async def test_browse_media_recent_truncated(
                     "license_plate": {"name": "ABC1234", "confidence_level": 95},
                     "detected_thumbnails": [
                         {
-                            "clock_best_wall": datetime(2000, 1, 1, 0, 0, 0),
+                            "clock_best_wall": datetime(1000, 1, 1, 0, 0, 0),
                             "type": "vehicle",
                             "cropped_id": "event_id",
                             "attributes": {
@@ -802,7 +802,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["vehicle", "licensePlate"],
@@ -812,7 +812,7 @@ async def test_browse_media_recent_truncated(
                     "license_plate": {"name": "ABC1234", "confidence_level": 95},
                     "detected_thumbnails": [
                         {
-                            "clock_best_wall": datetime(2000, 1, 1, 0, 0, 0),
+                            "clock_best_wall": datetime(1000, 1, 1, 0, 0, 0),
                             "type": "vehicle",
                             "cropped_id": "event_id",
                             "attributes": {
@@ -823,7 +823,7 @@ async def test_browse_media_recent_truncated(
                             },
                         },
                         {
-                            "clock_best_wall": datetime(2000, 1, 1, 0, 0, 0),
+                            "clock_best_wall": datetime(1000, 1, 1, 0, 0, 0),
                             "type": "person",
                             "cropped_id": "event_id",
                         },
@@ -837,7 +837,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["vehicle"],
@@ -846,7 +846,7 @@ async def test_browse_media_recent_truncated(
                 metadata={
                     "detected_thumbnails": [
                         {
-                            "clock_best_wall": datetime(2000, 1, 1, 0, 0, 0),
+                            "clock_best_wall": datetime(1000, 1, 1, 0, 0, 0),
                             "type": "vehicle",
                             "cropped_id": "event_id",
                             "attributes": {
@@ -870,7 +870,7 @@ async def test_browse_media_recent_truncated(
                 model=ModelType.EVENT,
                 id="test_event_id",
                 type=EventType.SMART_AUDIO_DETECT,
-                start=datetime(2000, 1, 1, 0, 0, 0),
+                start=datetime(1000, 1, 1, 0, 0, 0),
                 end=None,
                 score=100,
                 smart_detect_types=["alrmSpeak"],
diff --git a/tests/components/update/common.py b/tests/components/update/common.py
index 465812e6a3a..70b69498f66 100644
--- a/tests/components/update/common.py
+++ b/tests/components/update/common.py
@@ -5,16 +5,48 @@ from typing import Any
 
 from homeassistant.components.update import UpdateEntity
 
+from tests.common import MockEntity
+
 _LOGGER = logging.getLogger(__name__)
 
 
-class MockUpdateEntity(UpdateEntity):
+class MockUpdateEntity(MockEntity, UpdateEntity):
     """Mock UpdateEntity class."""
 
-    def __init__(self, **values: Any) -> None:
-        """Initialize an entity."""
-        for key, val in values.items():
-            setattr(self, f"_attr_{key}", val)
+    @property
+    def auto_update(self) -> bool:
+        """Indicate if the device or service has auto update enabled."""
+        return self._handle("auto_update")
+
+    @property
+    def installed_version(self) -> str | None:
+        """Version currently installed and in use."""
+        return self._handle("installed_version")
+
+    @property
+    def in_progress(self) -> bool | int | None:
+        """Update installation progress."""
+        return self._handle("in_progress")
+
+    @property
+    def latest_version(self) -> str | None:
+        """Latest version available for install."""
+        return self._handle("latest_version")
+
+    @property
+    def release_summary(self) -> str | None:
+        """Summary of the release notes or changelog."""
+        return self._handle("release_summary")
+
+    @property
+    def release_url(self) -> str | None:
+        """URL to the full release notes of the latest version available."""
+        return self._handle("release_url")
+
+    @property
+    def title(self) -> str | None:
+        """Title of the software."""
+        return self._handle("title")
 
     def install(self, version: str | None, backup: bool, **kwargs: Any) -> None:
         """Install an update."""
@@ -22,10 +54,10 @@ class MockUpdateEntity(UpdateEntity):
             _LOGGER.info("Creating backup before installing update")
 
         if version is not None:
-            self._attr_installed_version = version
+            self._values["installed_version"] = version
             _LOGGER.info("Installed update with version: %s", version)
         else:
-            self._attr_installed_version = self.latest_version
+            self._values["installed_version"] = self.latest_version
             _LOGGER.info("Installed latest update")
 
     def release_notes(self) -> str | None:
diff --git a/tests/components/update/conftest.py b/tests/components/update/conftest.py
index eae5cc318da..759f243e8db 100644
--- a/tests/components/update/conftest.py
+++ b/tests/components/update/conftest.py
@@ -51,24 +51,12 @@ def mock_update_entities() -> list[MockUpdateEntity]:
         ),
         MockUpdateEntity(
             name="Update Already in Progress",
-            unique_id="update_already_in_progress",
+            unique_id="update_already_in_progres",
             installed_version="1.0.0",
             latest_version="1.0.1",
-            in_progress=True,
+            in_progress=50,
             supported_features=UpdateEntityFeature.INSTALL
             | UpdateEntityFeature.PROGRESS,
-            update_percentage=50,
-        ),
-        MockUpdateEntity(
-            name="Update Already in Progress Float",
-            unique_id="update_already_in_progress_float",
-            installed_version="1.0.0",
-            latest_version="1.0.1",
-            in_progress=True,
-            supported_features=UpdateEntityFeature.INSTALL
-            | UpdateEntityFeature.PROGRESS,
-            update_percentage=0.25,
-            display_precision=2,
         ),
         MockUpdateEntity(
             name="Update No Install",
diff --git a/tests/components/update/test_init.py b/tests/components/update/test_init.py
index a35f7bb0f12..f19b009456a 100644
--- a/tests/components/update/test_init.py
+++ b/tests/components/update/test_init.py
@@ -18,7 +18,6 @@ from homeassistant.components.update import (
 )
 from homeassistant.components.update.const import (
     ATTR_AUTO_UPDATE,
-    ATTR_DISPLAY_PRECISION,
     ATTR_IN_PROGRESS,
     ATTR_INSTALLED_VERSION,
     ATTR_LATEST_VERSION,
@@ -93,7 +92,6 @@ async def test_update(hass: HomeAssistant) -> None:
     assert update.state == STATE_ON
     assert update.state_attributes == {
         ATTR_AUTO_UPDATE: False,
-        ATTR_DISPLAY_PRECISION: 0,
         ATTR_INSTALLED_VERSION: "1.0.0",
         ATTR_IN_PROGRESS: False,
         ATTR_LATEST_VERSION: "1.0.1",
@@ -548,20 +546,10 @@ async def test_entity_with_backup_support(
     assert "Installed update with version: 0.9.8" in caplog.text
 
 
-@pytest.mark.parametrize(
-    ("entity_id", "expected_display_precision", "expected_update_percentage"),
-    [
-        ("update.update_already_in_progress", 0, 50),
-        ("update.update_already_in_progress_float", 2, 0.25),
-    ],
-)
 async def test_entity_already_in_progress(
     hass: HomeAssistant,
     mock_update_entities: list[MockUpdateEntity],
     caplog: pytest.LogCaptureFixture,
-    entity_id: str,
-    expected_display_precision: int,
-    expected_update_percentage: float,
 ) -> None:
     """Test update install already in progress."""
     setup_test_component_platform(hass, DOMAIN, mock_update_entities)
@@ -569,14 +557,13 @@ async def test_entity_already_in_progress(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity_id)
+    state = hass.states.get("update.update_already_in_progress")
     assert state
     assert state.state == STATE_ON
-    assert state.attributes[ATTR_DISPLAY_PRECISION] == expected_display_precision
     assert state.attributes[ATTR_INSTALLED_VERSION] == "1.0.0"
     assert state.attributes[ATTR_LATEST_VERSION] == "1.0.1"
     assert state.attributes[ATTR_IN_PROGRESS] is True
-    assert state.attributes[ATTR_UPDATE_PERCENTAGE] == expected_update_percentage
+    assert state.attributes[ATTR_UPDATE_PERCENTAGE] == 50
 
     with pytest.raises(
         HomeAssistantError,
@@ -585,20 +572,10 @@ async def test_entity_already_in_progress(
         await hass.services.async_call(
             DOMAIN,
             SERVICE_INSTALL,
-            {ATTR_ENTITY_ID: entity_id},
+            {ATTR_ENTITY_ID: "update.update_already_in_progress"},
             blocking=True,
         )
 
-    # Check update percentage is suppressed when in_progress is False
-    entity = next(
-        entity for entity in mock_update_entities if entity.entity_id == entity_id
-    )
-    entity._attr_in_progress = False
-    entity.async_write_ha_state()
-    state = hass.states.get(entity_id)
-    assert state.attributes[ATTR_IN_PROGRESS] is False
-    assert state.attributes[ATTR_UPDATE_PERCENTAGE] is None
-
 
 async def test_entity_without_progress_support(
     hass: HomeAssistant,
@@ -1079,7 +1056,6 @@ async def test_update_percentage_backwards_compatibility(
 
     expected_attributes = {
         ATTR_AUTO_UPDATE: False,
-        ATTR_DISPLAY_PRECISION: 0,
         ATTR_ENTITY_PICTURE: "https://brands.home-assistant.io/_/test/icon.png",
         ATTR_FRIENDLY_NAME: "legacy",
         ATTR_INSTALLED_VERSION: "1.0.0",
diff --git a/tests/components/update/test_recorder.py b/tests/components/update/test_recorder.py
index 68e5f93a757..847a08cfd9c 100644
--- a/tests/components/update/test_recorder.py
+++ b/tests/components/update/test_recorder.py
@@ -7,7 +7,6 @@ from datetime import timedelta
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
 from homeassistant.components.update.const import (
-    ATTR_DISPLAY_PRECISION,
     ATTR_IN_PROGRESS,
     ATTR_INSTALLED_VERSION,
     ATTR_RELEASE_SUMMARY,
@@ -36,7 +35,6 @@ async def test_exclude_attributes(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
     state = hass.states.get("update.update_already_in_progress")
-    assert state.attributes[ATTR_DISPLAY_PRECISION] == 0
     assert state.attributes[ATTR_IN_PROGRESS] is True
     assert state.attributes[ATTR_UPDATE_PERCENTAGE] == 50
     assert (
@@ -56,7 +54,6 @@ async def test_exclude_attributes(
     assert len(states) >= 1
     for entity_states in states.values():
         for state in entity_states:
-            assert ATTR_DISPLAY_PRECISION not in state.attributes
             assert ATTR_ENTITY_PICTURE not in state.attributes
             assert ATTR_IN_PROGRESS not in state.attributes
             assert ATTR_RELEASE_SUMMARY not in state.attributes
diff --git a/tests/components/utility_meter/snapshots/test_diagnostics.ambr b/tests/components/utility_meter/snapshots/test_diagnostics.ambr
index 6cdf121d7e3..c69164264da 100644
--- a/tests/components/utility_meter/snapshots/test_diagnostics.ambr
+++ b/tests/components/utility_meter/snapshots/test_diagnostics.ambr
@@ -41,17 +41,7 @@
           'status': 'collecting',
           'tariff': 'tariff0',
         }),
-        'last_sensor_data': dict({
-          'last_period': '0',
-          'last_reset': '2024-04-05T00:00:00+00:00',
-          'last_valid_state': 3,
-          'native_unit_of_measurement': 'kWh',
-          'native_value': dict({
-            '__type': "<class 'decimal.Decimal'>",
-            'decimal_str': '3',
-          }),
-          'status': 'collecting',
-        }),
+        'last_sensor_data': None,
         'name': 'Energy Bill tariff0',
         'period': 'monthly',
         'source': 'sensor.input1',
@@ -67,17 +57,7 @@
           'status': 'paused',
           'tariff': 'tariff1',
         }),
-        'last_sensor_data': dict({
-          'last_period': '0',
-          'last_reset': '2024-04-05T00:00:00+00:00',
-          'last_valid_state': 7,
-          'native_unit_of_measurement': 'kWh',
-          'native_value': dict({
-            '__type': "<class 'decimal.Decimal'>",
-            'decimal_str': '7',
-          }),
-          'status': 'paused',
-        }),
+        'last_sensor_data': None,
         'name': 'Energy Bill tariff1',
         'period': 'monthly',
         'source': 'sensor.input1',
diff --git a/tests/components/utility_meter/test_diagnostics.py b/tests/components/utility_meter/test_diagnostics.py
index 8be5f949940..9ecabe813b1 100644
--- a/tests/components/utility_meter/test_diagnostics.py
+++ b/tests/components/utility_meter/test_diagnostics.py
@@ -91,17 +91,7 @@ async def test_diagnostics(
                         ATTR_LAST_RESET: last_reset,
                     },
                 ),
-                {
-                    "native_value": {
-                        "__type": "<class 'decimal.Decimal'>",
-                        "decimal_str": "3",
-                    },
-                    "native_unit_of_measurement": "kWh",
-                    "last_reset": last_reset,
-                    "last_period": "0",
-                    "last_valid_state": 3,
-                    "status": "collecting",
-                },
+                {},
             ),
             (
                 State(
@@ -111,17 +101,7 @@ async def test_diagnostics(
                         ATTR_LAST_RESET: last_reset,
                     },
                 ),
-                {
-                    "native_value": {
-                        "__type": "<class 'decimal.Decimal'>",
-                        "decimal_str": "7",
-                    },
-                    "native_unit_of_measurement": "kWh",
-                    "last_reset": last_reset,
-                    "last_period": "0",
-                    "last_valid_state": 7,
-                    "status": "paused",
-                },
+                {},
             ),
         ],
     )
diff --git a/tests/components/utility_meter/test_select.py b/tests/components/utility_meter/test_select.py
index 1f54f3b500a..61f6cbe75b9 100644
--- a/tests/components/utility_meter/test_select.py
+++ b/tests/components/utility_meter/test_select.py
@@ -3,72 +3,10 @@
 from homeassistant.components.utility_meter.const import DOMAIN
 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_select_entity_name_config_entry(
-    hass: HomeAssistant,
-) -> None:
-    """Test for Utility Meter select platform."""
-
-    config_entry_config = {
-        "cycle": "none",
-        "delta_values": False,
-        "name": "Energy bill",
-        "net_consumption": False,
-        "offset": 0,
-        "periodically_resetting": True,
-        "source": "sensor.energy",
-        "tariffs": ["peak", "offpeak"],
-    }
-
-    source_config_entry = MockConfigEntry()
-    source_config_entry.add_to_hass(hass)
-    utility_meter_config_entry = MockConfigEntry(
-        data={},
-        domain=DOMAIN,
-        options=config_entry_config,
-        title=config_entry_config["name"],
-    )
-
-    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()
-
-    state = hass.states.get("select.energy_bill")
-    assert state is not None
-    assert state.attributes.get("friendly_name") == "Energy bill"
-
-
-async def test_select_entity_name_yaml(
-    hass: HomeAssistant,
-) -> None:
-    """Test for Utility Meter select platform."""
-
-    yaml_config = {
-        "utility_meter": {
-            "energy_bill": {
-                "name": "Energy bill",
-                "source": "sensor.energy",
-                "tariffs": ["peak", "offpeak"],
-                "unique_id": "1234abcd",
-            }
-        }
-    }
-
-    assert await async_setup_component(hass, DOMAIN, yaml_config)
-
-    await hass.async_block_till_done()
-
-    state = hass.states.get("select.energy_bill")
-    assert state is not None
-    assert state.attributes.get("friendly_name") == "Energy bill"
-
-
 async def test_device_id(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py
index 0ab78739f7f..745bf0ce012 100644
--- a/tests/components/utility_meter/test_sensor.py
+++ b/tests/components/utility_meter/test_sensor.py
@@ -26,6 +26,7 @@ from homeassistant.components.utility_meter.const import (
 )
 from homeassistant.components.utility_meter.sensor import (
     ATTR_LAST_RESET,
+    ATTR_LAST_VALID_STATE,
     ATTR_STATUS,
     COLLECTING,
     PAUSED,
@@ -759,6 +760,64 @@ async def test_restore_state(
                     "status": "paused",
                 },
             ),
+            # sensor.energy_bill_tariff2 has missing keys and falls back to
+            # saved state
+            (
+                State(
+                    "sensor.energy_bill_tariff2",
+                    "2.1",
+                    attributes={
+                        ATTR_STATUS: PAUSED,
+                        ATTR_LAST_RESET: last_reset_1,
+                        ATTR_LAST_VALID_STATE: None,
+                        ATTR_UNIT_OF_MEASUREMENT: UnitOfEnergy.MEGA_WATT_HOUR,
+                    },
+                ),
+                {
+                    "native_value": {
+                        "__type": "<class 'decimal.Decimal'>",
+                        "decimal_str": "2.2",
+                    },
+                    "native_unit_of_measurement": "kWh",
+                    "last_valid_state": "None",
+                },
+            ),
+            # sensor.energy_bill_tariff3 has invalid data and falls back to
+            # saved state
+            (
+                State(
+                    "sensor.energy_bill_tariff3",
+                    "3.1",
+                    attributes={
+                        ATTR_STATUS: COLLECTING,
+                        ATTR_LAST_RESET: last_reset_1,
+                        ATTR_LAST_VALID_STATE: None,
+                        ATTR_UNIT_OF_MEASUREMENT: UnitOfEnergy.MEGA_WATT_HOUR,
+                    },
+                ),
+                {
+                    "native_value": {
+                        "__type": "<class 'decimal.Decimal'>",
+                        "decimal_str": "3f",  # Invalid
+                    },
+                    "native_unit_of_measurement": "kWh",
+                    "last_valid_state": "None",
+                },
+            ),
+            # No extra saved data, fall back to saved state
+            (
+                State(
+                    "sensor.energy_bill_tariff4",
+                    "error",
+                    attributes={
+                        ATTR_STATUS: COLLECTING,
+                        ATTR_LAST_RESET: last_reset_1,
+                        ATTR_LAST_VALID_STATE: None,
+                        ATTR_UNIT_OF_MEASUREMENT: UnitOfEnergy.MEGA_WATT_HOUR,
+                    },
+                ),
+                {},
+            ),
         ],
     )
 
@@ -793,6 +852,25 @@ async def test_restore_state(
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
 
+    state = hass.states.get("sensor.energy_bill_tariff2")
+    assert state.state == "2.1"
+    assert state.attributes.get("status") == PAUSED
+    assert state.attributes.get("last_reset") == last_reset_1
+    assert state.attributes.get("last_valid_state") == "None"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.MEGA_WATT_HOUR
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
+
+    state = hass.states.get("sensor.energy_bill_tariff3")
+    assert state.state == "3.1"
+    assert state.attributes.get("status") == COLLECTING
+    assert state.attributes.get("last_reset") == last_reset_1
+    assert state.attributes.get("last_valid_state") == "None"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.MEGA_WATT_HOUR
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
+
+    state = hass.states.get("sensor.energy_bill_tariff4")
+    assert state.state == STATE_UNKNOWN
+
     # utility_meter is loaded, now set sensors according to utility_meter:
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
@@ -804,7 +882,12 @@ async def test_restore_state(
     state = hass.states.get("sensor.energy_bill_tariff0")
     assert state.attributes.get("status") == COLLECTING
 
-    for entity_id in ("sensor.energy_bill_tariff1",):
+    for entity_id in (
+        "sensor.energy_bill_tariff1",
+        "sensor.energy_bill_tariff2",
+        "sensor.energy_bill_tariff3",
+        "sensor.energy_bill_tariff4",
+    ):
         state = hass.states.get(entity_id)
         assert state.attributes.get("status") == PAUSED
 
@@ -856,18 +939,7 @@ async def test_service_reset_no_tariffs(
                         ATTR_LAST_RESET: last_reset,
                     },
                 ),
-                {
-                    "native_value": {
-                        "__type": "<class 'decimal.Decimal'>",
-                        "decimal_str": "3",
-                    },
-                    "native_unit_of_measurement": "kWh",
-                    "last_reset": last_reset,
-                    "last_period": "0",
-                    "last_valid_state": None,
-                    "status": "collecting",
-                    "input_device_class": "energy",
-                },
+                {},
             ),
         ],
     )
@@ -973,33 +1045,21 @@ async def test_service_reset_no_tariffs_correct_with_multi(
                 State(
                     "sensor.energy_bill",
                     "3",
-                ),
-                {
-                    "native_value": {
-                        "__type": "<class 'decimal.Decimal'>",
-                        "decimal_str": "3",
+                    attributes={
+                        ATTR_LAST_RESET: last_reset,
                     },
-                    "native_unit_of_measurement": "kWh",
-                    "last_reset": last_reset,
-                    "last_period": "0",
-                    "status": "collecting",
-                },
+                ),
+                {},
             ),
             (
                 State(
                     "sensor.water_bill",
                     "6",
-                ),
-                {
-                    "native_value": {
-                        "__type": "<class 'decimal.Decimal'>",
-                        "decimal_str": "6",
+                    attributes={
+                        ATTR_LAST_RESET: last_reset,
                     },
-                    "native_unit_of_measurement": "kWh",
-                    "last_reset": last_reset,
-                    "last_period": "0",
-                    "status": "collecting",
-                },
+                ),
+                {},
             ),
         ],
     )
@@ -1744,26 +1804,6 @@ async def test_self_reset_hourly_dst(hass: HomeAssistant) -> None:
     )
 
 
-async def test_self_reset_hourly_dst2(hass: HomeAssistant) -> None:
-    """Test weekly reset of meter in DST change conditions."""
-
-    hass.config.time_zone = "Europe/Berlin"
-    dt_util.set_default_time_zone(dt_util.get_time_zone(hass.config.time_zone))
-    await _test_self_reset(
-        hass, gen_config("daily"), "2024-10-26T23:59:00.000000+02:00"
-    )
-
-    state = hass.states.get("sensor.energy_bill")
-    last_reset = dt_util.parse_datetime("2024-10-27T00:00:00.000000+02:00")
-    assert (
-        dt_util.as_local(dt_util.parse_datetime(state.attributes.get("last_reset")))
-        == last_reset
-    )
-
-    next_reset = dt_util.parse_datetime("2024-10-28T00:00:00.000000+01:00").isoformat()
-    assert state.attributes.get("next_reset") == next_reset
-
-
 async def test_self_reset_daily(hass: HomeAssistant) -> None:
     """Test daily reset of meter."""
     await _test_self_reset(
diff --git a/tests/components/vesync/snapshots/test_fan.ambr b/tests/components/vesync/snapshots/test_fan.ambr
index 60af4ae3d5b..21985afd7bf 100644
--- a/tests/components/vesync/snapshots/test_fan.ambr
+++ b/tests/components/vesync/snapshots/test_fan.ambr
@@ -67,7 +67,7 @@
       'platform': 'vesync',
       'previous_unique_id': None,
       'supported_features': <FanEntityFeature: 57>,
-      'translation_key': 'vesync',
+      'translation_key': None,
       'unique_id': 'air-purifier',
       'unit_of_measurement': None,
     }),
@@ -158,7 +158,7 @@
       'platform': 'vesync',
       'previous_unique_id': None,
       'supported_features': <FanEntityFeature: 57>,
-      'translation_key': 'vesync',
+      'translation_key': None,
       'unique_id': 'asd_sdfKIHG7IJHGwJGJ7GJ_ag5h3G55',
       'unit_of_measurement': None,
     }),
@@ -256,7 +256,7 @@
       'platform': 'vesync',
       'previous_unique_id': None,
       'supported_features': <FanEntityFeature: 57>,
-      'translation_key': 'vesync',
+      'translation_key': None,
       'unique_id': '400s-purifier',
       'unit_of_measurement': None,
     }),
@@ -355,7 +355,7 @@
       'platform': 'vesync',
       'previous_unique_id': None,
       'supported_features': <FanEntityFeature: 57>,
-      'translation_key': 'vesync',
+      'translation_key': None,
       'unique_id': '600s-purifier',
       'unit_of_measurement': None,
     }),
diff --git a/tests/components/vlc_telnet/test_config_flow.py b/tests/components/vlc_telnet/test_config_flow.py
index a4b559bbe1b..d29a2c06beb 100644
--- a/tests/components/vlc_telnet/test_config_flow.py
+++ b/tests/components/vlc_telnet/test_config_flow.py
@@ -9,10 +9,10 @@ from aiovlc.exceptions import AuthError, ConnectError
 import pytest
 
 from homeassistant import config_entries
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.components.vlc_telnet.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from tests.common import MockConfigEntry
 
diff --git a/tests/components/webhook/test_init.py b/tests/components/webhook/test_init.py
index 15ec1b15ee5..af07616024a 100644
--- a/tests/components/webhook/test_init.py
+++ b/tests/components/webhook/test_init.py
@@ -9,8 +9,8 @@ from aiohttp.test_utils import TestClient
 import pytest
 
 from homeassistant.components import webhook
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.setup import async_setup_component
 
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
diff --git a/tests/components/webmin/test_sensor.py b/tests/components/webmin/test_sensor.py
index dd68e2f9f8c..5fb874825a3 100644
--- a/tests/components/webmin/test_sensor.py
+++ b/tests/components/webmin/test_sensor.py
@@ -8,8 +8,6 @@ from homeassistant.helpers import entity_registry as er
 
 from .conftest import async_init_integration
 
-from tests.common import snapshot_platform
-
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_sensor(
@@ -21,4 +19,11 @@ async def test_sensor(
 
     entry = await async_init_integration(hass)
 
-    await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id)
+    entity_entries = er.async_entries_for_config_entry(entity_registry, entry.entry_id)
+
+    assert entity_entries
+
+    for entity_entry in entity_entries:
+        assert entity_entry == snapshot(name=f"{entity_entry.entity_id}-entry")
+        assert (state := hass.states.get(entity_entry.entity_id))
+        assert state == snapshot(name=f"{entity_entry.entity_id}-state")
diff --git a/tests/components/websocket_api/test_auth.py b/tests/components/websocket_api/test_auth.py
index d55d2f97017..20a728cf3cd 100644
--- a/tests/components/websocket_api/test_auth.py
+++ b/tests/components/websocket_api/test_auth.py
@@ -293,6 +293,6 @@ async def test_auth_sending_unknown_type_disconnects(
         auth_msg = await ws.receive_json()
         assert auth_msg["type"] == TYPE_AUTH_REQUIRED
 
-        await ws._writer.send_frame(b"1" * 130, 0x30)
+        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_http.py b/tests/components/websocket_api/test_http.py
index 03e30c11ee9..2530d885942 100644
--- a/tests/components/websocket_api/test_http.py
+++ b/tests/components/websocket_api/test_http.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 from typing import Any, cast
 from unittest.mock import patch
 
-from aiohttp import ServerDisconnectedError, WSMsgType, web
+from aiohttp import WSMsgType, WSServerHandshakeError, web
 import pytest
 
 from homeassistant.components.websocket_api import (
@@ -374,7 +374,7 @@ async def test_prepare_fail_timeout(
             "homeassistant.components.websocket_api.http.web.WebSocketResponse.prepare",
             side_effect=(TimeoutError, web.WebSocketResponse.prepare),
         ),
-        pytest.raises(ServerDisconnectedError),
+        pytest.raises(WSServerHandshakeError),
     ):
         await hass_ws_client(hass)
 
@@ -392,7 +392,7 @@ async def test_prepare_fail_connection_reset(
             "homeassistant.components.websocket_api.http.web.WebSocketResponse.prepare",
             side_effect=(ConnectionResetError, web.WebSocketResponse.prepare),
         ),
-        pytest.raises(ServerDisconnectedError),
+        pytest.raises(WSServerHandshakeError),
     ):
         await hass_ws_client(hass)
 
diff --git a/tests/components/withings/__init__.py b/tests/components/withings/__init__.py
index 127bccbeb00..8469a5a462a 100644
--- a/tests/components/withings/__init__.py
+++ b/tests/components/withings/__init__.py
@@ -10,8 +10,8 @@ from aiowithings import Activity, Device, Goals, MeasurementGroup, SleepSummary,
 from freezegun.api import FrozenDateTimeFactory
 
 from homeassistant.components.webhook import async_generate_url
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/wmspro/conftest.py b/tests/components/wmspro/conftest.py
index 4b0e7eb4fef..0e0b31b0117 100644
--- a/tests/components/wmspro/conftest.py
+++ b/tests/components/wmspro/conftest.py
@@ -82,18 +82,6 @@ def mock_hub_status_prod_awning() -> Generator[AsyncMock]:
         yield mock_dest_refresh
 
 
-@pytest.fixture
-def mock_hub_status_prod_dimmer() -> Generator[AsyncMock]:
-    """Override WebControlPro._getStatus."""
-    with patch(
-        "wmspro.webcontrol.WebControlPro._getStatus",
-        return_value=load_json_object_fixture(
-            "example_status_prod_dimmer.json", DOMAIN
-        ),
-    ) as mock_dest_refresh:
-        yield mock_dest_refresh
-
-
 @pytest.fixture
 def mock_dest_refresh() -> Generator[AsyncMock]:
     """Override Destination.refresh."""
diff --git a/tests/components/wmspro/fixtures/example_status_prod_dimmer.json b/tests/components/wmspro/fixtures/example_status_prod_dimmer.json
deleted file mode 100644
index 675549f2457..00000000000
--- a/tests/components/wmspro/fixtures/example_status_prod_dimmer.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "command": "getStatus",
-  "protocolVersion": "1.0.0",
-  "details": [
-    {
-      "destinationId": 97358,
-      "data": {
-        "drivingCause": 0,
-        "heartbeatError": false,
-        "blocking": false,
-        "productData": [
-          {
-            "actionId": 0,
-            "value": {
-              "percentage": 0
-            }
-          },
-          {
-            "actionId": 20,
-            "value": {
-              "onOffState": false
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/tests/components/wmspro/snapshots/test_cover.ambr b/tests/components/wmspro/snapshots/test_cover.ambr
index 0456f074d49..21042789c16 100644
--- a/tests/components/wmspro/snapshots/test_cover.ambr
+++ b/tests/components/wmspro/snapshots/test_cover.ambr
@@ -35,7 +35,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by WMS WebControl pro API',
-      'current_position': 0,
+      'current_position': 100,
       'device_class': 'awning',
       'friendly_name': 'Markise',
       'supported_features': <CoverEntityFeature: 15>,
@@ -45,6 +45,6 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': 'closed',
+    'state': 'open',
   })
 # ---
diff --git a/tests/components/wmspro/snapshots/test_light.ambr b/tests/components/wmspro/snapshots/test_light.ambr
deleted file mode 100644
index d13e444645d..00000000000
--- a/tests/components/wmspro/snapshots/test_light.ambr
+++ /dev/null
@@ -1,53 +0,0 @@
-# serializer version: 1
-# name: test_light_device
-  DeviceRegistryEntrySnapshot({
-    'area_id': 'terrasse',
-    'config_entries': <ANY>,
-    'configuration_url': 'http://webcontrol/control',
-    'connections': set({
-    }),
-    'disabled_by': None,
-    'entry_type': None,
-    'hw_version': None,
-    'id': <ANY>,
-    'identifiers': set({
-      tuple(
-        'wmspro',
-        '97358',
-      ),
-    }),
-    'is_new': False,
-    'labels': set({
-    }),
-    'manufacturer': 'WAREMA Renkhoff SE',
-    'model': 'Dimmer',
-    'model_id': None,
-    'name': 'Licht',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': '97358',
-    'suggested_area': 'Terrasse',
-    'sw_version': None,
-    'via_device_id': <ANY>,
-  })
-# ---
-# name: test_light_update
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'attribution': 'Data provided by WMS WebControl pro API',
-      'brightness': None,
-      'color_mode': None,
-      'friendly_name': 'Licht',
-      'supported_color_modes': list([
-        <ColorMode.BRIGHTNESS: 'brightness'>,
-      ]),
-      'supported_features': <LightEntityFeature: 0>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'light.licht',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
diff --git a/tests/components/wmspro/test_config_flow.py b/tests/components/wmspro/test_config_flow.py
index 782dc051c8c..c25641a8979 100644
--- a/tests/components/wmspro/test_config_flow.py
+++ b/tests/components/wmspro/test_config_flow.py
@@ -6,19 +6,13 @@ import aiohttp
 
 from homeassistant.components.dhcp import DhcpServiceInfo
 from homeassistant.components.wmspro.const import DOMAIN
-from homeassistant.config_entries import SOURCE_DHCP, SOURCE_USER, ConfigEntryState
+from homeassistant.config_entries import SOURCE_DHCP, SOURCE_USER
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-from . import setup_config_entry
 
-from tests.common import MockConfigEntry
-
-
-async def test_config_flow(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_hub_refresh: AsyncMock
-) -> None:
+async def test_config_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
     """Test we can handle user-input to create a config entry."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_USER}
@@ -46,7 +40,7 @@ async def test_config_flow(
 
 
 async def test_config_flow_from_dhcp(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_hub_refresh: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
 ) -> None:
     """Test we can handle DHCP discovery to create a config entry."""
     info = DhcpServiceInfo(
@@ -80,7 +74,6 @@ async def test_config_flow_from_dhcp(
 async def test_config_flow_from_dhcp_add_mac(
     hass: HomeAssistant,
     mock_setup_entry: AsyncMock,
-    mock_hub_refresh: AsyncMock,
 ) -> None:
     """Test we can use DHCP discovery to add MAC address to a config entry."""
     result = await hass.config_entries.flow.async_init(
@@ -122,7 +115,6 @@ async def test_config_flow_from_dhcp_add_mac(
 async def test_config_flow_from_dhcp_ip_update(
     hass: HomeAssistant,
     mock_setup_entry: AsyncMock,
-    mock_hub_refresh: AsyncMock,
 ) -> None:
     """Test we can use DHCP discovery to update IP in a config entry."""
     info = DhcpServiceInfo(
@@ -168,7 +160,6 @@ async def test_config_flow_from_dhcp_ip_update(
 async def test_config_flow_from_dhcp_no_update(
     hass: HomeAssistant,
     mock_setup_entry: AsyncMock,
-    mock_hub_refresh: AsyncMock,
 ) -> None:
     """Test we do not use DHCP discovery to overwrite hostname with IP in config entry."""
     info = DhcpServiceInfo(
@@ -212,7 +203,7 @@ async def test_config_flow_from_dhcp_no_update(
 
 
 async def test_config_flow_ping_failed(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_hub_refresh: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
 ) -> None:
     """Test we handle ping failed error."""
     result = await hass.config_entries.flow.async_init(
@@ -253,7 +244,7 @@ async def test_config_flow_ping_failed(
 
 
 async def test_config_flow_cannot_connect(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_hub_refresh: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
 ) -> None:
     """Test we handle cannot connect error."""
     result = await hass.config_entries.flow.async_init(
@@ -294,7 +285,7 @@ async def test_config_flow_cannot_connect(
 
 
 async def test_config_flow_unknown_error(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, mock_hub_refresh: AsyncMock
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
 ) -> None:
     """Test we handle an unknown error."""
     result = await hass.config_entries.flow.async_init(
@@ -332,63 +323,3 @@ async def test_config_flow_unknown_error(
         CONF_HOST: "1.2.3.4",
     }
     assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_config_flow_duplicate_entries(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_hub_ping: AsyncMock,
-    mock_dest_refresh: AsyncMock,
-    mock_hub_configuration_test: AsyncMock,
-) -> None:
-    """Test we prevent creation of duplicate config entries."""
-    await setup_config_entry(hass, mock_config_entry)
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {
-            CONF_HOST: "5.6.7.8",
-        },
-    )
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
-
-
-async def test_config_flow_multiple_entries(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_hub_ping: AsyncMock,
-    mock_dest_refresh: AsyncMock,
-    mock_hub_configuration_test: AsyncMock,
-    mock_hub_configuration_prod: AsyncMock,
-) -> None:
-    """Test we allow creation of different config entries."""
-    await setup_config_entry(hass, mock_config_entry)
-    assert mock_config_entry.state is ConfigEntryState.LOADED
-
-    mock_hub_configuration_prod.return_value = mock_hub_configuration_test.return_value
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-
-    result = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        {
-            CONF_HOST: "5.6.7.8",
-        },
-    )
-
-    assert result["type"] is FlowResultType.CREATE_ENTRY
-    assert result["title"] == "5.6.7.8"
-    assert result["data"] == {
-        CONF_HOST: "5.6.7.8",
-    }
-    assert len(hass.config_entries.async_entries(DOMAIN)) == 2
diff --git a/tests/components/wmspro/test_cover.py b/tests/components/wmspro/test_cover.py
index 2c20ef51b64..83662e6b728 100644
--- a/tests/components/wmspro/test_cover.py
+++ b/tests/components/wmspro/test_cover.py
@@ -2,27 +2,24 @@
 
 from unittest.mock import AsyncMock, patch
 
-from freezegun.api import FrozenDateTimeFactory
 from syrupy import SnapshotAssertion
 
 from homeassistant.components.wmspro.const import DOMAIN
-from homeassistant.components.wmspro.cover import SCAN_INTERVAL
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_CLOSE_COVER,
     SERVICE_OPEN_COVER,
     SERVICE_SET_COVER_POSITION,
     SERVICE_STOP_COVER,
-    STATE_CLOSED,
-    STATE_OPEN,
     Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
+from homeassistant.setup import async_setup_component
 
 from . import setup_config_entry
 
-from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.common import MockConfigEntry
 
 
 async def test_cover_device(
@@ -51,7 +48,6 @@ async def test_cover_update(
     mock_hub_ping: AsyncMock,
     mock_hub_configuration_prod: AsyncMock,
     mock_hub_status_prod_awning: AsyncMock,
-    freezer: FrozenDateTimeFactory,
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test that a cover entity is created and updated correctly."""
@@ -64,15 +60,18 @@ async def test_cover_update(
     assert entity is not None
     assert entity == snapshot
 
-    # Move time to next update
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done(wait_background_tasks=True)
+    await async_setup_component(hass, "homeassistant", {})
+    await hass.services.async_call(
+        "homeassistant",
+        "update_entity",
+        {ATTR_ENTITY_ID: entity.entity_id},
+        blocking=True,
+    )
 
-    assert len(mock_hub_status_prod_awning.mock_calls) >= 3
+    assert len(mock_hub_status_prod_awning.mock_calls) == 3
 
 
-async def test_cover_open_and_close(
+async def test_cover_close_and_open(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_hub_ping: AsyncMock,
@@ -88,27 +87,8 @@ async def test_cover_open_and_close(
 
     entity = hass.states.get("cover.markise")
     assert entity is not None
-    assert entity.state == STATE_CLOSED
-    assert entity.attributes["current_position"] == 0
-
-    with patch(
-        "wmspro.destination.Destination.refresh",
-        return_value=True,
-    ):
-        before = len(mock_hub_status_prod_awning.mock_calls)
-
-        await hass.services.async_call(
-            Platform.COVER,
-            SERVICE_OPEN_COVER,
-            {ATTR_ENTITY_ID: entity.entity_id},
-            blocking=True,
-        )
-
-        entity = hass.states.get("cover.markise")
-        assert entity is not None
-        assert entity.state == STATE_OPEN
-        assert entity.attributes["current_position"] == 100
-        assert len(mock_hub_status_prod_awning.mock_calls) == before
+    assert entity.state == "open"
+    assert entity.attributes["current_position"] == 100
 
     with patch(
         "wmspro.destination.Destination.refresh",
@@ -125,12 +105,31 @@ async def test_cover_open_and_close(
 
         entity = hass.states.get("cover.markise")
         assert entity is not None
-        assert entity.state == STATE_CLOSED
+        assert entity.state == "closed"
         assert entity.attributes["current_position"] == 0
         assert len(mock_hub_status_prod_awning.mock_calls) == before
 
+    with patch(
+        "wmspro.destination.Destination.refresh",
+        return_value=True,
+    ):
+        before = len(mock_hub_status_prod_awning.mock_calls)
 
-async def test_cover_open_to_pos(
+        await hass.services.async_call(
+            Platform.COVER,
+            SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: entity.entity_id},
+            blocking=True,
+        )
+
+        entity = hass.states.get("cover.markise")
+        assert entity is not None
+        assert entity.state == "open"
+        assert entity.attributes["current_position"] == 100
+        assert len(mock_hub_status_prod_awning.mock_calls) == before
+
+
+async def test_cover_move(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_hub_ping: AsyncMock,
@@ -138,7 +137,7 @@ async def test_cover_open_to_pos(
     mock_hub_status_prod_awning: AsyncMock,
     mock_action_call: AsyncMock,
 ) -> None:
-    """Test that a cover entity is opened to correct position."""
+    """Test that a cover entity is moved and closed correctly."""
     assert await setup_config_entry(hass, mock_config_entry)
     assert len(mock_hub_ping.mock_calls) == 1
     assert len(mock_hub_configuration_prod.mock_calls) == 1
@@ -146,8 +145,8 @@ async def test_cover_open_to_pos(
 
     entity = hass.states.get("cover.markise")
     assert entity is not None
-    assert entity.state == STATE_CLOSED
-    assert entity.attributes["current_position"] == 0
+    assert entity.state == "open"
+    assert entity.attributes["current_position"] == 100
 
     with patch(
         "wmspro.destination.Destination.refresh",
@@ -164,12 +163,12 @@ async def test_cover_open_to_pos(
 
         entity = hass.states.get("cover.markise")
         assert entity is not None
-        assert entity.state == STATE_OPEN
+        assert entity.state == "open"
         assert entity.attributes["current_position"] == 50
         assert len(mock_hub_status_prod_awning.mock_calls) == before
 
 
-async def test_cover_open_and_stop(
+async def test_cover_move_and_stop(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
     mock_hub_ping: AsyncMock,
@@ -177,7 +176,7 @@ async def test_cover_open_and_stop(
     mock_hub_status_prod_awning: AsyncMock,
     mock_action_call: AsyncMock,
 ) -> None:
-    """Test that a cover entity is opened and stopped correctly."""
+    """Test that a cover entity is moved and closed correctly."""
     assert await setup_config_entry(hass, mock_config_entry)
     assert len(mock_hub_ping.mock_calls) == 1
     assert len(mock_hub_configuration_prod.mock_calls) == 1
@@ -185,8 +184,8 @@ async def test_cover_open_and_stop(
 
     entity = hass.states.get("cover.markise")
     assert entity is not None
-    assert entity.state == STATE_CLOSED
-    assert entity.attributes["current_position"] == 0
+    assert entity.state == "open"
+    assert entity.attributes["current_position"] == 100
 
     with patch(
         "wmspro.destination.Destination.refresh",
@@ -203,7 +202,7 @@ async def test_cover_open_and_stop(
 
         entity = hass.states.get("cover.markise")
         assert entity is not None
-        assert entity.state == STATE_OPEN
+        assert entity.state == "open"
         assert entity.attributes["current_position"] == 80
         assert len(mock_hub_status_prod_awning.mock_calls) == before
 
@@ -222,6 +221,6 @@ async def test_cover_open_and_stop(
 
         entity = hass.states.get("cover.markise")
         assert entity is not None
-        assert entity.state == STATE_OPEN
+        assert entity.state == "open"
         assert entity.attributes["current_position"] == 80
         assert len(mock_hub_status_prod_awning.mock_calls) == before
diff --git a/tests/components/wmspro/test_light.py b/tests/components/wmspro/test_light.py
deleted file mode 100644
index db53b54a2f6..00000000000
--- a/tests/components/wmspro/test_light.py
+++ /dev/null
@@ -1,206 +0,0 @@
-"""Test the wmspro light support."""
-
-from unittest.mock import AsyncMock, patch
-
-from freezegun.api import FrozenDateTimeFactory
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.light import ATTR_BRIGHTNESS
-from homeassistant.components.wmspro.const import DOMAIN
-from homeassistant.components.wmspro.light import SCAN_INTERVAL
-from homeassistant.const import (
-    ATTR_ENTITY_ID,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-    STATE_OFF,
-    STATE_ON,
-    Platform,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from . import setup_config_entry
-
-from tests.common import MockConfigEntry, async_fire_time_changed
-
-
-async def test_light_device(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_hub_ping: AsyncMock,
-    mock_hub_configuration_prod: AsyncMock,
-    mock_hub_status_prod_dimmer: AsyncMock,
-    device_registry: dr.DeviceRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test that a light device is created correctly."""
-    assert await setup_config_entry(hass, mock_config_entry)
-    assert len(mock_hub_ping.mock_calls) == 1
-    assert len(mock_hub_configuration_prod.mock_calls) == 1
-    assert len(mock_hub_status_prod_dimmer.mock_calls) == 2
-
-    device_entry = device_registry.async_get_device(identifiers={(DOMAIN, "97358")})
-    assert device_entry is not None
-    assert device_entry == snapshot
-
-
-async def test_light_update(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_hub_ping: AsyncMock,
-    mock_hub_configuration_prod: AsyncMock,
-    mock_hub_status_prod_dimmer: AsyncMock,
-    freezer: FrozenDateTimeFactory,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test that a light entity is created and updated correctly."""
-    assert await setup_config_entry(hass, mock_config_entry)
-    assert len(mock_hub_ping.mock_calls) == 1
-    assert len(mock_hub_configuration_prod.mock_calls) == 1
-    assert len(mock_hub_status_prod_dimmer.mock_calls) == 2
-
-    entity = hass.states.get("light.licht")
-    assert entity is not None
-    assert entity == snapshot
-
-    # Move time to next update
-    freezer.tick(SCAN_INTERVAL)
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    assert len(mock_hub_status_prod_dimmer.mock_calls) >= 3
-
-
-async def test_light_turn_on_and_off(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_hub_ping: AsyncMock,
-    mock_hub_configuration_prod: AsyncMock,
-    mock_hub_status_prod_dimmer: AsyncMock,
-    mock_action_call: AsyncMock,
-) -> None:
-    """Test that a light entity is turned on and off correctly."""
-    assert await setup_config_entry(hass, mock_config_entry)
-    assert len(mock_hub_ping.mock_calls) == 1
-    assert len(mock_hub_configuration_prod.mock_calls) == 1
-    assert len(mock_hub_status_prod_dimmer.mock_calls) >= 1
-
-    entity = hass.states.get("light.licht")
-    assert entity is not None
-    assert entity.state == STATE_OFF
-    assert entity.attributes[ATTR_BRIGHTNESS] is None
-
-    with patch(
-        "wmspro.destination.Destination.refresh",
-        return_value=True,
-    ):
-        before = len(mock_hub_status_prod_dimmer.mock_calls)
-
-        await hass.services.async_call(
-            Platform.LIGHT,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: entity.entity_id},
-            blocking=True,
-        )
-
-        entity = hass.states.get("light.licht")
-        assert entity is not None
-        assert entity.state == STATE_ON
-        assert entity.attributes[ATTR_BRIGHTNESS] >= 1
-        assert len(mock_hub_status_prod_dimmer.mock_calls) == before
-
-    with patch(
-        "wmspro.destination.Destination.refresh",
-        return_value=True,
-    ):
-        before = len(mock_hub_status_prod_dimmer.mock_calls)
-
-        await hass.services.async_call(
-            Platform.LIGHT,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: entity.entity_id},
-            blocking=True,
-        )
-
-        entity = hass.states.get("light.licht")
-        assert entity is not None
-        assert entity.state == STATE_OFF
-        assert entity.attributes[ATTR_BRIGHTNESS] is None
-        assert len(mock_hub_status_prod_dimmer.mock_calls) == before
-
-
-async def test_light_dimm_on_and_off(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_hub_ping: AsyncMock,
-    mock_hub_configuration_prod: AsyncMock,
-    mock_hub_status_prod_dimmer: AsyncMock,
-    mock_action_call: AsyncMock,
-) -> None:
-    """Test that a light entity is dimmed on and off correctly."""
-    assert await setup_config_entry(hass, mock_config_entry)
-    assert len(mock_hub_ping.mock_calls) == 1
-    assert len(mock_hub_configuration_prod.mock_calls) == 1
-    assert len(mock_hub_status_prod_dimmer.mock_calls) >= 1
-
-    entity = hass.states.get("light.licht")
-    assert entity is not None
-    assert entity.state == STATE_OFF
-    assert entity.attributes[ATTR_BRIGHTNESS] is None
-
-    with patch(
-        "wmspro.destination.Destination.refresh",
-        return_value=True,
-    ):
-        before = len(mock_hub_status_prod_dimmer.mock_calls)
-
-        await hass.services.async_call(
-            Platform.LIGHT,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: entity.entity_id},
-            blocking=True,
-        )
-
-        entity = hass.states.get("light.licht")
-        assert entity is not None
-        assert entity.state == STATE_ON
-        assert entity.attributes[ATTR_BRIGHTNESS] >= 1
-        assert len(mock_hub_status_prod_dimmer.mock_calls) == before
-
-    with patch(
-        "wmspro.destination.Destination.refresh",
-        return_value=True,
-    ):
-        before = len(mock_hub_status_prod_dimmer.mock_calls)
-
-        await hass.services.async_call(
-            Platform.LIGHT,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: entity.entity_id, ATTR_BRIGHTNESS: 128},
-            blocking=True,
-        )
-
-        entity = hass.states.get("light.licht")
-        assert entity is not None
-        assert entity.state == STATE_ON
-        assert entity.attributes[ATTR_BRIGHTNESS] == 128
-        assert len(mock_hub_status_prod_dimmer.mock_calls) == before
-
-    with patch(
-        "wmspro.destination.Destination.refresh",
-        return_value=True,
-    ):
-        before = len(mock_hub_status_prod_dimmer.mock_calls)
-
-        await hass.services.async_call(
-            Platform.LIGHT,
-            SERVICE_TURN_OFF,
-            {ATTR_ENTITY_ID: entity.entity_id},
-            blocking=True,
-        )
-
-        entity = hass.states.get("light.licht")
-        assert entity is not None
-        assert entity.state == STATE_OFF
-        assert entity.attributes[ATTR_BRIGHTNESS] is None
-        assert len(mock_hub_status_prod_dimmer.mock_calls) == before
diff --git a/tests/components/wyoming/test_config_flow.py b/tests/components/wyoming/test_config_flow.py
index 6bca226d621..e363a0650bc 100644
--- a/tests/components/wyoming/test_config_flow.py
+++ b/tests/components/wyoming/test_config_flow.py
@@ -8,11 +8,11 @@ from syrupy.assertion import SnapshotAssertion
 from wyoming.info import Info
 
 from homeassistant import config_entries
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.components.wyoming.const import DOMAIN
 from homeassistant.components.zeroconf import ZeroconfServiceInfo
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from . import EMPTY_INFO, SATELLITE_INFO, STT_INFO, TTS_INFO
 
diff --git a/tests/components/xiaomi_ble/test_config_flow.py b/tests/components/xiaomi_ble/test_config_flow.py
index e25ac939a53..f690665608b 100644
--- a/tests/components/xiaomi_ble/test_config_flow.py
+++ b/tests/components/xiaomi_ble/test_config_flow.py
@@ -2,12 +2,7 @@
 
 from unittest.mock import patch
 
-from xiaomi_ble import (
-    XiaomiBluetoothDeviceData as DeviceData,
-    XiaomiCloudBLEDevice,
-    XiaomiCloudException,
-    XiaomiCloudInvalidAuthenticationException,
-)
+from xiaomi_ble import XiaomiBluetoothDeviceData as DeviceData
 
 from homeassistant import config_entries
 from homeassistant.components.bluetooth import BluetoothChange
@@ -101,25 +96,20 @@ async def test_async_step_bluetooth_valid_device_but_missing_payload_then_full(
             context={"source": config_entries.SOURCE_BLUETOOTH},
             data=MISSING_PAYLOAD_ENCRYPTED,
         )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "get_encryption_key_4_5"
 
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "a115210eed7a88e50ad52662e732a9fb"},
         )
 
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["data"] == {"bindkey": "a115210eed7a88e50ad52662e732a9fb"}
-    assert result3["result"].unique_id == "A4:C1:38:56:53:84"
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["data"] == {"bindkey": "a115210eed7a88e50ad52662e732a9fb"}
+    assert result2["result"].unique_id == "A4:C1:38:56:53:84"
 
 
 async def test_async_step_bluetooth_during_onboarding(hass: HomeAssistant) -> None:
@@ -249,244 +239,21 @@ async def test_async_step_bluetooth_valid_device_v4_encryption(
         context={"source": config_entries.SOURCE_BLUETOOTH},
         data=JTYJGD03MI_SERVICE_INFO,
     )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "get_encryption_key_4_5"
 
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
         )
 
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result3["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result3["result"].unique_id == "54:EF:44:E3:9C:BC"
-
-
-async def test_bluetooth_discovery_device_v4_encryption_from_cloud(
-    hass: HomeAssistant,
-) -> None:
-    """Test discovery via bluetooth with a valid v4 device, with auth from cloud."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_BLUETOOTH},
-        data=JTYJGD03MI_SERVICE_INFO,
-    )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": "cloud_auth"},
-    )
-    device = XiaomiCloudBLEDevice(
-        name="x",
-        mac="54:EF:44:E3:9C:BC",
-        bindkey="5b51a7c91cde6707c9ef18dfda143a58",
-    )
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        return_value=device,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            user_input={"username": "x@x.x", "password": "x"},
-        )
-
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result3["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result3["result"].unique_id == "54:EF:44:E3:9C:BC"
-
-
-async def test_bluetooth_discovery_device_v4_encryption_from_cloud_wrong_key(
-    hass: HomeAssistant,
-) -> None:
-    """Test discovery via bluetooth with a valid v4 device, with wrong auth from cloud."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_BLUETOOTH},
-        data=JTYJGD03MI_SERVICE_INFO,
-    )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": "cloud_auth"},
-    )
-
-    device = XiaomiCloudBLEDevice(
-        name="x",
-        mac="54:EF:44:E3:9C:BC",
-        bindkey="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-    )
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        return_value=device,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            user_input={"username": "x@x.x", "password": "x"},
-        )
-
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "get_encryption_key_4_5"
-    assert result3["errors"]["bindkey"] == "decryption_failed"
-
-    # Verify we can fallback to manual key
-    with patch(
-        "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
-    ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
-            user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
-        )
-
-    assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result4["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result4["result"].unique_id == "54:EF:44:E3:9C:BC"
-
-
-async def test_bluetooth_discovery_incorrect_cloud_account(
-    hass: HomeAssistant,
-) -> None:
-    """Test discovery via bluetooth with incorrect cloud account."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_BLUETOOTH},
-        data=JTYJGD03MI_SERVICE_INFO,
-    )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": "cloud_auth"},
-    )
-
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        return_value=None,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            user_input={"username": "wrong@wrong.wrong", "password": "correct"},
-        )
-
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "cloud_auth"
-    assert result3["errors"]["base"] == "api_device_not_found"
-
-    device = XiaomiCloudBLEDevice(
-        name="x",
-        mac="54:EF:44:E3:9C:BC",
-        bindkey="5b51a7c91cde6707c9ef18dfda143a58",
-    )
-    # Verify we can try again with the correct account
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        return_value=device,
-    ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
-            user_input={"username": "correct@correct.correct", "password": "correct"},
-        )
-
-    assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result4["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result4["result"].unique_id == "54:EF:44:E3:9C:BC"
-
-
-async def test_bluetooth_discovery_incorrect_cloud_auth(
-    hass: HomeAssistant,
-) -> None:
-    """Test discovery via bluetooth with incorrect cloud auth."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_BLUETOOTH},
-        data=JTYJGD03MI_SERVICE_INFO,
-    )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": "cloud_auth"},
-    )
-
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        side_effect=XiaomiCloudInvalidAuthenticationException,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            user_input={"username": "x@x.x", "password": "wrong"},
-        )
-
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "cloud_auth"
-    assert result3["errors"]["base"] == "auth_failed"
-
-    device = XiaomiCloudBLEDevice(
-        name="x",
-        mac="54:EF:44:E3:9C:BC",
-        bindkey="5b51a7c91cde6707c9ef18dfda143a58",
-    )
-    # Verify we can try again with the correct password
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        return_value=device,
-    ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
-            user_input={"username": "x@x.x", "password": "correct"},
-        )
-
-    assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result4["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result4["result"].unique_id == "54:EF:44:E3:9C:BC"
-
-
-async def test_bluetooth_discovery_cloud_offline(
-    hass: HomeAssistant,
-) -> None:
-    """Test discovery via bluetooth when the cloud is offline."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_BLUETOOTH},
-        data=JTYJGD03MI_SERVICE_INFO,
-    )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result["flow_id"],
-        user_input={"next_step_id": "cloud_auth"},
-    )
-
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        side_effect=XiaomiCloudException,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            user_input={"username": "x@x.x", "password": "wrong"},
-        )
-
-    assert result3["type"] is FlowResultType.ABORT
-    assert result3["reason"] == "api_error"
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
+    assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
+    assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
 
 async def test_async_step_bluetooth_valid_device_v4_encryption_wrong_key(
@@ -498,36 +265,31 @@ async def test_async_step_bluetooth_valid_device_v4_encryption_wrong_key(
         context={"source": config_entries.SOURCE_BLUETOOTH},
         data=JTYJGD03MI_SERVICE_INFO,
     )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "get_encryption_key_4_5"
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
-
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
         user_input={"bindkey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
     )
 
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "get_encryption_key_4_5"
-    assert result3["errors"]["bindkey"] == "decryption_failed"
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "get_encryption_key_4_5"
+    assert result2["errors"]["bindkey"] == "decryption_failed"
 
     # Test can finish flow
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
         )
 
-    assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result4["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result4["result"].unique_id == "54:EF:44:E3:9C:BC"
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
+    assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
+    assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
 
 async def test_async_step_bluetooth_valid_device_v4_encryption_wrong_key_length(
@@ -539,36 +301,31 @@ async def test_async_step_bluetooth_valid_device_v4_encryption_wrong_key_length(
         context={"source": config_entries.SOURCE_BLUETOOTH},
         data=JTYJGD03MI_SERVICE_INFO,
     )
-    assert result["type"] is FlowResultType.MENU
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "get_encryption_key_4_5"
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
-
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
         user_input={"bindkey": "5b51a7c91cde6707c9ef18fda143a58"},
     )
 
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "get_encryption_key_4_5"
-    assert result3["errors"]["bindkey"] == "expected_32_characters"
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "get_encryption_key_4_5"
+    assert result2["errors"]["bindkey"] == "expected_32_characters"
 
     # Test can finish flow
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
         )
 
-    assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result4["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result4["result"].unique_id == "54:EF:44:E3:9C:BC"
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
+    assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
+    assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
 
 async def test_async_step_bluetooth_not_xiaomi(hass: HomeAssistant) -> None:
@@ -700,25 +457,20 @@ async def test_async_step_user_short_payload_then_full(hass: HomeAssistant) -> N
             result["flow_id"],
             user_input={"address": "A4:C1:38:56:53:84"},
         )
-    assert result1["type"] is FlowResultType.MENU
-    assert result1["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result1["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
+    assert result1["type"] is FlowResultType.FORM
+    assert result1["step_id"] == "get_encryption_key_4_5"
 
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "a115210eed7a88e50ad52662e732a9fb"},
         )
 
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Temperature/Humidity Sensor 5384 (LYWSD03MMC)"
-    assert result3["data"] == {"bindkey": "a115210eed7a88e50ad52662e732a9fb"}
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Temperature/Humidity Sensor 5384 (LYWSD03MMC)"
+    assert result2["data"] == {"bindkey": "a115210eed7a88e50ad52662e732a9fb"}
 
 
 async def test_async_step_user_with_found_devices_v4_encryption(
@@ -740,26 +492,21 @@ async def test_async_step_user_with_found_devices_v4_encryption(
         result["flow_id"],
         user_input={"address": "54:EF:44:E3:9C:BC"},
     )
-    assert result1["type"] is FlowResultType.MENU
-    assert result1["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result1["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
+    assert result1["type"] is FlowResultType.FORM
+    assert result1["step_id"] == "get_encryption_key_4_5"
 
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
         )
 
-    assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result3["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result3["result"].unique_id == "54:EF:44:E3:9C:BC"
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
+    assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
+    assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
 
 async def test_async_step_user_with_found_devices_v4_encryption_wrong_key(
@@ -783,36 +530,31 @@ async def test_async_step_user_with_found_devices_v4_encryption_wrong_key(
         result["flow_id"],
         user_input={"address": "54:EF:44:E3:9C:BC"},
     )
-    assert result1["type"] is FlowResultType.MENU
-    assert result1["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result1["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
+    assert result1["type"] is FlowResultType.FORM
+    assert result1["step_id"] == "get_encryption_key_4_5"
 
     # Try an incorrect key
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
         user_input={"bindkey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
     )
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "get_encryption_key_4_5"
-    assert result3["errors"]["bindkey"] == "decryption_failed"
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "get_encryption_key_4_5"
+    assert result2["errors"]["bindkey"] == "decryption_failed"
 
     # Check can still finish flow
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
         )
 
-    assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result4["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result4["result"].unique_id == "54:EF:44:E3:9C:BC"
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
+    assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
+    assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
 
 async def test_async_step_user_with_found_devices_v4_encryption_wrong_key_length(
@@ -836,38 +578,33 @@ async def test_async_step_user_with_found_devices_v4_encryption_wrong_key_length
         result["flow_id"],
         user_input={"address": "54:EF:44:E3:9C:BC"},
     )
-    assert result1["type"] is FlowResultType.MENU
-    assert result1["step_id"] == "get_encryption_key_4_5_choose_method"
-
-    result2 = await hass.config_entries.flow.async_configure(
-        result1["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
+    assert result1["type"] is FlowResultType.FORM
+    assert result1["step_id"] == "get_encryption_key_4_5"
 
     # Try an incorrect key
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
         user_input={"bindkey": "5b51a7c91cde6707c9ef1dfda143a58"},
     )
 
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "get_encryption_key_4_5"
-    assert result3["errors"]["bindkey"] == "expected_32_characters"
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "get_encryption_key_4_5"
+    assert result2["errors"]["bindkey"] == "expected_32_characters"
 
     # Check can still finish flow
     with patch(
         "homeassistant.components.xiaomi_ble.async_setup_entry", return_value=True
     ):
-        result4 = await hass.config_entries.flow.async_configure(
-            result3["flow_id"],
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
             user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
         )
 
-    assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
-    assert result4["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
-    assert result4["result"].unique_id == "54:EF:44:E3:9C:BC"
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
+    assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
+    assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
 
 async def test_async_step_user_with_found_devices_legacy_encryption(
@@ -1266,19 +1003,14 @@ async def test_async_step_reauth_v4(hass: HomeAssistant) -> None:
     assert len(results) == 1
     result = results[0]
 
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
+    assert result["step_id"] == "get_encryption_key_4_5"
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
-
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
         user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
     )
-    assert result3["type"] is FlowResultType.ABORT
-    assert result3["reason"] == "reauth_successful"
+    assert result2["type"] is FlowResultType.ABORT
+    assert result2["reason"] == "reauth_successful"
 
 
 async def test_async_step_reauth_v4_wrong_key(hass: HomeAssistant) -> None:
@@ -1320,90 +1052,22 @@ async def test_async_step_reauth_v4_wrong_key(hass: HomeAssistant) -> None:
     assert len(results) == 1
     result = results[0]
 
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
+    assert result["step_id"] == "get_encryption_key_4_5"
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input={"next_step_id": "get_encryption_key_4_5"},
-    )
-
-    result3 = await hass.config_entries.flow.async_configure(
-        result2["flow_id"],
         user_input={"bindkey": "5b51a7c91cde6707c9ef18dada143a58"},
     )
-    assert result3["type"] is FlowResultType.FORM
-    assert result3["step_id"] == "get_encryption_key_4_5"
-    assert result3["errors"]["bindkey"] == "decryption_failed"
-
-    result4 = await hass.config_entries.flow.async_configure(
-        result3["flow_id"],
-        user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
-    )
-    assert result4["type"] is FlowResultType.ABORT
-    assert result4["reason"] == "reauth_successful"
-
-
-async def test_async_step_reauth_v4_from_cloud(hass: HomeAssistant) -> None:
-    """Test reauth with a v4 key from the cloud."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        unique_id="54:EF:44:E3:9C:BC",
-    )
-    entry.add_to_hass(hass)
-    saved_callback = None
-
-    def _async_register_callback(_hass, _callback, _matcher, _mode):
-        nonlocal saved_callback
-        saved_callback = _callback
-        return lambda: None
-
-    with patch(
-        "homeassistant.components.bluetooth.update_coordinator.async_register_callback",
-        _async_register_callback,
-    ):
-        assert await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    assert len(hass.states.async_all()) == 0
-
-    # WARNING: This test data is synthetic, rather than captured from a real device
-    # obj type is 0x1310, payload len is 0x2 and payload is 0x6000
-    saved_callback(
-        make_advertisement(
-            "54:EF:44:E3:9C:BC",
-            b"XY\x97\tf\xbc\x9c\xe3D\xefT\x01\x08\x12\x05\x00\x00\x00q^\xbe\x90",
-        ),
-        BluetoothChange.ADVERTISEMENT,
-    )
-
-    await hass.async_block_till_done()
-
-    results = hass.config_entries.flow.async_progress()
-    assert len(results) == 1
-    result = results[0]
-
-    assert result["step_id"] == "get_encryption_key_4_5_choose_method"
+    assert result2["type"] is FlowResultType.FORM
+    assert result2["step_id"] == "get_encryption_key_4_5"
+    assert result2["errors"]["bindkey"] == "decryption_failed"
 
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input={"next_step_id": "cloud_auth"},
+        user_input={"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"},
     )
-    device = XiaomiCloudBLEDevice(
-        name="x",
-        mac="54:EF:44:E3:9C:BC",
-        bindkey="5b51a7c91cde6707c9ef18dfda143a58",
-    )
-    with patch(
-        "homeassistant.components.xiaomi_ble.config_flow.XiaomiCloudTokenFetch.get_device_info",
-        return_value=device,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            user_input={"username": "x@x.x", "password": "x"},
-        )
-
-    assert result3["type"] is FlowResultType.ABORT
-    assert result3["reason"] == "reauth_successful"
+    assert result2["type"] is FlowResultType.ABORT
+    assert result2["reason"] == "reauth_successful"
 
 
 async def test_async_step_reauth_abort_early(hass: HomeAssistant) -> None:
diff --git a/tests/components/yale_smart_alarm/fixtures/get_all.json b/tests/components/yale_smart_alarm/fixtures/get_all.json
index 6c68e05c566..e85a93f3c3e 100644
--- a/tests/components/yale_smart_alarm/fixtures/get_all.json
+++ b/tests/components/yale_smart_alarm/fixtures/get_all.json
@@ -175,7 +175,7 @@
       "address": "RF4",
       "type": "device_type.door_contact",
       "name": "Device4",
-      "status1": "device_status.dc_close,device_status.low_battery",
+      "status1": "device_status.dc_close",
       "status2": null,
       "status_switch": null,
       "status_power": null,
@@ -763,7 +763,7 @@
         "address": "RF4",
         "type": "device_type.door_contact",
         "name": "Device4",
-        "status1": "device_status.dc_close,device_status.low_battery",
+        "status1": "device_status.dc_close",
         "status2": null,
         "status_switch": null,
         "status_power": null,
diff --git a/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr b/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr
index ed7e847439c..7bb144e8d2a 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_binary_sensor.ambr
@@ -1,51 +1,4 @@
 # serializer version: 1
-# name: test_binary_sensor[load_platforms0][binary_sensor.device4_battery-entry]
-  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.device4_battery',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.BATTERY: 'battery'>,
-    'original_icon': None,
-    'original_name': 'Battery',
-    'platform': 'yale_smart_alarm',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'RF4-battery',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_binary_sensor[load_platforms0][binary_sensor.device4_battery-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'battery',
-      'friendly_name': 'Device4 Battery',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.device4_battery',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'on',
-  })
-# ---
 # name: test_binary_sensor[load_platforms0][binary_sensor.device4_door-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -93,53 +46,6 @@
     'state': 'off',
   })
 # ---
-# name: test_binary_sensor[load_platforms0][binary_sensor.device5_battery-entry]
-  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.device5_battery',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.BATTERY: 'battery'>,
-    'original_icon': None,
-    'original_name': 'Battery',
-    'platform': 'yale_smart_alarm',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'RF5-battery',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_binary_sensor[load_platforms0][binary_sensor.device5_battery-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'battery',
-      'friendly_name': 'Device5 Battery',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.device5_battery',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
 # name: test_binary_sensor[load_platforms0][binary_sensor.device5_door-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -187,53 +93,6 @@
     'state': 'on',
   })
 # ---
-# name: test_binary_sensor[load_platforms0][binary_sensor.device6_battery-entry]
-  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.device6_battery',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <BinarySensorDeviceClass.BATTERY: 'battery'>,
-    'original_icon': None,
-    'original_name': 'Battery',
-    'platform': 'yale_smart_alarm',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'RF6-battery',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_binary_sensor[load_platforms0][binary_sensor.device6_battery-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'battery',
-      'friendly_name': 'Device6 Battery',
-    }),
-    'context': <ANY>,
-    'entity_id': 'binary_sensor.device6_battery',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'off',
-  })
-# ---
 # name: test_binary_sensor[load_platforms0][binary_sensor.device6_door-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
diff --git a/tests/components/yale_smart_alarm/snapshots/test_diagnostics.ambr b/tests/components/yale_smart_alarm/snapshots/test_diagnostics.ambr
index af939336677..e78c9520429 100644
--- a/tests/components/yale_smart_alarm/snapshots/test_diagnostics.ambr
+++ b/tests/components/yale_smart_alarm/snapshots/test_diagnostics.ambr
@@ -203,7 +203,6 @@
             'type_no': '72',
           }),
           dict({
-            '_battery': True,
             '_state': 'closed',
             'address': '**REDACTED**',
             'area': '1',
@@ -235,7 +234,7 @@
             'sresp_button_2': None,
             'sresp_button_3': None,
             'sresp_button_4': None,
-            'status1': 'device_status.dc_close,device_status.low_battery',
+            'status1': 'device_status.dc_close',
             'status2': None,
             'status_dim_level': None,
             'status_fault': list([
@@ -265,7 +264,6 @@
             'type_no': '4',
           }),
           dict({
-            '_battery': False,
             '_state': 'open',
             'address': '**REDACTED**',
             'area': '1',
@@ -327,7 +325,6 @@
             'type_no': '4',
           }),
           dict({
-            '_battery': False,
             '_state': 'unavailable',
             'address': '**REDACTED**',
             'area': '1',
@@ -858,7 +855,7 @@
           'sresp_button_2': None,
           'sresp_button_3': None,
           'sresp_button_4': None,
-          'status1': 'device_status.dc_close,device_status.low_battery',
+          'status1': 'device_status.dc_close',
           'status2': None,
           'status_dim_level': None,
           'status_fault': list([
diff --git a/tests/components/yale_smart_alarm/test_config_flow.py b/tests/components/yale_smart_alarm/test_config_flow.py
index e5b59f79463..e325e259806 100644
--- a/tests/components/yale_smart_alarm/test_config_flow.py
+++ b/tests/components/yale_smart_alarm/test_config_flow.py
@@ -239,211 +239,6 @@ async def test_reauth_flow_error(
     }
 
 
-async def test_reconfigure(hass: HomeAssistant) -> None:
-    """Test reconfigure config flow."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        unique_id="test-username",
-        data={
-            "username": "test-username",
-            "password": "test-password",
-            "name": "Yale Smart Alarm",
-            "area_id": "1",
-        },
-        version=2,
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reconfigure_flow(hass)
-
-    with (
-        patch(
-            "homeassistant.components.yale_smart_alarm.config_flow.YaleSmartAlarmClient",
-            return_value="",
-        ),
-        patch(
-            "homeassistant.components.yale_smart_alarm.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "username": "test-username",
-                "password": "new-test-password",
-                "area_id": "2",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] is FlowResultType.ABORT
-    assert result2["reason"] == "reconfigure_successful"
-    assert entry.data == {
-        "username": "test-username",
-        "password": "new-test-password",
-        "name": "Yale Smart Alarm",
-        "area_id": "2",
-    }
-
-
-async def test_reconfigure_username_exist(hass: HomeAssistant) -> None:
-    """Test reconfigure config flow abort other username already exist."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        unique_id="test-username",
-        data={
-            "username": "test-username",
-            "password": "test-password",
-            "name": "Yale Smart Alarm",
-            "area_id": "1",
-        },
-        version=2,
-    )
-    entry.add_to_hass(hass)
-    entry2 = MockConfigEntry(
-        domain=DOMAIN,
-        unique_id="other-username",
-        data={
-            "username": "other-username",
-            "password": "test-password",
-            "name": "Yale Smart Alarm 2",
-            "area_id": "1",
-        },
-        version=2,
-    )
-    entry2.add_to_hass(hass)
-
-    result = await entry.start_reconfigure_flow(hass)
-
-    with (
-        patch(
-            "homeassistant.components.yale_smart_alarm.config_flow.YaleSmartAlarmClient",
-            return_value="",
-        ),
-        patch(
-            "homeassistant.components.yale_smart_alarm.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "username": "other-username",
-                "password": "test-password",
-                "area_id": "1",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": "unique_id_exists"}
-
-    with (
-        patch(
-            "homeassistant.components.yale_smart_alarm.config_flow.YaleSmartAlarmClient",
-            return_value="",
-        ),
-        patch(
-            "homeassistant.components.yale_smart_alarm.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "username": "other-new-username",
-                "password": "test-password",
-                "area_id": "1",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reconfigure_successful"
-    assert entry.data == {
-        "username": "other-new-username",
-        "name": "Yale Smart Alarm",
-        "password": "test-password",
-        "area_id": "1",
-    }
-
-
-@pytest.mark.parametrize(
-    ("sideeffect", "p_error"),
-    [
-        (AuthenticationError, "invalid_auth"),
-        (ConnectionError, "cannot_connect"),
-        (TimeoutError, "cannot_connect"),
-        (UnknownError, "cannot_connect"),
-    ],
-)
-async def test_reconfigure_flow_error(
-    hass: HomeAssistant, sideeffect: Exception, p_error: str
-) -> None:
-    """Test a reauthentication flow."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        unique_id="test-username",
-        data={
-            "username": "test-username",
-            "password": "test-password",
-            "name": "Yale Smart Alarm",
-            "area_id": "1",
-        },
-        version=2,
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reconfigure_flow(hass)
-
-    with patch(
-        "homeassistant.components.yale_smart_alarm.config_flow.YaleSmartAlarmClient",
-        side_effect=sideeffect,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "username": "test-username",
-                "password": "update-password",
-                "area_id": "1",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result["step_id"] == "reconfigure"
-    assert result["type"] is FlowResultType.FORM
-    assert result["errors"] == {"base": p_error}
-
-    with (
-        patch(
-            "homeassistant.components.yale_smart_alarm.config_flow.YaleSmartAlarmClient",
-            return_value="",
-        ),
-        patch(
-            "homeassistant.components.yale_smart_alarm.async_setup_entry",
-            return_value=True,
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "username": "test-username",
-                "password": "new-test-password",
-                "area_id": "1",
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reconfigure_successful"
-    assert entry.data == {
-        "username": "test-username",
-        "name": "Yale Smart Alarm",
-        "password": "new-test-password",
-        "area_id": "1",
-    }
-
-
 async def test_options_flow(hass: HomeAssistant) -> None:
     """Test options config flow."""
     entry = MockConfigEntry(
diff --git a/tests/components/yale_smart_alarm/test_coordinator.py b/tests/components/yale_smart_alarm/test_coordinator.py
index 386e4ad72f7..41362f2318a 100644
--- a/tests/components/yale_smart_alarm/test_coordinator.py
+++ b/tests/components/yale_smart_alarm/test_coordinator.py
@@ -13,10 +13,9 @@ from yalesmartalarmclient import (
     YaleSmartAlarmData,
 )
 
-from homeassistant.components.alarm_control_panel import AlarmControlPanelState
 from homeassistant.components.yale_smart_alarm.const import DOMAIN
 from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.const import STATE_ALARM_ARMED_AWAY, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.util import dt as dt_util
 
@@ -75,7 +74,7 @@ async def test_coordinator_setup_and_update_errors(
     client = load_config_entry[1]
 
     state = hass.states.get("alarm_control_panel.yale_smart_alarm")
-    assert state.state == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMED_AWAY
     client.reset_mock()
 
     client.get_information.side_effect = ConnectionError("Could not connect")
@@ -117,7 +116,7 @@ async def test_coordinator_setup_and_update_errors(
     await hass.async_block_till_done(wait_background_tasks=True)
     client.get_information.assert_called_once()
     state = hass.states.get("alarm_control_panel.yale_smart_alarm")
-    assert state.state == AlarmControlPanelState.ARMED_AWAY
+    assert state.state == STATE_ALARM_ARMED_AWAY
     client.reset_mock()
 
     client.get_information.side_effect = AuthenticationError("Can not authenticate")
diff --git a/tests/components/zha/test_alarm_control_panel.py b/tests/components/zha/test_alarm_control_panel.py
index 609438cd725..3473a9b00ad 100644
--- a/tests/components/zha/test_alarm_control_panel.py
+++ b/tests/components/zha/test_alarm_control_panel.py
@@ -8,17 +8,22 @@ from zigpy.zcl import Cluster
 from zigpy.zcl.clusters import security
 import zigpy.zcl.foundation as zcl_f
 
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_DOMAIN,
-    AlarmControlPanelState,
-)
+from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN
 from homeassistant.components.zha.helpers import (
     ZHADeviceProxy,
     ZHAGatewayProxy,
     get_zha_gateway,
     get_zha_gateway_proxy,
 )
-from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 
 from .common import find_entity_id
@@ -74,7 +79,7 @@ async def test_alarm_control_panel(
     cluster = zigpy_device.endpoints[1].ias_ace
     assert entity_id is not None
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     # arm_away from HA
     cluster.client_command.reset_mock()
@@ -85,7 +90,7 @@ async def test_alarm_control_panel(
         blocking=True,
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
     assert cluster.client_command.call_count == 2
     assert cluster.client_command.await_count == 2
     assert cluster.client_command.call_args == call(
@@ -108,7 +113,7 @@ async def test_alarm_control_panel(
         blocking=True,
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
     cluster.client_command.reset_mock()
     await hass.services.async_call(
         ALARM_DOMAIN,
@@ -123,7 +128,7 @@ async def test_alarm_control_panel(
         blocking=True,
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
     assert cluster.client_command.call_count == 4
     assert cluster.client_command.await_count == 4
     assert cluster.client_command.call_args == call(
@@ -146,7 +151,7 @@ async def test_alarm_control_panel(
         blocking=True,
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_HOME
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_HOME
     assert cluster.client_command.call_count == 2
     assert cluster.client_command.await_count == 2
     assert cluster.client_command.call_args == call(
@@ -166,7 +171,7 @@ async def test_alarm_control_panel(
         blocking=True,
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_NIGHT
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_NIGHT
     assert cluster.client_command.call_count == 2
     assert cluster.client_command.await_count == 2
     assert cluster.client_command.call_args == call(
@@ -185,7 +190,7 @@ async def test_alarm_control_panel(
         "cluster_command", 1, 0, [security.IasAce.ArmMode.Arm_All_Zones, "", 0]
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
 
     # reset the panel
     await reset_alarm_panel(hass, cluster, entity_id)
@@ -195,7 +200,7 @@ async def test_alarm_control_panel(
         "cluster_command", 1, 0, [security.IasAce.ArmMode.Arm_Day_Home_Only, "", 0]
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_HOME
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_HOME
 
     # reset the panel
     await reset_alarm_panel(hass, cluster, entity_id)
@@ -205,33 +210,33 @@ async def test_alarm_control_panel(
         "cluster_command", 1, 0, [security.IasAce.ArmMode.Arm_Night_Sleep_Only, "", 0]
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_NIGHT
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_NIGHT
 
     # disarm from panel with bad code
     cluster.listener_event(
         "cluster_command", 1, 0, [security.IasAce.ArmMode.Disarm, "", 0]
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_NIGHT
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_NIGHT
 
     # disarm from panel with bad code for 2nd time trips alarm
     cluster.listener_event(
         "cluster_command", 1, 0, [security.IasAce.ArmMode.Disarm, "", 0]
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     # disarm from panel with good code
     cluster.listener_event(
         "cluster_command", 1, 0, [security.IasAce.ArmMode.Disarm, "4321", 0]
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
 
     # panic from panel
     cluster.listener_event("cluster_command", 1, 4, [])
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     # reset the panel
     await reset_alarm_panel(hass, cluster, entity_id)
@@ -239,7 +244,7 @@ async def test_alarm_control_panel(
     # fire from panel
     cluster.listener_event("cluster_command", 1, 3, [])
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     # reset the panel
     await reset_alarm_panel(hass, cluster, entity_id)
@@ -247,7 +252,7 @@ async def test_alarm_control_panel(
     # emergency from panel
     cluster.listener_event("cluster_command", 1, 2, [])
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
 
     # reset the panel
     await reset_alarm_panel(hass, cluster, entity_id)
@@ -259,7 +264,7 @@ async def test_alarm_control_panel(
         blocking=True,
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED
+    assert hass.states.get(entity_id).state == STATE_ALARM_TRIGGERED
     assert cluster.client_command.call_count == 1
     assert cluster.client_command.await_count == 1
     assert cluster.client_command.call_args == call(
@@ -285,7 +290,7 @@ async def reset_alarm_panel(hass: HomeAssistant, cluster: Cluster, entity_id: st
         blocking=True,
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     assert cluster.client_command.call_count == 2
     assert cluster.client_command.await_count == 2
     assert cluster.client_command.call_args == call(
diff --git a/tests/components/zha/test_config_flow.py b/tests/components/zha/test_config_flow.py
index 87ba46a4ced..f75cc0264dd 100644
--- a/tests/components/zha/test_config_flow.py
+++ b/tests/components/zha/test_config_flow.py
@@ -21,7 +21,7 @@ import zigpy.types
 
 from homeassistant import config_entries
 from homeassistant.components import ssdp, usb, zeroconf
-from homeassistant.components.hassio import AddonError, AddonState
+from homeassistant.components.hassio import AddonState
 from homeassistant.components.ssdp import ATTR_UPNP_MANUFACTURER_URL, ATTR_UPNP_SERIAL
 from homeassistant.components.zha import config_flow, radio_manager
 from homeassistant.components.zha.const import (
@@ -122,9 +122,7 @@ def backup(make_backup):
 
 
 @pytest.fixture(autouse=True)
-def mock_supervisor_client(
-    supervisor_client: AsyncMock, addon_store_info: AsyncMock
-) -> None:
+def mock_supervisor_client(supervisor_client: AsyncMock) -> None:
     """Mock supervisor client."""
 
 
@@ -1878,23 +1876,10 @@ async def test_config_flow_port_yellow_port_name(hass: HomeAssistant) -> None:
     )
 
 
-async def test_config_flow_ports_no_hassio(hass: HomeAssistant) -> None:
-    """Test config flow serial port name when this is not a hassio install."""
-
-    with (
-        patch("homeassistant.components.zha.config_flow.is_hassio", return_value=False),
-        patch("serial.tools.list_ports.comports", MagicMock(return_value=[])),
-    ):
-        ports = await config_flow.list_serial_ports(hass)
-
-    assert ports == []
-
-
 async def test_config_flow_port_multiprotocol_port_name(hass: HomeAssistant) -> None:
     """Test config flow serial port name for multiprotocol add-on."""
 
     with (
-        patch("homeassistant.components.zha.config_flow.is_hassio", return_value=True),
         patch(
             "homeassistant.components.hassio.addon_manager.AddonManager.async_get_addon_info"
         ) as async_get_addon_info,
@@ -1902,28 +1887,16 @@ async def test_config_flow_port_multiprotocol_port_name(hass: HomeAssistant) ->
     ):
         async_get_addon_info.return_value.state = AddonState.RUNNING
         async_get_addon_info.return_value.hostname = "core-silabs-multiprotocol"
-        ports = await config_flow.list_serial_ports(hass)
 
-    assert len(ports) == 1
-    assert ports[0].description == "Multiprotocol add-on"
-    assert ports[0].manufacturer == "Nabu Casa"
-    assert ports[0].device == "socket://core-silabs-multiprotocol:9999"
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={CONF_SOURCE: SOURCE_USER},
+        )
 
-
-async def test_config_flow_port_no_multiprotocol(hass: HomeAssistant) -> None:
-    """Test config flow serial port listing when addon info fails to load."""
-
-    with (
-        patch("homeassistant.components.zha.config_flow.is_hassio", return_value=True),
-        patch(
-            "homeassistant.components.hassio.addon_manager.AddonManager.async_get_addon_info",
-            side_effect=AddonError,
-        ),
-        patch("serial.tools.list_ports.comports", MagicMock(return_value=[])),
-    ):
-        ports = await config_flow.list_serial_ports(hass)
-
-    assert ports == []
+    assert (
+        result["data_schema"].schema["path"].container[0]
+        == "socket://core-silabs-multiprotocol:9999 - Multiprotocol add-on - Nabu Casa"
+    )
 
 
 @patch("serial.tools.list_ports.comports", MagicMock(return_value=[com_port()]))
diff --git a/tests/components/zha/test_diagnostics.py b/tests/components/zha/test_diagnostics.py
index 0e78a9a1b5b..ed3f83c0c36 100644
--- a/tests/components/zha/test_diagnostics.py
+++ b/tests/components/zha/test_diagnostics.py
@@ -69,11 +69,10 @@ async def test_diagnostics_for_config_entry(
 
     scan = {c: c for c in range(11, 26 + 1)}
 
-    gateway.application_controller.energy_scan.side_effect = None
-    gateway.application_controller.energy_scan.return_value = scan
-    diagnostics_data = await get_diagnostics_for_config_entry(
-        hass, hass_client, config_entry
-    )
+    with patch.object(gateway.application_controller, "energy_scan", return_value=scan):
+        diagnostics_data = await get_diagnostics_for_config_entry(
+            hass, hass_client, config_entry
+        )
 
     assert diagnostics_data == snapshot(
         exclude=props("created_at", "modified_at", "entry_id", "versions")
diff --git a/tests/components/zha/test_init.py b/tests/components/zha/test_init.py
index 887284919da..00fc3afd0ea 100644
--- a/tests/components/zha/test_init.py
+++ b/tests/components/zha/test_init.py
@@ -252,7 +252,7 @@ async def test_zha_retry_unique_ids(
     ) as mock_connect:
         with patch(
             "homeassistant.config_entries.async_call_later",
-            lambda hass, delay, action: async_call_later(hass, 0.01, action),
+            lambda hass, delay, action: async_call_later(hass, 0, action),
         ):
             await hass.config_entries.async_setup(config_entry.entry_id)
             await hass.async_block_till_done(wait_background_tasks=True)
diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py
index df1adbc98e5..1d4ee7d4d86 100644
--- a/tests/components/zwave_js/test_api.py
+++ b/tests/components/zwave_js/test_api.py
@@ -5,7 +5,7 @@ from http import HTTPStatus
 from io import BytesIO
 import json
 from typing import Any
-from unittest.mock import PropertyMock, patch
+from unittest.mock import patch
 
 import pytest
 from zwave_js_server.const import (
@@ -78,16 +78,9 @@ from homeassistant.components.zwave_js.api import (
     TYPE,
     UUID,
     VALUE,
-    VALUE_FORMAT,
-    VALUE_SIZE,
     VERSION,
 )
 from homeassistant.components.zwave_js.const import (
-    ATTR_COMMAND_CLASS,
-    ATTR_ENDPOINT,
-    ATTR_METHOD_NAME,
-    ATTR_PARAMETERS,
-    ATTR_WAIT_FOR_RESULT,
     CONF_DATA_COLLECTION_OPTED_IN,
     DOMAIN,
 )
@@ -95,7 +88,7 @@ from homeassistant.components.zwave_js.helpers import get_device_id
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 
-from tests.common import MockConfigEntry, MockUser
+from tests.common import MockUser
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
 
 CONTROLLER_PATCH_PREFIX = "zwave_js_server.model.controller.Controller"
@@ -496,7 +489,6 @@ async def test_node_alerts(
 
 async def test_add_node(
     hass: HomeAssistant,
-    nortek_thermostat,
     nortek_thermostat_added_event,
     integration,
     client,
@@ -944,46 +936,12 @@ async def test_add_node(
         assert msg["error"]["code"] == "zwave_error"
         assert msg["error"]["message"] == "zwave_error: Z-Wave error 1 - error message"
 
-    # Test inclusion already in progress
-    client.async_send_command.reset_mock()
-    type(client.driver.controller).inclusion_state = PropertyMock(
-        return_value=InclusionState.INCLUDING
-    )
-
-    # Create a node that's not ready
-    node_data = deepcopy(nortek_thermostat.data)  # Copy to allow modification in tests.
-    node_data["ready"] = False
-    node_data["values"] = {}
-    node_data["endpoints"] = {}
-    node = Node(client, node_data)
-    client.driver.controller.nodes[node.node_id] = node
-
-    await ws_client.send_json(
-        {
-            ID: 11,
-            TYPE: "zwave_js/add_node",
-            ENTRY_ID: entry.entry_id,
-            INCLUSION_STRATEGY: InclusionStrategy.DEFAULT.value,
-        }
-    )
-
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-
-    # Verify no command was sent since inclusion is already in progress
-    assert len(client.async_send_command.call_args_list) == 0
-
-    # Verify we got a node added event
-    msg = await ws_client.receive_json()
-    assert msg["event"]["event"] == "node added"
-    assert msg["event"]["node"]["node_id"] == node.node_id
-
     # Test sending command with not loaded entry fails
     await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
     await ws_client.send_json(
-        {ID: 12, TYPE: "zwave_js/add_node", ENTRY_ID: entry.entry_id}
+        {ID: 11, TYPE: "zwave_js/add_node", ENTRY_ID: entry.entry_id}
     )
     msg = await ws_client.receive_json()
 
@@ -3139,180 +3097,6 @@ async def test_get_config_parameters(
     assert msg["error"]["code"] == ERR_NOT_LOADED
 
 
-async def test_set_raw_config_parameter(
-    hass: HomeAssistant,
-    client,
-    multisensor_6,
-    integration,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test that the set_raw_config_parameter WS API call works."""
-    entry = integration
-    ws_client = await hass_ws_client(hass)
-    device = get_device(hass, multisensor_6)
-
-    # Change from async_send_command to async_send_command_no_wait
-    client.async_send_command_no_wait.return_value = None
-
-    # Test setting a raw config parameter value
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/set_raw_config_parameter",
-            DEVICE_ID: device.id,
-            PROPERTY: 102,
-            VALUE: 1,
-            VALUE_SIZE: 2,
-            VALUE_FORMAT: 1,
-        }
-    )
-
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-    assert msg["result"]["status"] == "queued"
-
-    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"] == "endpoint.set_raw_config_parameter_value"
-    assert args["nodeId"] == multisensor_6.node_id
-    assert args["options"]["parameter"] == 102
-    assert args["options"]["value"] == 1
-    assert args["options"]["valueSize"] == 2
-    assert args["options"]["valueFormat"] == 1
-
-    # Reset the mock for async_send_command_no_wait instead
-    client.async_send_command_no_wait.reset_mock()
-
-    # Test getting non-existent node fails
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/set_raw_config_parameter",
-            DEVICE_ID: "fake_device",
-            PROPERTY: 102,
-            VALUE: 1,
-            VALUE_SIZE: 2,
-            VALUE_FORMAT: 1,
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert not msg["success"]
-    assert msg["error"]["code"] == ERR_NOT_FOUND
-
-    # Test sending command with not loaded entry fails
-    await hass.config_entries.async_unload(entry.entry_id)
-    await hass.async_block_till_done()
-
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/set_raw_config_parameter",
-            DEVICE_ID: device.id,
-            PROPERTY: 102,
-            VALUE: 1,
-            VALUE_SIZE: 2,
-            VALUE_FORMAT: 1,
-        }
-    )
-    msg = await ws_client.receive_json()
-
-    assert not msg["success"]
-    assert msg["error"]["code"] == ERR_NOT_LOADED
-
-
-async def test_get_raw_config_parameter(
-    hass: HomeAssistant,
-    multisensor_6,
-    integration,
-    client,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test the get_raw_config_parameter websocket command."""
-    entry = integration
-    ws_client = await hass_ws_client(hass)
-    device = get_device(hass, multisensor_6)
-
-    client.async_send_command.return_value = {"value": 1}
-
-    # Test getting a raw config parameter value
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/get_raw_config_parameter",
-            DEVICE_ID: device.id,
-            PROPERTY: 102,
-        }
-    )
-
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-    assert msg["result"]["value"] == 1
-
-    assert len(client.async_send_command.call_args_list) == 1
-    args = client.async_send_command.call_args[0][0]
-    assert args["command"] == "endpoint.get_raw_config_parameter_value"
-    assert args["nodeId"] == multisensor_6.node_id
-    assert args["options"]["parameter"] == 102
-
-    client.async_send_command.reset_mock()
-
-    # Test FailedZWaveCommand is caught
-    with patch(
-        "zwave_js_server.model.node.Node.async_get_raw_config_parameter_value",
-        side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
-    ):
-        await ws_client.send_json_auto_id(
-            {
-                TYPE: "zwave_js/get_raw_config_parameter",
-                DEVICE_ID: device.id,
-                PROPERTY: 102,
-            }
-        )
-        msg = await ws_client.receive_json()
-
-        assert not msg["success"]
-        assert msg["error"]["code"] == "zwave_error"
-        assert msg["error"]["message"] == "zwave_error: Z-Wave error 1 - error message"
-
-    # Test getting non-existent node fails
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/get_raw_config_parameter",
-            DEVICE_ID: "fake_device",
-            PROPERTY: 102,
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert not msg["success"]
-    assert msg["error"]["code"] == ERR_NOT_FOUND
-
-    # Test FailedCommand exception
-    client.async_send_command.side_effect = FailedCommand("test", "test")
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/get_raw_config_parameter",
-            DEVICE_ID: device.id,
-            PROPERTY: 102,
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert not msg["success"]
-    assert msg["error"]["code"] == "test"
-    assert msg["error"]["message"] == "Command failed: test"
-
-    # Test sending command with not loaded entry fails
-    await hass.config_entries.async_unload(entry.entry_id)
-    await hass.async_block_till_done()
-
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/get_raw_config_parameter",
-            DEVICE_ID: device.id,
-            PROPERTY: 102,
-        }
-    )
-    msg = await ws_client.receive_json()
-
-    assert not msg["success"]
-    assert msg["error"]["code"] == ERR_NOT_LOADED
-
-
 @pytest.mark.parametrize(
     ("firmware_data", "expected_data"),
     [({"target": "1"}, {"firmware_target": 1}), ({}, {})],
@@ -5009,157 +4793,3 @@ async def test_hard_reset_controller(
 
     assert not msg["success"]
     assert msg["error"]["code"] == ERR_NOT_FOUND
-
-
-async def test_node_capabilities(
-    hass: HomeAssistant,
-    multisensor_6: Node,
-    integration: MockConfigEntry,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test the node_capabilities websocket command."""
-    entry = integration
-    ws_client = await hass_ws_client(hass)
-
-    node = multisensor_6
-    device = get_device(hass, node)
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/node_capabilities",
-            DEVICE_ID: device.id,
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert msg["result"] == {
-        "0": [
-            {
-                "id": 113,
-                "name": "Notification",
-                "version": 8,
-                "isSecure": False,
-                "is_secure": False,
-            }
-        ]
-    }
-
-    # Test getting non-existent node fails
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/node_status",
-            DEVICE_ID: "fake_device",
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert not msg["success"]
-    assert msg["error"]["code"] == ERR_NOT_FOUND
-
-    # Test sending command with not loaded entry fails
-    await hass.config_entries.async_unload(entry.entry_id)
-    await hass.async_block_till_done()
-
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/node_status",
-            DEVICE_ID: device.id,
-        }
-    )
-    msg = await ws_client.receive_json()
-
-    assert not msg["success"]
-    assert msg["error"]["code"] == ERR_NOT_LOADED
-
-
-async def test_invoke_cc_api(
-    hass: HomeAssistant,
-    client,
-    climate_radio_thermostat_ct100_plus_different_endpoints: Node,
-    integration: MockConfigEntry,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test the invoke_cc_api websocket command."""
-    ws_client = await hass_ws_client(hass)
-
-    device_radio_thermostat = get_device(
-        hass, climate_radio_thermostat_ct100_plus_different_endpoints
-    )
-    assert device_radio_thermostat
-
-    # Test successful invoke_cc_api call with a static endpoint
-    client.async_send_command.return_value = {"response": True}
-    client.async_send_command_no_wait.return_value = {"response": True}
-
-    # Test with wait_for_result=False (default)
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/invoke_cc_api",
-            DEVICE_ID: device_radio_thermostat.id,
-            ATTR_COMMAND_CLASS: 67,
-            ATTR_METHOD_NAME: "someMethod",
-            ATTR_PARAMETERS: [1, 2],
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-    assert msg["result"] is None  # We did not specify wait_for_result=True
-
-    await hass.async_block_till_done()
-
-    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": "endpoint.invoke_cc_api",
-        "nodeId": 26,
-        "endpoint": 0,
-        "commandClass": 67,
-        "methodName": "someMethod",
-        "args": [1, 2],
-    }
-
-    client.async_send_command_no_wait.reset_mock()
-
-    # Test with wait_for_result=True
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/invoke_cc_api",
-            DEVICE_ID: device_radio_thermostat.id,
-            ATTR_COMMAND_CLASS: 67,
-            ATTR_ENDPOINT: 0,
-            ATTR_METHOD_NAME: "someMethod",
-            ATTR_PARAMETERS: [1, 2],
-            ATTR_WAIT_FOR_RESULT: True,
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-    assert msg["result"] is 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",
-        "nodeId": 26,
-        "endpoint": 0,
-        "commandClass": 67,
-        "methodName": "someMethod",
-        "args": [1, 2],
-    }
-
-    client.async_send_command.side_effect = NotFoundError
-
-    # Ensure an error is returned
-    await ws_client.send_json_auto_id(
-        {
-            TYPE: "zwave_js/invoke_cc_api",
-            DEVICE_ID: device_radio_thermostat.id,
-            ATTR_COMMAND_CLASS: 67,
-            ATTR_ENDPOINT: 0,
-            ATTR_METHOD_NAME: "someMethod",
-            ATTR_PARAMETERS: [1, 2],
-            ATTR_WAIT_FOR_RESULT: True,
-        }
-    )
-    msg = await ws_client.receive_json()
-    assert not msg["success"]
-    assert msg["error"] == {"code": "NotFoundError", "message": ""}
diff --git a/tests/components/zwave_js/test_config_flow.py b/tests/components/zwave_js/test_config_flow.py
index b60515cacd4..92188c2f7aa 100644
--- a/tests/components/zwave_js/test_config_flow.py
+++ b/tests/components/zwave_js/test_config_flow.py
@@ -6,10 +6,9 @@ from copy import copy
 from ipaddress import ip_address
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, call, patch
-from uuid import uuid4
 
 from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import AddonsOptions, Discovery
+from aiohasupervisor.models import AddonsOptions
 import aiohttp
 import pytest
 from serial.tools.list_ports_common import ListPortInfo
@@ -17,12 +16,12 @@ from zwave_js_server.version import VersionInfo
 
 from homeassistant import config_entries
 from homeassistant.components import usb
+from homeassistant.components.hassio import HassioAPIError, HassioServiceInfo
 from homeassistant.components.zeroconf import ZeroconfServiceInfo
 from homeassistant.components.zwave_js.config_flow import SERVER_VERSION_TIMEOUT, TITLE
 from homeassistant.components.zwave_js.const import ADDON_SLUG, DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from tests.common import MockConfigEntry
 
@@ -556,19 +555,7 @@ async def test_abort_hassio_discovery_for_other_addon(
     assert result2["reason"] == "not_zwave_js_addon"
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_usb_discovery(
     hass: HomeAssistant,
     supervisor,
@@ -666,19 +653,7 @@ async def test_usb_discovery(
     assert len(mock_setup_entry.mock_calls) == 1
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_usb_discovery_addon_not_running(
     hass: HomeAssistant,
     supervisor,
@@ -1115,19 +1090,7 @@ async def test_not_addon(hass: HomeAssistant, supervisor) -> None:
     assert len(mock_setup_entry.mock_calls) == 1
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_running(
     hass: HomeAssistant,
     supervisor,
@@ -1193,49 +1156,28 @@ async def test_addon_running(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
-            SupervisorError(),
+            {"config": ADDON_DISCOVERY_INFO},
+            HassioAPIError(),
             None,
             None,
             "addon_get_discovery_info_failed",
         ),
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             TimeoutError,
             None,
             "cannot_connect",
         ),
         (
-            [],
+            None,
             None,
             None,
             None,
             "addon_get_discovery_info_failed",
         ),
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             None,
             None,
             SupervisorError(),
@@ -1270,19 +1212,7 @@ async def test_addon_running_failures(
     assert result["reason"] == abort_reason
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_running_already_configured(
     hass: HomeAssistant,
     supervisor,
@@ -1341,19 +1271,7 @@ async def test_addon_running_already_configured(
     assert entry.data["lr_s2_authenticated_key"] == "new321"
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_installed(
     hass: HomeAssistant,
     supervisor,
@@ -1445,17 +1363,7 @@ async def test_addon_installed(
 
 @pytest.mark.parametrize(
     ("discovery_info", "start_addon_side_effect"),
-    [
-        (
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            ),
-            SupervisorError(),
-        )
-    ],
+    [({"config": ADDON_DISCOVERY_INFO}, SupervisorError())],
 )
 async def test_addon_installed_start_failure(
     hass: HomeAssistant,
@@ -1526,18 +1434,11 @@ async def test_addon_installed_start_failure(
     ("discovery_info", "server_version_side_effect"),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             TimeoutError,
         ),
         (
-            [],
+            None,
             None,
         ),
     ],
@@ -1609,19 +1510,7 @@ async def test_addon_installed_failures(
 
 @pytest.mark.parametrize(
     ("set_addon_options_side_effect", "discovery_info"),
-    [
-        (
-            SupervisorError(),
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
-        )
-    ],
+    [(SupervisorError(), {"config": ADDON_DISCOVERY_INFO})],
 )
 async def test_addon_installed_set_options_failure(
     hass: HomeAssistant,
@@ -1682,19 +1571,7 @@ async def test_addon_installed_set_options_failure(
     assert start_addon.call_count == 0
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_installed_already_configured(
     hass: HomeAssistant,
     supervisor,
@@ -1785,19 +1662,7 @@ async def test_addon_installed_already_configured(
     assert entry.data["lr_s2_authenticated_key"] == "new321"
 
 
-@pytest.mark.parametrize(
-    "discovery_info",
-    [
-        [
-            Discovery(
-                addon="core_zwave_js",
-                service="zwave_js",
-                uuid=uuid4(),
-                config=ADDON_DISCOVERY_INFO,
-            )
-        ]
-    ],
-)
+@pytest.mark.parametrize("discovery_info", [{"config": ADDON_DISCOVERY_INFO}])
 async def test_addon_not_installed(
     hass: HomeAssistant,
     supervisor,
@@ -2022,14 +1887,7 @@ async def test_options_not_addon(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2055,14 +1913,7 @@ async def test_options_not_addon(
             0,
         ),
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {"use_addon": True},
             {
                 "device": "/test",
@@ -2182,14 +2033,7 @@ async def test_options_addon_running(
     ("discovery_info", "entry_data", "old_addon_options", "new_addon_options"),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2316,14 +2160,7 @@ async def different_device_server_version(*args):
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2352,14 +2189,7 @@ async def different_device_server_version(*args):
             different_device_server_version,
         ),
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2488,14 +2318,7 @@ async def test_options_different_device(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2524,14 +2347,7 @@ async def test_options_different_device(
             [SupervisorError(), None],
         ),
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2661,14 +2477,7 @@ async def test_options_addon_restart_failed(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2761,14 +2570,7 @@ async def test_options_addon_running_server_info_failure(
     ),
     [
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {},
             {
                 "device": "/test",
@@ -2794,14 +2596,7 @@ async def test_options_addon_running_server_info_failure(
             0,
         ),
         (
-            [
-                Discovery(
-                    addon="core_zwave_js",
-                    service="zwave_js",
-                    uuid=uuid4(),
-                    config=ADDON_DISCOVERY_INFO,
-                )
-            ],
+            {"config": ADDON_DISCOVERY_INFO},
             {"use_addon": True},
             {
                 "device": "/test",
diff --git a/tests/components/zwave_js/test_services.py b/tests/components/zwave_js/test_services.py
index 41477f18b97..ec13d0262f8 100644
--- a/tests/components/zwave_js/test_services.py
+++ b/tests/components/zwave_js/test_services.py
@@ -497,12 +497,13 @@ async def test_set_config_parameter(
 
     caplog.clear()
 
+    config_value = aeotec_zw164_siren.values["2-112-0-32"]
     cmd_result = SetConfigParameterResult("accepted", {"status": 255})
 
     # Test accepted return
     with patch(
         "homeassistant.components.zwave_js.services.Endpoint.async_set_raw_config_parameter_value",
-        return_value=cmd_result,
+        return_value=(config_value, cmd_result),
     ) as mock_set_raw_config_parameter_value:
         await hass.services.async_call(
             DOMAIN,
@@ -533,7 +534,7 @@ async def test_set_config_parameter(
     cmd_result.status = "queued"
     with patch(
         "homeassistant.components.zwave_js.services.Endpoint.async_set_raw_config_parameter_value",
-        return_value=cmd_result,
+        return_value=(config_value, cmd_result),
     ) as mock_set_raw_config_parameter_value:
         await hass.services.async_call(
             DOMAIN,
diff --git a/tests/conftest.py b/tests/conftest.py
index 35b65c5653c..10c9a740256 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -36,7 +36,6 @@ import pytest_socket
 import requests_mock
 import respx
 from syrupy.assertion import SnapshotAssertion
-from syrupy.session import SnapshotSession
 
 from homeassistant import block_async_io
 from homeassistant.exceptions import ServiceNotFound
@@ -93,7 +92,7 @@ from homeassistant.util.async_ import create_eager_task, get_scheduled_timer_han
 from homeassistant.util.json import json_loads
 
 from .ignore_uncaught_exceptions import IGNORE_UNCAUGHT_EXCEPTIONS
-from .syrupy import HomeAssistantSnapshotExtension, override_syrupy_finish
+from .syrupy import HomeAssistantSnapshotExtension
 from .typing import (
     ClientSessionGenerator,
     MockHAClientWebSocket,
@@ -150,11 +149,6 @@ def pytest_configure(config: pytest.Config) -> None:
     if config.getoption("verbose") > 0:
         logging.getLogger().setLevel(logging.DEBUG)
 
-    # Override default finish to detect unused snapshots despite xdist
-    # Temporary workaround until it is finalised inside syrupy
-    # See https://github.com/syrupy-project/syrupy/pull/901
-    SnapshotSession.finish = override_syrupy_finish
-
 
 def pytest_runtest_setup() -> None:
     """Prepare pytest_socket and freezegun.
@@ -1772,30 +1766,10 @@ def mock_bleak_scanner_start() -> Generator[MagicMock]:
 
 
 @pytest.fixture
-def integration_frame_path() -> str:
-    """Return the path to the integration frame.
-
-    Can be parametrized with
-    `@pytest.mark.parametrize("integration_frame_path", ["path_to_frame"])`
-
-    - "custom_components/XYZ" for a custom integration
-    - "homeassistant/components/XYZ" for a core integration
-    - "homeassistant/XYZ" for core (no integration)
-
-    Defaults to core component `hue`
-    """
-    return "homeassistant/components/hue"
-
-
-@pytest.fixture
-def mock_integration_frame(integration_frame_path: str) -> Generator[Mock]:
-    """Mock where we are calling code from.
-
-    Defaults to calling from `hue` core integration, and can be parametrized
-    with `integration_frame_path`.
-    """
+def mock_integration_frame() -> Generator[Mock]:
+    """Mock as if we're calling code from inside an integration."""
     correct_frame = Mock(
-        filename=f"/home/paulus/{integration_frame_path}/light.py",
+        filename="/home/paulus/homeassistant/components/hue/light.py",
         lineno="23",
         line="self.light.is_on",
     )
diff --git a/tests/helpers/test_config_entry_flow.py b/tests/helpers/test_config_entry_flow.py
index 13e28bb8840..498e57d45a4 100644
--- a/tests/helpers/test_config_entry_flow.py
+++ b/tests/helpers/test_config_entry_flow.py
@@ -6,8 +6,8 @@ from unittest.mock import Mock, PropertyMock, patch
 import pytest
 
 from homeassistant import config_entries, data_entry_flow, setup
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers import config_entry_flow
 
 from tests.common import MockConfigEntry, MockModule, mock_integration, mock_platform
diff --git a/tests/helpers/test_deprecation.py b/tests/helpers/test_deprecation.py
index 4cf7e851af3..fbeb0c28736 100644
--- a/tests/helpers/test_deprecation.py
+++ b/tests/helpers/test_deprecation.py
@@ -545,8 +545,8 @@ def test_enum_with_deprecated_members(
         StrEnum,
         metaclass=EnumWithDeprecatedMembers,
         deprecated={
-            "CATS": ("TestEnum.CATS_PER_CM", "2025.11.0"),
-            "DOGS": ("TestEnum.DOGS_PER_CM", None),
+            "CATS": ("CATS_PER_CM", "2025.11.0"),
+            "DOGS": ("DOGS_PER_CM", None),
         },
     ):
         """Zoo units."""
@@ -618,8 +618,8 @@ def test_enum_with_deprecated_members_integration_not_found(
         StrEnum,
         metaclass=EnumWithDeprecatedMembers,
         deprecated={
-            "CATS": ("TestEnum.CATS_PER_CM", "2025.11.0"),
-            "DOGS": ("TestEnum.DOGS_PER_CM", None),
+            "CATS": ("CATS_PER_CM", "2025.11.0"),
+            "DOGS": ("DOGS_PER_CM", None),
         },
     ):
         """Zoo units."""
diff --git a/tests/helpers/test_frame.py b/tests/helpers/test_frame.py
index a2a4890810b..b3fbb0faaf4 100644
--- a/tests/helpers/test_frame.py
+++ b/tests/helpers/test_frame.py
@@ -1,6 +1,5 @@
 """Test the frame helper."""
 
-from typing import Any
 from unittest.mock import ANY, Mock, patch
 
 import pytest
@@ -157,97 +156,6 @@ async def test_get_integration_logger_no_integration(
     assert logger.name == __name__
 
 
-@pytest.mark.parametrize(
-    ("integration_frame_path", "keywords", "expected_error", "expected_log"),
-    [
-        pytest.param(
-            "homeassistant/test_core",
-            {},
-            True,
-            0,
-            id="core default",
-        ),
-        pytest.param(
-            "homeassistant/components/test_core_integration",
-            {},
-            False,
-            1,
-            id="core integration default",
-        ),
-        pytest.param(
-            "custom_components/test_custom_integration",
-            {},
-            False,
-            1,
-            id="custom integration default",
-        ),
-        pytest.param(
-            "custom_components/test_custom_integration",
-            {"custom_integration_behavior": frame.ReportBehavior.IGNORE},
-            False,
-            0,
-            id="custom integration ignore",
-        ),
-        pytest.param(
-            "custom_components/test_custom_integration",
-            {"custom_integration_behavior": frame.ReportBehavior.ERROR},
-            True,
-            1,
-            id="custom integration error",
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            {"core_integration_behavior": frame.ReportBehavior.IGNORE},
-            False,
-            0,
-            id="core_integration_behavior ignore",
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            {"core_integration_behavior": frame.ReportBehavior.ERROR},
-            True,
-            1,
-            id="core_integration_behavior error",
-        ),
-        pytest.param(
-            "homeassistant/test_integration_frame",
-            {"core_behavior": frame.ReportBehavior.IGNORE},
-            False,
-            0,
-            id="core_behavior ignore",
-        ),
-        pytest.param(
-            "homeassistant/test_integration_frame",
-            {"core_behavior": frame.ReportBehavior.LOG},
-            False,
-            1,
-            id="core_behavior log",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("mock_integration_frame")
-async def test_report_usage(
-    caplog: pytest.LogCaptureFixture,
-    keywords: dict[str, Any],
-    expected_error: bool,
-    expected_log: int,
-) -> None:
-    """Test report."""
-
-    what = "test_report_string"
-
-    errored = False
-    try:
-        with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
-            frame.report_usage(what, **keywords)
-    except RuntimeError:
-        errored = True
-
-    assert errored == expected_error
-
-    assert caplog.text.count(what) == expected_log
-
-
 @patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_prevent_flooding(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_integration_frame: Mock
@@ -339,87 +247,3 @@ async def test_report_error_if_integration(
         ),
     ):
         frame.report("did a bad thing", error_if_integration=True)
-
-
-@pytest.mark.parametrize(
-    ("integration_frame_path", "keywords", "expected_error", "expected_log"),
-    [
-        pytest.param(
-            "homeassistant/test_core",
-            {},
-            True,
-            0,
-            id="core default",
-        ),
-        pytest.param(
-            "homeassistant/components/test_core_integration",
-            {},
-            False,
-            1,
-            id="core integration default",
-        ),
-        pytest.param(
-            "custom_components/test_custom_integration",
-            {},
-            False,
-            1,
-            id="custom integration default",
-        ),
-        pytest.param(
-            "custom_components/test_integration_frame",
-            {"log_custom_component_only": True},
-            False,
-            1,
-            id="log_custom_component_only with custom integration",
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            {"log_custom_component_only": True},
-            False,
-            0,
-            id="log_custom_component_only with core integration",
-        ),
-        pytest.param(
-            "homeassistant/test_integration_frame",
-            {"error_if_core": False},
-            False,
-            1,
-            id="disable error_if_core",
-        ),
-        pytest.param(
-            "custom_components/test_integration_frame",
-            {"error_if_integration": True},
-            True,
-            1,
-            id="error_if_integration with custom integration",
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            {"error_if_integration": True},
-            True,
-            1,
-            id="error_if_integration with core integration",
-        ),
-    ],
-)
-@pytest.mark.usefixtures("mock_integration_frame")
-async def test_report(
-    caplog: pytest.LogCaptureFixture,
-    keywords: dict[str, Any],
-    expected_error: bool,
-    expected_log: int,
-) -> None:
-    """Test report."""
-
-    what = "test_report_string"
-
-    errored = False
-    try:
-        with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
-            frame.report(what, **keywords)
-    except RuntimeError:
-        errored = True
-
-    assert errored == expected_error
-
-    assert caplog.text.count(what) == expected_log
diff --git a/tests/helpers/test_llm.py b/tests/helpers/test_llm.py
index cd36fe18933..4d14abb9819 100644
--- a/tests/helpers/test_llm.py
+++ b/tests/helpers/test_llm.py
@@ -374,16 +374,11 @@ async def test_assist_api_prompt(
                         "beer": {"description": "Number of beers"},
                         "wine": {},
                     },
-                },
-                "script_with_no_fields": {
-                    "description": "This is another test script",
-                    "sequence": [],
-                },
+                }
             }
         },
     )
     async_expose_entity(hass, "conversation", "script.test_script", True)
-    async_expose_entity(hass, "conversation", "script.script_with_no_fields", True)
 
     entry = MockConfigEntry(title=None)
     entry.add_to_hass(hass)
@@ -516,10 +511,6 @@ async def test_assist_api_prompt(
         )
     )
     exposed_entities_prompt = """An overview of the areas and the devices in this smart home:
-- names: script_with_no_fields
-  domain: script
-  state: 'off'
-  description: This is another test script
 - names: Kitchen
   domain: light
   state: 'on'
@@ -666,10 +657,6 @@ async def test_script_tool(
                         "extra_field": {"selector": {"area": {}}},
                     },
                 },
-                "script_with_no_fields": {
-                    "description": "This is another test script",
-                    "sequence": [],
-                },
                 "unexposed_script": {
                     "sequence": [],
                 },
@@ -677,7 +664,6 @@ async def test_script_tool(
         },
     )
     async_expose_entity(hass, "conversation", "script.test_script", True)
-    async_expose_entity(hass, "conversation", "script.script_with_no_fields", True)
 
     entity_registry.async_update_entity(
         "script.test_script", name="script name", aliases={"script alias"}
@@ -714,8 +700,7 @@ async def test_script_tool(
         "test_script": (
             "This is a test script. Aliases: ['script name', 'script alias']",
             vol.Schema(schema),
-        ),
-        "script_with_no_fields": ("This is another test script", vol.Schema({})),
+        )
     }
 
     tool_input = llm.ToolInput(
@@ -796,8 +781,7 @@ async def test_script_tool(
         "test_script": (
             "This is a new test script. Aliases: ['script name', 'script alias']",
             vol.Schema(schema),
-        ),
-        "script_with_no_fields": ("This is another test script", vol.Schema({})),
+        )
     }
 
 
diff --git a/tests/helpers/test_network.py b/tests/helpers/test_network.py
index 3064b215f2f..0787c56219f 100644
--- a/tests/helpers/test_network.py
+++ b/tests/helpers/test_network.py
@@ -8,8 +8,8 @@ import pytest
 from yarl import URL
 
 from homeassistant.components import cloud
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant
-from homeassistant.core_config import async_process_ha_core_config
 from homeassistant.helpers.network import (
     NoURLAvailableError,
     _get_cloud_url,
@@ -727,7 +727,7 @@ async def test_get_current_request_url_with_known_host(
 
 
 @patch(
-    "homeassistant.helpers.network.is_hassio",
+    "homeassistant.components.hassio.is_hassio",
     Mock(return_value={"hostname": "homeassistant"}),
 )
 @patch(
diff --git a/tests/helpers/test_schema_config_entry_flow.py b/tests/helpers/test_schema_config_entry_flow.py
index e67525253bc..877e3762d3b 100644
--- a/tests/helpers/test_schema_config_entry_flow.py
+++ b/tests/helpers/test_schema_config_entry_flow.py
@@ -648,10 +648,6 @@ async def test_options_flow_state(hass: HomeAssistant) -> None:
     options_handler = hass.config_entries.options._progress[result["flow_id"]]
     assert options_handler._common_handler.flow_state == {"idx": None}
 
-    # Ensure that self.options and self._common_handler.options refer to the
-    # same mutable copy of the options
-    assert options_handler.options is options_handler._common_handler.options
-
     # In step 1, flow state is updated with user input
     result = await hass.config_entries.options.async_configure(
         result["flow_id"], {"option1": "blublu"}
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index f67519905a1..1bc33140124 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -943,9 +943,18 @@ async def test_wait_basic(hass: HomeAssistant, action_type) -> None:
         assert not script_obj.is_running
         assert script_obj.last_action is None
 
-    expected_var = {"completed": True, "remaining": None}
-
-    if action_type == "trigger":
+    if action_type == "template":
+        assert_action_trace(
+            {
+                "0": [
+                    {
+                        "result": {"wait": {"completed": True, "remaining": None}},
+                        "variables": {"wait": {"completed": True, "remaining": None}},
+                    }
+                ],
+            }
+        )
+    else:
         expected_trigger = {
             "alias": None,
             "attribute": None,
@@ -958,18 +967,23 @@ async def test_wait_basic(hass: HomeAssistant, action_type) -> None:
             "platform": "state",
             "to_state": ANY,
         }
-        expected_var["trigger"] = expected_trigger
-
-    assert_action_trace(
-        {
-            "0": [
-                {
-                    "result": {"wait": expected_var},
-                    "variables": {"wait": expected_var},
-                }
-            ],
-        }
-    )
+        assert_action_trace(
+            {
+                "0": [
+                    {
+                        "result": {
+                            "wait": {
+                                "trigger": expected_trigger,
+                                "remaining": None,
+                            }
+                        },
+                        "variables": {
+                            "wait": {"remaining": None, "trigger": expected_trigger}
+                        },
+                    }
+                ],
+            }
+        )
 
 
 async def test_wait_for_trigger_variables(hass: HomeAssistant) -> None:
@@ -1045,21 +1059,28 @@ async def test_wait_basic_times_out(hass: HomeAssistant, action_type) -> None:
 
     assert timed_out
 
-    expected_var = {"completed": False, "remaining": None}
-
-    if action_type == "trigger":
-        expected_var["trigger"] = None
-
-    assert_action_trace(
-        {
-            "0": [
-                {
-                    "result": {"wait": expected_var},
-                    "variables": {"wait": expected_var},
-                }
-            ],
-        }
-    )
+    if action_type == "template":
+        assert_action_trace(
+            {
+                "0": [
+                    {
+                        "result": {"wait": {"completed": False, "remaining": None}},
+                        "variables": {"wait": {"completed": False, "remaining": None}},
+                    }
+                ],
+            }
+        )
+    else:
+        assert_action_trace(
+            {
+                "0": [
+                    {
+                        "result": {"wait": {"trigger": None, "remaining": None}},
+                        "variables": {"wait": {"remaining": None, "trigger": None}},
+                    }
+                ],
+            }
+        )
 
 
 @pytest.mark.parametrize("action_type", ["template", "trigger"])
@@ -1162,22 +1183,30 @@ async def test_cancel_wait(hass: HomeAssistant, action_type) -> None:
         assert not script_obj.is_running
         assert len(events) == 0
 
-    expected_var = {"completed": False, "remaining": None}
-
-    if action_type == "trigger":
-        expected_var["trigger"] = None
-
-    assert_action_trace(
-        {
-            "0": [
-                {
-                    "result": {"wait": expected_var},
-                    "variables": {"wait": expected_var},
-                }
-            ],
-        },
-        expected_script_execution="cancelled",
-    )
+    if action_type == "template":
+        assert_action_trace(
+            {
+                "0": [
+                    {
+                        "result": {"wait": {"completed": False, "remaining": None}},
+                        "variables": {"wait": {"completed": False, "remaining": None}},
+                    }
+                ],
+            },
+            expected_script_execution="cancelled",
+        )
+    else:
+        assert_action_trace(
+            {
+                "0": [
+                    {
+                        "result": {"wait": {"trigger": None, "remaining": None}},
+                        "variables": {"wait": {"remaining": None, "trigger": None}},
+                    }
+                ],
+            },
+            expected_script_execution="cancelled",
+        )
 
 
 async def test_wait_template_not_schedule(hass: HomeAssistant) -> None:
@@ -1265,11 +1294,10 @@ async def test_wait_timeout(
         assert len(events) == 1
         assert "(timeout: 0:00:05)" in caplog.text
 
-    variable_wait = {"wait": {"completed": False, "remaining": 0.0}}
-
-    if action_type == "trigger":
-        variable_wait["wait"]["trigger"] = None
-
+    if action_type == "template":
+        variable_wait = {"wait": {"completed": False, "remaining": 0.0}}
+    else:
+        variable_wait = {"wait": {"trigger": None, "remaining": 0.0}}
     expected_trace = {
         "0": [
             {
@@ -1317,7 +1345,7 @@ async def test_wait_trigger_with_zero_timeout(
     assert len(events) == 1
     assert "(timeout: 0:00:00)" in caplog.text
 
-    variable_wait = {"wait": {"completed": False, "trigger": None, "remaining": 0.0}}
+    variable_wait = {"wait": {"trigger": None, "remaining": 0.0}}
     expected_trace = {
         "0": [
             {
@@ -1365,7 +1393,7 @@ async def test_wait_trigger_matches_with_zero_timeout(
     assert len(events) == 1
     assert "(timeout: 0:00:00)" in caplog.text
 
-    variable_wait = {"wait": {"completed": False, "trigger": None, "remaining": 0.0}}
+    variable_wait = {"wait": {"trigger": None, "remaining": 0.0}}
     expected_trace = {
         "0": [
             {
@@ -1505,11 +1533,12 @@ async def test_wait_continue_on_timeout(
         assert not script_obj.is_running
         assert len(events) == n_events
 
-    result_wait = {"wait": {"completed": False, "remaining": 0.0}}
-    if action_type == "trigger":
-        result_wait["wait"]["trigger"] = None
-
-    variable_wait = dict(result_wait)
+    if action_type == "template":
+        result_wait = {"wait": {"completed": False, "remaining": 0.0}}
+        variable_wait = dict(result_wait)
+    else:
+        result_wait = {"wait": {"trigger": None, "remaining": 0.0}}
+        variable_wait = dict(result_wait)
     expected_trace = {
         "0": [{"result": result_wait, "variables": variable_wait}],
     }
@@ -1737,12 +1766,8 @@ async def test_wait_for_trigger_bad(
         {
             "0": [
                 {
-                    "result": {
-                        "wait": {"completed": False, "trigger": None, "remaining": None}
-                    },
-                    "variables": {
-                        "wait": {"completed": False, "remaining": None, "trigger": None}
-                    },
+                    "result": {"wait": {"trigger": None, "remaining": None}},
+                    "variables": {"wait": {"remaining": None, "trigger": None}},
                 }
             ],
         }
@@ -1782,12 +1807,8 @@ async def test_wait_for_trigger_generated_exception(
         {
             "0": [
                 {
-                    "result": {
-                        "wait": {"completed": False, "trigger": None, "remaining": None}
-                    },
-                    "variables": {
-                        "wait": {"completed": False, "remaining": None, "trigger": None}
-                    },
+                    "result": {"wait": {"trigger": None, "remaining": None}},
+                    "variables": {"wait": {"remaining": None, "trigger": None}},
                 }
             ],
         }
@@ -3696,18 +3717,11 @@ async def test_parallel(hass: HomeAssistant, caplog: pytest.LogCaptureFixture) -
             {
                 "result": {
                     "wait": {
-                        "completed": True,
-                        "remaining": None,
-                        "trigger": expected_trigger,
-                    }
-                },
-                "variables": {
-                    "wait": {
-                        "completed": True,
                         "remaining": None,
                         "trigger": expected_trigger,
                     }
                 },
+                "variables": {"wait": {"remaining": None, "trigger": expected_trigger}},
             }
         ],
         "0/parallel/1/sequence/0": [
diff --git a/tests/helpers/test_service.py b/tests/helpers/test_service.py
index d0e1aa34340..b8da913d4c5 100644
--- a/tests/helpers/test_service.py
+++ b/tests/helpers/test_service.py
@@ -347,13 +347,6 @@ def label_mock(hass: HomeAssistant) -> None:
         platform="test",
         device_id=device_has_label1.id,
     )
-    entity_with_label1_from_device_and_different_area = er.RegistryEntry(
-        entity_id="light.with_label1_from_device_diff_area",
-        unique_id="with_label1_from_device_diff_area",
-        platform="test",
-        device_id=device_has_label1.id,
-        area_id=area_without_labels.id,
-    )
     entity_with_label1_and_label2_from_device = er.RegistryEntry(
         entity_id="light.with_label1_and_label2_from_device",
         unique_id="with_label1_and_label2_from_device",
@@ -380,7 +373,6 @@ def label_mock(hass: HomeAssistant) -> None:
             config_entity_with_my_label.entity_id: config_entity_with_my_label,
             entity_with_label1_and_label2_from_device.entity_id: entity_with_label1_and_label2_from_device,
             entity_with_label1_from_device.entity_id: entity_with_label1_from_device,
-            entity_with_label1_from_device_and_different_area.entity_id: entity_with_label1_from_device_and_different_area,
             entity_with_labels_from_device.entity_id: entity_with_labels_from_device,
             entity_with_my_label.entity_id: entity_with_my_label,
             entity_with_no_labels.entity_id: entity_with_no_labels,
@@ -762,7 +754,6 @@ async def test_extract_entity_ids_from_labels(hass: HomeAssistant) -> None:
 
     assert {
         "light.with_label1_from_device",
-        "light.with_label1_from_device_diff_area",
         "light.with_labels_from_device",
         "light.with_label1_and_label2_from_device",
     } == await service.async_extract_entity_ids(hass, call)
diff --git a/tests/helpers/test_update_coordinator.py b/tests/helpers/test_update_coordinator.py
index 50da0ab6332..844aa5053e9 100644
--- a/tests/helpers/test_update_coordinator.py
+++ b/tests/helpers/test_update_coordinator.py
@@ -18,7 +18,7 @@ from homeassistant.exceptions import (
     ConfigEntryError,
     ConfigEntryNotReady,
 )
-from homeassistant.helpers import frame, update_coordinator
+from homeassistant.helpers import update_coordinator
 from homeassistant.util.dt import utcnow
 
 from tests.common import MockConfigEntry, async_fire_time_changed
@@ -638,7 +638,6 @@ async def test_async_config_entry_first_refresh_invalid_state(
 
 
 @pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_async_config_entry_first_refresh_invalid_state_in_integration(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/script/test_gen_requirements_all.py b/tests/script/test_gen_requirements_all.py
index 519a5c21855..793b3de63c5 100644
--- a/tests/script/test_gen_requirements_all.py
+++ b/tests/script/test_gen_requirements_all.py
@@ -1,7 +1,5 @@
 """Tests for the gen_requirements_all script."""
 
-from unittest.mock import patch
-
 from script import gen_requirements_all
 
 
@@ -25,27 +23,3 @@ def test_include_overrides_subsets() -> None:
     for overrides in gen_requirements_all.OVERRIDDEN_REQUIREMENTS_ACTIONS.values():
         for req in overrides["include"]:
             assert req in gen_requirements_all.EXCLUDED_REQUIREMENTS_ALL
-
-
-def test_requirement_override_markers() -> None:
-    """Test override markers are applied to the correct requirements."""
-    data = {
-        "pytest": {
-            "exclude": set(),
-            "include": set(),
-            "markers": {"env-canada": "python_version<'3.13'"},
-        }
-    }
-    with patch.dict(
-        gen_requirements_all.OVERRIDDEN_REQUIREMENTS_ACTIONS, data, clear=True
-    ):
-        assert (
-            gen_requirements_all.process_action_requirement(
-                "env-canada==0.7.2", "pytest"
-            )
-            == "env-canada==0.7.2;python_version<'3.13'"
-        )
-        assert (
-            gen_requirements_all.process_action_requirement("other==1.0", "pytest")
-            == "other==1.0"
-        )
diff --git a/tests/snapshots/test_config_entries.ambr b/tests/snapshots/test_config_entries.ambr
index 51e56f4874e..e30b2824af2 100644
--- a/tests/snapshots/test_config_entries.ambr
+++ b/tests/snapshots/test_config_entries.ambr
@@ -21,83 +21,3 @@
     'version': 1,
   })
 # ---
-# name: test_unique_id_collision_issues
-  IssueRegistryItemSnapshot({
-    'active': True,
-    'breaks_in_ha_version': '2025.11.0',
-    'created': <ANY>,
-    'data': dict({
-      'issue_type': 'config_entry_unique_id_collision',
-      'unique_id': 'group_1',
-    }),
-    'dismissed_version': None,
-    'domain': 'homeassistant',
-    'is_fixable': False,
-    'is_persistent': False,
-    'issue_domain': 'test2',
-    'issue_id': 'config_entry_unique_id_collision_test2_group_1',
-    'learn_more_url': None,
-    'severity': <IssueSeverity.ERROR: 'error'>,
-    'translation_key': 'config_entry_unique_id_collision',
-    'translation_placeholders': dict({
-      'configure_url': '/config/integrations/integration/test2',
-      'domain': 'test2',
-      'titles': "'Mock Title', 'Mock Title', 'Mock Title'",
-      'unique_id': 'group_1',
-    }),
-  })
-# ---
-# name: test_unique_id_collision_issues.1
-  IssueRegistryItemSnapshot({
-    'active': True,
-    'breaks_in_ha_version': '2025.11.0',
-    'created': <ANY>,
-    'data': dict({
-      'issue_type': 'config_entry_unique_id_collision',
-      'unique_id': 'not_unique',
-    }),
-    'dismissed_version': None,
-    'domain': 'homeassistant',
-    'is_fixable': False,
-    'is_persistent': False,
-    'issue_domain': 'test3',
-    'issue_id': 'config_entry_unique_id_collision_test3_not_unique',
-    'learn_more_url': None,
-    'severity': <IssueSeverity.ERROR: 'error'>,
-    'translation_key': 'config_entry_unique_id_collision_many',
-    'translation_placeholders': dict({
-      'configure_url': '/config/integrations/integration/test3',
-      'domain': 'test3',
-      'number_of_entries': '6',
-      'title_limit': '5',
-      'titles': "'Mock Title', 'Mock Title', 'Mock Title', 'Mock Title', 'Mock Title'",
-      'unique_id': 'not_unique',
-    }),
-  })
-# ---
-# name: test_unique_id_collision_issues.2
-  IssueRegistryItemSnapshot({
-    'active': True,
-    'breaks_in_ha_version': '2025.11.0',
-    'created': <ANY>,
-    'data': dict({
-      'issue_type': 'config_entry_unique_id_collision',
-      'unique_id': 'not_unique',
-    }),
-    'dismissed_version': None,
-    'domain': 'homeassistant',
-    'is_fixable': False,
-    'is_persistent': False,
-    'issue_domain': 'test3',
-    'issue_id': 'config_entry_unique_id_collision_test3_not_unique',
-    'learn_more_url': None,
-    'severity': <IssueSeverity.ERROR: 'error'>,
-    'translation_key': 'config_entry_unique_id_collision',
-    'translation_placeholders': dict({
-      'configure_url': '/config/integrations/integration/test3',
-      'domain': 'test3',
-      'titles': "'Mock Title', 'Mock Title', 'Mock Title', 'Mock Title', 'Mock Title'",
-      'unique_id': 'not_unique',
-    }),
-  })
-# ---
diff --git a/tests/syrupy.py b/tests/syrupy.py
index a3b3f763063..268ee59243f 100644
--- a/tests/syrupy.py
+++ b/tests/syrupy.py
@@ -5,22 +5,14 @@ from __future__ import annotations
 from contextlib import suppress
 import dataclasses
 from enum import IntFlag
-import json
-import os
 from pathlib import Path
 from typing import Any
 
 import attr
 import attrs
-import pytest
-from syrupy.constants import EXIT_STATUS_FAIL_UNUSED
-from syrupy.data import Snapshot, SnapshotCollection, SnapshotCollections
 from syrupy.extensions.amber import AmberDataSerializer, AmberSnapshotExtension
 from syrupy.location import PyTestLocation
-from syrupy.report import SnapshotReport
-from syrupy.session import ItemStatus, SnapshotSession
 from syrupy.types import PropertyFilter, PropertyMatcher, PropertyPath, SerializableData
-from syrupy.utils import is_xdist_controller, is_xdist_worker
 import voluptuous as vol
 import voluptuous_serialize
 
@@ -254,164 +246,3 @@ class HomeAssistantSnapshotExtension(AmberSnapshotExtension):
         """
         test_dir = Path(test_location.filepath).parent
         return str(test_dir.joinpath("snapshots"))
-
-
-# Classes and Methods to override default finish behavior in syrupy
-# This is needed to handle the xdist plugin in pytest
-# The default implementation does not handle the xdist plugin
-# and will not work correctly when running tests in parallel
-# with pytest-xdist.
-# Temporary workaround until it is finalised inside syrupy
-# See https://github.com/syrupy-project/syrupy/pull/901
-
-
-class _FakePytestObject:
-    """Fake object."""
-
-    def __init__(self, collected_item: dict[str, str]) -> None:
-        """Initialise fake object."""
-        self.__module__ = collected_item["modulename"]
-        self.__name__ = collected_item["methodname"]
-
-
-class _FakePytestItem:
-    """Fake pytest.Item object."""
-
-    def __init__(self, collected_item: dict[str, str]) -> None:
-        """Initialise fake pytest.Item object."""
-        self.nodeid = collected_item["nodeid"]
-        self.name = collected_item["name"]
-        self.path = Path(collected_item["path"])
-        self.obj = _FakePytestObject(collected_item)
-
-
-def _serialize_collections(collections: SnapshotCollections) -> dict[str, Any]:
-    return {
-        k: [c.name for c in v] for k, v in collections._snapshot_collections.items()
-    }
-
-
-def _serialize_report(
-    report: SnapshotReport,
-    collected_items: set[pytest.Item],
-    selected_items: dict[str, ItemStatus],
-) -> dict[str, Any]:
-    return {
-        "discovered": _serialize_collections(report.discovered),
-        "created": _serialize_collections(report.created),
-        "failed": _serialize_collections(report.failed),
-        "matched": _serialize_collections(report.matched),
-        "updated": _serialize_collections(report.updated),
-        "used": _serialize_collections(report.used),
-        "_collected_items": [
-            {
-                "nodeid": c.nodeid,
-                "name": c.name,
-                "path": str(c.path),
-                "modulename": c.obj.__module__,
-                "methodname": c.obj.__name__,
-            }
-            for c in list(collected_items)
-        ],
-        "_selected_items": {
-            key: status.value for key, status in selected_items.items()
-        },
-    }
-
-
-def _merge_serialized_collections(
-    collections: SnapshotCollections, json_data: dict[str, list[str]]
-) -> None:
-    if not json_data:
-        return
-    for location, names in json_data.items():
-        snapshot_collection = SnapshotCollection(location=location)
-        for name in names:
-            snapshot_collection.add(Snapshot(name))
-        collections.update(snapshot_collection)
-
-
-def _merge_serialized_report(report: SnapshotReport, json_data: dict[str, Any]) -> None:
-    _merge_serialized_collections(report.discovered, json_data["discovered"])
-    _merge_serialized_collections(report.created, json_data["created"])
-    _merge_serialized_collections(report.failed, json_data["failed"])
-    _merge_serialized_collections(report.matched, json_data["matched"])
-    _merge_serialized_collections(report.updated, json_data["updated"])
-    _merge_serialized_collections(report.used, json_data["used"])
-    for collected_item in json_data["_collected_items"]:
-        custom_item = _FakePytestItem(collected_item)
-        if not any(
-            t.nodeid == custom_item.nodeid and t.name == custom_item.nodeid
-            for t in report.collected_items
-        ):
-            report.collected_items.add(custom_item)
-    for key, selected_item in json_data["_selected_items"].items():
-        if key in report.selected_items:
-            status = ItemStatus(selected_item)
-            if status != ItemStatus.NOT_RUN:
-                report.selected_items[key] = status
-        else:
-            report.selected_items[key] = ItemStatus(selected_item)
-
-
-def override_syrupy_finish(self: SnapshotSession) -> int:
-    """Override the finish method to allow for custom handling."""
-    exitstatus = 0
-    self.flush_snapshot_write_queue()
-    self.report = SnapshotReport(
-        base_dir=self.pytest_session.config.rootpath,
-        collected_items=self._collected_items,
-        selected_items=self._selected_items,
-        assertions=self._assertions,
-        options=self.pytest_session.config.option,
-    )
-
-    needs_xdist_merge = self.update_snapshots or bool(
-        self.pytest_session.config.option.include_snapshot_details
-    )
-
-    if is_xdist_worker():
-        if not needs_xdist_merge:
-            return exitstatus
-        with open(".pytest_syrupy_worker_count", "w", encoding="utf-8") as f:
-            f.write(os.getenv("PYTEST_XDIST_WORKER_COUNT"))
-        with open(
-            f".pytest_syrupy_{os.getenv("PYTEST_XDIST_WORKER")}_result",
-            "w",
-            encoding="utf-8",
-        ) as f:
-            json.dump(
-                _serialize_report(
-                    self.report, self._collected_items, self._selected_items
-                ),
-                f,
-                indent=2,
-            )
-        return exitstatus
-    if is_xdist_controller():
-        return exitstatus
-
-    if needs_xdist_merge:
-        worker_count = None
-        try:
-            with open(".pytest_syrupy_worker_count", encoding="utf-8") as f:
-                worker_count = f.read()
-            os.remove(".pytest_syrupy_worker_count")
-        except FileNotFoundError:
-            pass
-
-        if worker_count:
-            for i in range(int(worker_count)):
-                with open(f".pytest_syrupy_gw{i}_result", encoding="utf-8") as f:
-                    _merge_serialized_report(self.report, json.load(f))
-                os.remove(f".pytest_syrupy_gw{i}_result")
-
-    if self.report.num_unused:
-        if self.update_snapshots:
-            self.remove_unused_snapshots(
-                unused_snapshot_collections=self.report.unused,
-                used_snapshot_collections=self.report.used,
-            )
-        elif not self.warn_unused_snapshots:
-            exitstatus |= EXIT_STATUS_FAIL_UNUSED
-    return exitstatus
diff --git a/tests/test_backup_restore.py b/tests/test_backup_restore.py
deleted file mode 100644
index 44a05c0540e..00000000000
--- a/tests/test_backup_restore.py
+++ /dev/null
@@ -1,215 +0,0 @@
-"""Test methods in backup_restore."""
-
-from pathlib import Path
-import tarfile
-from unittest import mock
-
-import pytest
-
-from homeassistant import backup_restore
-
-from .common import get_test_config_dir
-
-
-@pytest.mark.parametrize(
-    ("side_effect", "content", "expected"),
-    [
-        (FileNotFoundError, "", None),
-        (None, "", None),
-        (
-            None,
-            '{"path": "test"}',
-            backup_restore.RestoreBackupFileContent(backup_file_path=Path("test")),
-        ),
-    ],
-)
-def test_reading_the_instruction_contents(
-    side_effect: Exception | None,
-    content: str,
-    expected: backup_restore.RestoreBackupFileContent | None,
-) -> None:
-    """Test reading the content of the .HA_RESTORE file."""
-    with (
-        mock.patch(
-            "pathlib.Path.read_text",
-            return_value=content,
-            side_effect=side_effect,
-        ),
-    ):
-        read_content = backup_restore.restore_backup_file_content(
-            Path(get_test_config_dir())
-        )
-        assert read_content == expected
-
-
-def test_restoring_backup_that_does_not_exist() -> None:
-    """Test restoring a backup that does not exist."""
-    backup_file_path = Path(get_test_config_dir("backups", "test"))
-    with (
-        mock.patch(
-            "homeassistant.backup_restore.restore_backup_file_content",
-            return_value=backup_restore.RestoreBackupFileContent(
-                backup_file_path=backup_file_path
-            ),
-        ),
-        mock.patch("pathlib.Path.read_text", side_effect=FileNotFoundError),
-        pytest.raises(
-            ValueError, match=f"Backup file {backup_file_path} does not exist"
-        ),
-    ):
-        assert backup_restore.restore_backup(Path(get_test_config_dir())) is False
-
-
-def test_restoring_backup_when_instructions_can_not_be_read() -> None:
-    """Test restoring a backup when instructions can not be read."""
-    with (
-        mock.patch(
-            "homeassistant.backup_restore.restore_backup_file_content",
-            return_value=None,
-        ),
-    ):
-        assert backup_restore.restore_backup(Path(get_test_config_dir())) is False
-
-
-def test_restoring_backup_that_is_not_a_file() -> None:
-    """Test restoring a backup that is not a file."""
-    backup_file_path = Path(get_test_config_dir("backups", "test"))
-    with (
-        mock.patch(
-            "homeassistant.backup_restore.restore_backup_file_content",
-            return_value=backup_restore.RestoreBackupFileContent(
-                backup_file_path=backup_file_path
-            ),
-        ),
-        mock.patch("pathlib.Path.exists", return_value=True),
-        mock.patch("pathlib.Path.is_file", return_value=False),
-        pytest.raises(
-            ValueError, match=f"Backup file {backup_file_path} does not exist"
-        ),
-    ):
-        assert backup_restore.restore_backup(Path(get_test_config_dir())) is False
-
-
-def test_aborting_for_older_versions() -> None:
-    """Test that we abort for older versions."""
-    config_dir = Path(get_test_config_dir())
-    backup_file_path = Path(config_dir, "backups", "test.tar")
-
-    def _patched_path_read_text(path: Path, **kwargs):
-        return '{"homeassistant": {"version": "9999.99.99"}, "compressed": false}'
-
-    with (
-        mock.patch(
-            "homeassistant.backup_restore.restore_backup_file_content",
-            return_value=backup_restore.RestoreBackupFileContent(
-                backup_file_path=backup_file_path
-            ),
-        ),
-        mock.patch("securetar.SecureTarFile"),
-        mock.patch("homeassistant.backup_restore.TemporaryDirectory"),
-        mock.patch("pathlib.Path.read_text", _patched_path_read_text),
-        mock.patch("homeassistant.backup_restore.HA_VERSION", "2013.09.17"),
-        pytest.raises(
-            ValueError,
-            match="You need at least Home Assistant version 9999.99.99 to restore this backup",
-        ),
-    ):
-        assert backup_restore.restore_backup(config_dir) is True
-
-
-def test_removal_of_current_configuration_when_restoring() -> None:
-    """Test that we are removing the current configuration directory."""
-    config_dir = Path(get_test_config_dir())
-    backup_file_path = Path(config_dir, "backups", "test.tar")
-    mock_config_dir = [
-        {"path": Path(config_dir, ".HA_RESTORE"), "is_file": True},
-        {"path": Path(config_dir, ".HA_VERSION"), "is_file": True},
-        {"path": Path(config_dir, "backups"), "is_file": False},
-        {"path": Path(config_dir, "www"), "is_file": False},
-    ]
-
-    def _patched_path_read_text(path: Path, **kwargs):
-        return '{"homeassistant": {"version": "2013.09.17"}, "compressed": false}'
-
-    def _patched_path_is_file(path: Path, **kwargs):
-        return [x for x in mock_config_dir if x["path"] == path][0]["is_file"]
-
-    def _patched_path_is_dir(path: Path, **kwargs):
-        return not [x for x in mock_config_dir if x["path"] == path][0]["is_file"]
-
-    with (
-        mock.patch(
-            "homeassistant.backup_restore.restore_backup_file_content",
-            return_value=backup_restore.RestoreBackupFileContent(
-                backup_file_path=backup_file_path
-            ),
-        ),
-        mock.patch("securetar.SecureTarFile"),
-        mock.patch("homeassistant.backup_restore.TemporaryDirectory"),
-        mock.patch("homeassistant.backup_restore.HA_VERSION", "2013.09.17"),
-        mock.patch("pathlib.Path.read_text", _patched_path_read_text),
-        mock.patch("pathlib.Path.is_file", _patched_path_is_file),
-        mock.patch("pathlib.Path.is_dir", _patched_path_is_dir),
-        mock.patch(
-            "pathlib.Path.iterdir",
-            return_value=[x["path"] for x in mock_config_dir],
-        ),
-        mock.patch("pathlib.Path.unlink") as unlink_mock,
-        mock.patch("shutil.rmtree") as rmtreemock,
-    ):
-        assert backup_restore.restore_backup(config_dir) is True
-        assert unlink_mock.call_count == 2
-        assert (
-            rmtreemock.call_count == 1
-        )  # We have 2 directories in the config directory, but backups is kept
-
-        removed_directories = {Path(call.args[0]) for call in rmtreemock.mock_calls}
-        assert removed_directories == {Path(config_dir, "www")}
-
-
-def test_extracting_the_contents_of_a_backup_file() -> None:
-    """Test extracting the contents of a backup file."""
-    config_dir = Path(get_test_config_dir())
-    backup_file_path = Path(config_dir, "backups", "test.tar")
-
-    def _patched_path_read_text(path: Path, **kwargs):
-        return '{"homeassistant": {"version": "2013.09.17"}, "compressed": false}'
-
-    getmembers_mock = mock.MagicMock(
-        return_value=[
-            tarfile.TarInfo(name="data"),
-            tarfile.TarInfo(name="data/../test"),
-            tarfile.TarInfo(name="data/.HA_VERSION"),
-            tarfile.TarInfo(name="data/.storage"),
-            tarfile.TarInfo(name="data/www"),
-        ]
-    )
-    extractall_mock = mock.MagicMock()
-
-    with (
-        mock.patch(
-            "homeassistant.backup_restore.restore_backup_file_content",
-            return_value=backup_restore.RestoreBackupFileContent(
-                backup_file_path=backup_file_path
-            ),
-        ),
-        mock.patch(
-            "tarfile.open",
-            return_value=mock.MagicMock(
-                getmembers=getmembers_mock,
-                extractall=extractall_mock,
-                __iter__=lambda x: iter(getmembers_mock.return_value),
-            ),
-        ),
-        mock.patch("homeassistant.backup_restore.TemporaryDirectory"),
-        mock.patch("pathlib.Path.read_text", _patched_path_read_text),
-        mock.patch("pathlib.Path.is_file", return_value=False),
-        mock.patch("pathlib.Path.iterdir", return_value=[]),
-    ):
-        assert backup_restore.restore_backup(config_dir) is True
-        assert getmembers_mock.call_count == 1
-        assert extractall_mock.call_count == 2
-
-        assert {
-            member.name for member in extractall_mock.mock_calls[-1].kwargs["members"]
-        } == {".HA_VERSION", ".storage", "www"}
diff --git a/tests/test_config.py b/tests/test_config.py
index c8c5b081119..02f8e1fc078 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -4,32 +4,62 @@ import asyncio
 from collections import OrderedDict
 from collections.abc import Generator
 import contextlib
+import copy
 import logging
 import os
 from pathlib import Path
+from typing import Any
 from unittest import mock
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
 import voluptuous as vol
+from voluptuous import Invalid, MultipleInvalid
 import yaml
 
 from homeassistant import loader
 import homeassistant.config as config_util
-from homeassistant.const import CONF_PACKAGES, __version__
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.const import (
+    ATTR_ASSUMED_STATE,
+    ATTR_FRIENDLY_NAME,
+    CONF_AUTH_MFA_MODULES,
+    CONF_AUTH_PROVIDERS,
+    CONF_CUSTOMIZE,
+    CONF_LATITUDE,
+    CONF_LONGITUDE,
+    CONF_NAME,
+    CONF_PACKAGES,
+    __version__,
+)
+from homeassistant.core import (
+    DOMAIN as HOMEASSISTANT_DOMAIN,
+    ConfigSource,
+    HomeAssistant,
+    State,
+)
 from homeassistant.exceptions import ConfigValidationError, HomeAssistantError
-from homeassistant.helpers import check_config, config_validation as cv
+from homeassistant.helpers import (
+    check_config,
+    config_validation as cv,
+    issue_registry as ir,
+)
+from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import Integration, async_get_integration
 from homeassistant.setup import async_setup_component
+from homeassistant.util.unit_system import (
+    METRIC_SYSTEM,
+    US_CUSTOMARY_SYSTEM,
+    UnitSystem,
+)
 from homeassistant.util.yaml import SECRET_YAML
 from homeassistant.util.yaml.objects import NodeDictClass
 
 from .common import (
     MockModule,
     MockPlatform,
+    MockUser,
     get_test_config_dir,
     mock_integration,
     mock_platform,
@@ -479,6 +509,104 @@ async def test_create_default_config_returns_none_if_write_error(
     assert mock_print.called
 
 
+def test_core_config_schema() -> None:
+    """Test core config schema."""
+    for value in (
+        {"unit_system": "K"},
+        {"time_zone": "non-exist"},
+        {"latitude": "91"},
+        {"longitude": -181},
+        {"external_url": "not an url"},
+        {"internal_url": "not an url"},
+        {"currency", 100},
+        {"customize": "bla"},
+        {"customize": {"light.sensor": 100}},
+        {"customize": {"entity_id": []}},
+        {"country": "xx"},
+        {"language": "xx"},
+        {"radius": -10},
+    ):
+        with pytest.raises(MultipleInvalid):
+            config_util.CORE_CONFIG_SCHEMA(value)
+
+    config_util.CORE_CONFIG_SCHEMA(
+        {
+            "name": "Test name",
+            "latitude": "-23.45",
+            "longitude": "123.45",
+            "external_url": "https://www.example.com",
+            "internal_url": "http://example.local",
+            "unit_system": "metric",
+            "currency": "USD",
+            "customize": {"sensor.temperature": {"hidden": True}},
+            "country": "SE",
+            "language": "sv",
+            "radius": "10",
+        }
+    )
+
+
+def test_core_config_schema_internal_external_warning(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that we warn for internal/external URL with path."""
+    config_util.CORE_CONFIG_SCHEMA(
+        {
+            "external_url": "https://www.example.com/bla",
+            "internal_url": "http://example.local/yo",
+        }
+    )
+
+    assert "Invalid external_url set" in caplog.text
+    assert "Invalid internal_url set" in caplog.text
+
+
+def test_customize_dict_schema() -> None:
+    """Test basic customize config validation."""
+    values = ({ATTR_FRIENDLY_NAME: None}, {ATTR_ASSUMED_STATE: "2"})
+
+    for val in values:
+        with pytest.raises(MultipleInvalid):
+            config_util.CUSTOMIZE_DICT_SCHEMA(val)
+
+    assert config_util.CUSTOMIZE_DICT_SCHEMA(
+        {ATTR_FRIENDLY_NAME: 2, ATTR_ASSUMED_STATE: "0"}
+    ) == {ATTR_FRIENDLY_NAME: "2", ATTR_ASSUMED_STATE: False}
+
+
+def test_customize_glob_is_ordered() -> None:
+    """Test that customize_glob preserves order."""
+    conf = config_util.CORE_CONFIG_SCHEMA({"customize_glob": OrderedDict()})
+    assert isinstance(conf["customize_glob"], OrderedDict)
+
+
+async def _compute_state(hass: HomeAssistant, config: dict[str, Any]) -> State | None:
+    await config_util.async_process_ha_core_config(hass, config)
+
+    entity = Entity()
+    entity.entity_id = "test.test"
+    entity.hass = hass
+    entity.schedule_update_ha_state()
+
+    await hass.async_block_till_done()
+
+    return hass.states.get("test.test")
+
+
+async def test_entity_customization(hass: HomeAssistant) -> None:
+    """Test entity customization through configuration."""
+    config = {
+        CONF_LATITUDE: 50,
+        CONF_LONGITUDE: 50,
+        CONF_NAME: "Test",
+        CONF_CUSTOMIZE: {"test.test": {"hidden": True}},
+    }
+
+    state = await _compute_state(hass, config)
+
+    assert state.attributes["hidden"]
+
+
 @patch("homeassistant.config.shutil")
 @patch("homeassistant.config.os")
 @patch("homeassistant.config.is_docker_env", return_value=False)
@@ -568,6 +696,361 @@ def test_config_upgrade_no_file(hass: HomeAssistant) -> None:
         assert opened_file.write.call_args == mock.call(__version__)
 
 
+async def test_loading_configuration_from_storage(
+    hass: HomeAssistant, hass_storage: dict[str, Any]
+) -> None:
+    """Test loading core config onto hass object."""
+    hass_storage["core.config"] = {
+        "data": {
+            "elevation": 10,
+            "latitude": 55,
+            "location_name": "Home",
+            "longitude": 13,
+            "time_zone": "Europe/Copenhagen",
+            "unit_system": "metric",
+            "external_url": "https://www.example.com",
+            "internal_url": "http://example.local",
+            "currency": "EUR",
+            "country": "SE",
+            "language": "sv",
+            "radius": 150,
+        },
+        "key": "core.config",
+        "version": 1,
+        "minor_version": 4,
+    }
+    await config_util.async_process_ha_core_config(
+        hass, {"allowlist_external_dirs": "/etc"}
+    )
+
+    assert hass.config.latitude == 55
+    assert hass.config.longitude == 13
+    assert hass.config.elevation == 10
+    assert hass.config.location_name == "Home"
+    assert hass.config.units is METRIC_SYSTEM
+    assert hass.config.time_zone == "Europe/Copenhagen"
+    assert hass.config.external_url == "https://www.example.com"
+    assert hass.config.internal_url == "http://example.local"
+    assert hass.config.currency == "EUR"
+    assert hass.config.country == "SE"
+    assert hass.config.language == "sv"
+    assert hass.config.radius == 150
+    assert len(hass.config.allowlist_external_dirs) == 3
+    assert "/etc" in hass.config.allowlist_external_dirs
+    assert hass.config.config_source is ConfigSource.STORAGE
+
+
+async def test_loading_configuration_from_storage_with_yaml_only(
+    hass: HomeAssistant, hass_storage: dict[str, Any]
+) -> None:
+    """Test loading core and YAML config onto hass object."""
+    hass_storage["core.config"] = {
+        "data": {
+            "elevation": 10,
+            "latitude": 55,
+            "location_name": "Home",
+            "longitude": 13,
+            "time_zone": "Europe/Copenhagen",
+            "unit_system": "metric",
+        },
+        "key": "core.config",
+        "version": 1,
+    }
+    await config_util.async_process_ha_core_config(
+        hass, {"media_dirs": {"mymedia": "/usr"}, "allowlist_external_dirs": "/etc"}
+    )
+
+    assert hass.config.latitude == 55
+    assert hass.config.longitude == 13
+    assert hass.config.elevation == 10
+    assert hass.config.location_name == "Home"
+    assert hass.config.units is METRIC_SYSTEM
+    assert hass.config.time_zone == "Europe/Copenhagen"
+    assert len(hass.config.allowlist_external_dirs) == 3
+    assert "/etc" in hass.config.allowlist_external_dirs
+    assert hass.config.media_dirs == {"mymedia": "/usr"}
+    assert hass.config.config_source is ConfigSource.STORAGE
+
+
+async def test_migration_and_updating_configuration(
+    hass: HomeAssistant, hass_storage: dict[str, Any]
+) -> None:
+    """Test updating configuration stores the new configuration."""
+    core_data = {
+        "data": {
+            "elevation": 10,
+            "latitude": 55,
+            "location_name": "Home",
+            "longitude": 13,
+            "time_zone": "Europe/Copenhagen",
+            "unit_system": "imperial",
+            "external_url": "https://www.example.com",
+            "internal_url": "http://example.local",
+            "currency": "BTC",
+        },
+        "key": "core.config",
+        "version": 1,
+        "minor_version": 1,
+    }
+    hass_storage["core.config"] = dict(core_data)
+    await config_util.async_process_ha_core_config(
+        hass, {"allowlist_external_dirs": "/etc"}
+    )
+    await hass.config.async_update(latitude=50, currency="USD")
+
+    expected_new_core_data = copy.deepcopy(core_data)
+    # From async_update above
+    expected_new_core_data["data"]["latitude"] = 50
+    expected_new_core_data["data"]["currency"] = "USD"
+    # 1.1 -> 1.2 store migration with migrated unit system
+    expected_new_core_data["data"]["unit_system_v2"] = "us_customary"
+    # 1.1 -> 1.3 defaults for country and language
+    expected_new_core_data["data"]["country"] = None
+    expected_new_core_data["data"]["language"] = "en"
+    # 1.1 -> 1.4 defaults for zone radius
+    expected_new_core_data["data"]["radius"] = 100
+    # Bumped minor version
+    expected_new_core_data["minor_version"] = 4
+    assert hass_storage["core.config"] == expected_new_core_data
+    assert hass.config.latitude == 50
+    assert hass.config.currency == "USD"
+    assert hass.config.country is None
+    assert hass.config.language == "en"
+    assert hass.config.radius == 100
+
+
+async def test_override_stored_configuration(
+    hass: HomeAssistant, hass_storage: dict[str, Any]
+) -> None:
+    """Test loading core and YAML config onto hass object."""
+    hass_storage["core.config"] = {
+        "data": {
+            "elevation": 10,
+            "latitude": 55,
+            "location_name": "Home",
+            "longitude": 13,
+            "time_zone": "Europe/Copenhagen",
+            "unit_system": "metric",
+        },
+        "key": "core.config",
+        "version": 1,
+    }
+    await config_util.async_process_ha_core_config(
+        hass, {"latitude": 60, "allowlist_external_dirs": "/etc"}
+    )
+
+    assert hass.config.latitude == 60
+    assert hass.config.longitude == 13
+    assert hass.config.elevation == 10
+    assert hass.config.location_name == "Home"
+    assert hass.config.units is METRIC_SYSTEM
+    assert hass.config.time_zone == "Europe/Copenhagen"
+    assert len(hass.config.allowlist_external_dirs) == 3
+    assert "/etc" in hass.config.allowlist_external_dirs
+    assert hass.config.config_source is ConfigSource.YAML
+
+
+async def test_loading_configuration(hass: HomeAssistant) -> None:
+    """Test loading core config onto hass object."""
+    await config_util.async_process_ha_core_config(
+        hass,
+        {
+            "latitude": 60,
+            "longitude": 50,
+            "elevation": 25,
+            "name": "Huis",
+            "unit_system": "imperial",
+            "time_zone": "America/New_York",
+            "allowlist_external_dirs": "/etc",
+            "external_url": "https://www.example.com",
+            "internal_url": "http://example.local",
+            "media_dirs": {"mymedia": "/usr"},
+            "debug": True,
+            "currency": "EUR",
+            "country": "SE",
+            "language": "sv",
+            "radius": 150,
+        },
+    )
+
+    assert hass.config.latitude == 60
+    assert hass.config.longitude == 50
+    assert hass.config.elevation == 25
+    assert hass.config.location_name == "Huis"
+    assert hass.config.units is US_CUSTOMARY_SYSTEM
+    assert hass.config.time_zone == "America/New_York"
+    assert hass.config.external_url == "https://www.example.com"
+    assert hass.config.internal_url == "http://example.local"
+    assert len(hass.config.allowlist_external_dirs) == 3
+    assert "/etc" in hass.config.allowlist_external_dirs
+    assert "/usr" in hass.config.allowlist_external_dirs
+    assert hass.config.media_dirs == {"mymedia": "/usr"}
+    assert hass.config.config_source is ConfigSource.YAML
+    assert hass.config.debug is True
+    assert hass.config.currency == "EUR"
+    assert hass.config.country == "SE"
+    assert hass.config.language == "sv"
+    assert hass.config.radius == 150
+
+
+@pytest.mark.parametrize(
+    ("minor_version", "users", "user_data", "default_language"),
+    [
+        (2, (), {}, "en"),
+        (2, ({"is_owner": True},), {}, "en"),
+        (
+            2,
+            ({"id": "user1", "is_owner": True},),
+            {"user1": {"language": {"language": "sv"}}},
+            "sv",
+        ),
+        (
+            2,
+            ({"id": "user1", "is_owner": False},),
+            {"user1": {"language": {"language": "sv"}}},
+            "en",
+        ),
+        (3, (), {}, "en"),
+        (3, ({"is_owner": True},), {}, "en"),
+        (
+            3,
+            ({"id": "user1", "is_owner": True},),
+            {"user1": {"language": {"language": "sv"}}},
+            "en",
+        ),
+        (
+            3,
+            ({"id": "user1", "is_owner": False},),
+            {"user1": {"language": {"language": "sv"}}},
+            "en",
+        ),
+    ],
+)
+async def test_language_default(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    minor_version,
+    users,
+    user_data,
+    default_language,
+) -> None:
+    """Test language config default to owner user's language during migration.
+
+    This should only happen if the core store version < 1.3
+    """
+    core_data = {
+        "data": {},
+        "key": "core.config",
+        "version": 1,
+        "minor_version": minor_version,
+    }
+    hass_storage["core.config"] = dict(core_data)
+
+    for user_config in users:
+        user = MockUser(**user_config).add_to_hass(hass)
+        if user.id not in user_data:
+            continue
+        storage_key = f"frontend.user_data_{user.id}"
+        hass_storage[storage_key] = {
+            "key": storage_key,
+            "version": 1,
+            "data": user_data[user.id],
+        }
+
+    await config_util.async_process_ha_core_config(
+        hass,
+        {},
+    )
+    assert hass.config.language == default_language
+
+
+async def test_loading_configuration_default_media_dirs_docker(
+    hass: HomeAssistant,
+) -> None:
+    """Test loading core config onto hass object."""
+    with patch("homeassistant.config.is_docker_env", return_value=True):
+        await config_util.async_process_ha_core_config(
+            hass,
+            {
+                "name": "Huis",
+            },
+        )
+
+    assert hass.config.location_name == "Huis"
+    assert len(hass.config.allowlist_external_dirs) == 2
+    assert "/media" in hass.config.allowlist_external_dirs
+    assert hass.config.media_dirs == {"local": "/media"}
+
+
+async def test_loading_configuration_from_packages(hass: HomeAssistant) -> None:
+    """Test loading packages config onto hass object config."""
+    await config_util.async_process_ha_core_config(
+        hass,
+        {
+            "latitude": 39,
+            "longitude": -1,
+            "elevation": 500,
+            "name": "Huis",
+            "unit_system": "metric",
+            "time_zone": "Europe/Madrid",
+            "external_url": "https://www.example.com",
+            "internal_url": "http://example.local",
+            "packages": {
+                "package_1": {"wake_on_lan": None},
+                "package_2": {
+                    "light": {"platform": "hue"},
+                    "media_extractor": None,
+                    "sun": None,
+                },
+            },
+        },
+    )
+
+    # Empty packages not allowed
+    with pytest.raises(MultipleInvalid):
+        await config_util.async_process_ha_core_config(
+            hass,
+            {
+                "latitude": 39,
+                "longitude": -1,
+                "elevation": 500,
+                "name": "Huis",
+                "unit_system": "metric",
+                "time_zone": "Europe/Madrid",
+                "packages": {"empty_package": None},
+            },
+        )
+
+
+@pytest.mark.parametrize(
+    ("unit_system_name", "expected_unit_system"),
+    [
+        ("metric", METRIC_SYSTEM),
+        ("imperial", US_CUSTOMARY_SYSTEM),
+        ("us_customary", US_CUSTOMARY_SYSTEM),
+    ],
+)
+async def test_loading_configuration_unit_system(
+    hass: HomeAssistant, unit_system_name: str, expected_unit_system: UnitSystem
+) -> None:
+    """Test backward compatibility when loading core config."""
+    await config_util.async_process_ha_core_config(
+        hass,
+        {
+            "latitude": 60,
+            "longitude": 50,
+            "elevation": 25,
+            "name": "Huis",
+            "unit_system": unit_system_name,
+            "time_zone": "America/New_York",
+            "external_url": "https://www.example.com",
+            "internal_url": "http://example.local",
+        },
+    )
+
+    assert hass.config.units is expected_unit_system
+
+
 @patch("homeassistant.helpers.check_config.async_check_ha_config_file")
 async def test_check_ha_config_file_correct(mock_check, hass: HomeAssistant) -> None:
     """Check that restart propagates to stop."""
@@ -819,6 +1302,148 @@ async def test_merge_duplicate_keys(
     assert len(config["input_select"]) == 1
 
 
+async def test_merge_customize(hass: HomeAssistant) -> None:
+    """Test loading core config onto hass object."""
+    core_config = {
+        "latitude": 60,
+        "longitude": 50,
+        "elevation": 25,
+        "name": "Huis",
+        "unit_system": "imperial",
+        "time_zone": "GMT",
+        "customize": {"a.a": {"friendly_name": "A"}},
+        "packages": {
+            "pkg1": {"homeassistant": {"customize": {"b.b": {"friendly_name": "BB"}}}}
+        },
+    }
+    await config_util.async_process_ha_core_config(hass, core_config)
+
+    assert hass.data[config_util.DATA_CUSTOMIZE].get("b.b") == {"friendly_name": "BB"}
+
+
+async def test_auth_provider_config(hass: HomeAssistant) -> None:
+    """Test loading auth provider config onto hass object."""
+    core_config = {
+        "latitude": 60,
+        "longitude": 50,
+        "elevation": 25,
+        "name": "Huis",
+        "unit_system": "imperial",
+        "time_zone": "GMT",
+        CONF_AUTH_PROVIDERS: [
+            {"type": "homeassistant"},
+        ],
+        CONF_AUTH_MFA_MODULES: [{"type": "totp"}, {"type": "totp", "id": "second"}],
+    }
+    if hasattr(hass, "auth"):
+        del hass.auth
+    await config_util.async_process_ha_core_config(hass, core_config)
+
+    assert len(hass.auth.auth_providers) == 1
+    assert hass.auth.auth_providers[0].type == "homeassistant"
+    assert len(hass.auth.auth_mfa_modules) == 2
+    assert hass.auth.auth_mfa_modules[0].id == "totp"
+    assert hass.auth.auth_mfa_modules[1].id == "second"
+
+
+async def test_auth_provider_config_default(hass: HomeAssistant) -> None:
+    """Test loading default auth provider config."""
+    core_config = {
+        "latitude": 60,
+        "longitude": 50,
+        "elevation": 25,
+        "name": "Huis",
+        "unit_system": "imperial",
+        "time_zone": "GMT",
+    }
+    if hasattr(hass, "auth"):
+        del hass.auth
+    await config_util.async_process_ha_core_config(hass, core_config)
+
+    assert len(hass.auth.auth_providers) == 1
+    assert hass.auth.auth_providers[0].type == "homeassistant"
+    assert len(hass.auth.auth_mfa_modules) == 1
+    assert hass.auth.auth_mfa_modules[0].id == "totp"
+
+
+async def test_disallowed_auth_provider_config(hass: HomeAssistant) -> None:
+    """Test loading insecure example auth provider is disallowed."""
+    core_config = {
+        "latitude": 60,
+        "longitude": 50,
+        "elevation": 25,
+        "name": "Huis",
+        "unit_system": "imperial",
+        "time_zone": "GMT",
+        CONF_AUTH_PROVIDERS: [
+            {
+                "type": "insecure_example",
+                "users": [
+                    {
+                        "username": "test-user",
+                        "password": "test-pass",
+                        "name": "Test Name",
+                    }
+                ],
+            }
+        ],
+    }
+    with pytest.raises(Invalid):
+        await config_util.async_process_ha_core_config(hass, core_config)
+
+
+async def test_disallowed_duplicated_auth_provider_config(hass: HomeAssistant) -> None:
+    """Test loading insecure example auth provider is disallowed."""
+    core_config = {
+        "latitude": 60,
+        "longitude": 50,
+        "elevation": 25,
+        "name": "Huis",
+        "unit_system": "imperial",
+        "time_zone": "GMT",
+        CONF_AUTH_PROVIDERS: [{"type": "homeassistant"}, {"type": "homeassistant"}],
+    }
+    with pytest.raises(Invalid):
+        await config_util.async_process_ha_core_config(hass, core_config)
+
+
+async def test_disallowed_auth_mfa_module_config(hass: HomeAssistant) -> None:
+    """Test loading insecure example auth mfa module is disallowed."""
+    core_config = {
+        "latitude": 60,
+        "longitude": 50,
+        "elevation": 25,
+        "name": "Huis",
+        "unit_system": "imperial",
+        "time_zone": "GMT",
+        CONF_AUTH_MFA_MODULES: [
+            {
+                "type": "insecure_example",
+                "data": [{"user_id": "mock-user", "pin": "test-pin"}],
+            }
+        ],
+    }
+    with pytest.raises(Invalid):
+        await config_util.async_process_ha_core_config(hass, core_config)
+
+
+async def test_disallowed_duplicated_auth_mfa_module_config(
+    hass: HomeAssistant,
+) -> None:
+    """Test loading insecure example auth mfa module is disallowed."""
+    core_config = {
+        "latitude": 60,
+        "longitude": 50,
+        "elevation": 25,
+        "name": "Huis",
+        "unit_system": "imperial",
+        "time_zone": "GMT",
+        CONF_AUTH_MFA_MODULES: [{"type": "totp"}, {"type": "totp"}],
+    }
+    with pytest.raises(Invalid):
+        await config_util.async_process_ha_core_config(hass, core_config)
+
+
 async def test_merge_split_component_definition(hass: HomeAssistant) -> None:
     """Test components with trailing description in packages are merged."""
     packages = {
@@ -1370,6 +1995,74 @@ def test_identify_config_schema(domain, schema, expected) -> None:
     )
 
 
+async def test_core_config_schema_historic_currency(
+    hass: HomeAssistant, issue_registry: ir.IssueRegistry
+) -> None:
+    """Test core config schema."""
+    await config_util.async_process_ha_core_config(hass, {"currency": "LTT"})
+
+    issue = issue_registry.async_get_issue("homeassistant", "historic_currency")
+    assert issue
+    assert issue.translation_placeholders == {"currency": "LTT"}
+
+
+async def test_core_store_historic_currency(
+    hass: HomeAssistant, hass_storage: dict[str, Any], issue_registry: ir.IssueRegistry
+) -> None:
+    """Test core config store."""
+    core_data = {
+        "data": {
+            "currency": "LTT",
+        },
+        "key": "core.config",
+        "version": 1,
+        "minor_version": 1,
+    }
+    hass_storage["core.config"] = dict(core_data)
+    await config_util.async_process_ha_core_config(hass, {})
+
+    issue_id = "historic_currency"
+    issue = issue_registry.async_get_issue("homeassistant", issue_id)
+    assert issue
+    assert issue.translation_placeholders == {"currency": "LTT"}
+
+    await hass.config.async_update(currency="EUR")
+    issue = issue_registry.async_get_issue("homeassistant", issue_id)
+    assert not issue
+
+
+async def test_core_config_schema_no_country(
+    hass: HomeAssistant, issue_registry: ir.IssueRegistry
+) -> None:
+    """Test core config schema."""
+    await config_util.async_process_ha_core_config(hass, {})
+
+    issue = issue_registry.async_get_issue("homeassistant", "country_not_configured")
+    assert issue
+
+
+async def test_core_store_no_country(
+    hass: HomeAssistant, hass_storage: dict[str, Any], issue_registry: ir.IssueRegistry
+) -> None:
+    """Test core config store."""
+    core_data = {
+        "data": {},
+        "key": "core.config",
+        "version": 1,
+        "minor_version": 1,
+    }
+    hass_storage["core.config"] = dict(core_data)
+    await config_util.async_process_ha_core_config(hass, {})
+
+    issue_id = "country_not_configured"
+    issue = issue_registry.async_get_issue("homeassistant", issue_id)
+    assert issue
+
+    await hass.config.async_update(country="SE")
+    issue = issue_registry.async_get_issue("homeassistant", issue_id)
+    assert not issue
+
+
 async def test_safe_mode(hass: HomeAssistant) -> None:
     """Test safe mode."""
     assert config_util.safe_mode_enabled(hass.config.config_dir) is False
@@ -1789,3 +2482,30 @@ async def test_loading_platforms_gathers(hass: HomeAssistant) -> None:
         ("platform_int", "sensor"),
         ("platform_int2", "sensor"),
     ]
+
+
+async def test_configuration_legacy_template_is_removed(hass: HomeAssistant) -> None:
+    """Test loading core config onto hass object."""
+    await config_util.async_process_ha_core_config(
+        hass,
+        {
+            "latitude": 60,
+            "longitude": 50,
+            "elevation": 25,
+            "name": "Huis",
+            "unit_system": "imperial",
+            "time_zone": "America/New_York",
+            "allowlist_external_dirs": "/etc",
+            "external_url": "https://www.example.com",
+            "internal_url": "http://example.local",
+            "media_dirs": {"mymedia": "/usr"},
+            "legacy_templates": True,
+            "debug": True,
+            "currency": "EUR",
+            "country": "SE",
+            "language": "sv",
+            "radius": 150,
+        },
+    )
+
+    assert not getattr(hass.config, "legacy_templates")
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index 41af8af3f21..cf7e449d054 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -6,7 +6,6 @@ import asyncio
 from collections.abc import Generator
 from datetime import timedelta
 import logging
-import re
 from typing import Any, Self
 from unittest.mock import ANY, AsyncMock, Mock, patch
 
@@ -17,9 +16,9 @@ from syrupy.assertion import SnapshotAssertion
 
 from homeassistant import config_entries, data_entry_flow, loader
 from homeassistant.components import dhcp
+from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONF_NAME,
     EVENT_COMPONENT_LOADED,
     EVENT_HOMEASSISTANT_STARTED,
     EVENT_HOMEASSISTANT_STOP,
@@ -37,11 +36,10 @@ from homeassistant.exceptions import (
     ConfigEntryNotReady,
     HomeAssistantError,
 )
-from homeassistant.helpers import entity_registry as er, frame, issue_registry as ir
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
 from homeassistant.helpers.discovery_flow import DiscoveryKey
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.json import json_dumps
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 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
@@ -87,27 +85,8 @@ def mock_handlers() -> Generator[None]:
             """Mock Reauth."""
             return await self.async_step_reauth_confirm()
 
-    class MockFlowHandler2(config_entries.ConfigFlow):
-        """Define a second mock flow handler."""
-
-        VERSION = 1
-
-        async def async_step_reauth(self, data):
-            """Mock Reauth."""
-            return await self.async_step_reauth_confirm()
-
-        async def async_step_reauth_confirm(self, user_input=None):
-            """Test reauth confirm step."""
-            if user_input is None:
-                return self.async_show_form(
-                    step_id="reauth_confirm",
-                    description_placeholders={CONF_NAME: "Custom title"},
-                )
-            return self.async_abort(reason="test")
-
     with patch.dict(
-        config_entries.HANDLERS,
-        {"comp": MockFlowHandler, "test": MockFlowHandler, "test2": MockFlowHandler2},
+        config_entries.HANDLERS, {"comp": MockFlowHandler, "test": MockFlowHandler}
     ):
         yield
 
@@ -1178,9 +1157,6 @@ async def test_reauth_notification(hass: HomeAssistant) -> None:
     mock_integration(hass, MockModule("test"))
     mock_platform(hass, "test.config_flow", None)
 
-    entry = MockConfigEntry(title="test_title", domain="test")
-    entry.add_to_hass(hass)
-
     class TestFlow(config_entries.ConfigFlow):
         """Test flow."""
 
@@ -1214,11 +1190,7 @@ async def test_reauth_notification(hass: HomeAssistant) -> None:
 
         # Start first reauth flow to assert that reconfigure notification fires
         flow1 = await hass.config_entries.flow.async_init(
-            "test",
-            context={
-                "source": config_entries.SOURCE_REAUTH,
-                "entry_id": entry.entry_id,
-            },
+            "test", context={"source": config_entries.SOURCE_REAUTH}
         )
 
         await hass.async_block_till_done()
@@ -1228,11 +1200,7 @@ async def test_reauth_notification(hass: HomeAssistant) -> None:
         # Start a second reauth flow so we can finish the first and assert that
         # the reconfigure notification persists until the second one is complete
         flow2 = await hass.config_entries.flow.async_init(
-            "test",
-            context={
-                "source": config_entries.SOURCE_REAUTH,
-                "entry_id": entry.entry_id,
-            },
+            "test", context={"source": config_entries.SOURCE_REAUTH}
         )
 
         flow1 = await hass.config_entries.flow.async_configure(flow1["flow_id"], {})
@@ -4779,75 +4747,6 @@ async def test_reauth(
     assert len(hass.config_entries.flow.async_progress()) == 1
 
 
-@pytest.mark.parametrize(
-    "source", [config_entries.SOURCE_REAUTH, config_entries.SOURCE_RECONFIGURE]
-)
-async def test_reauth_reconfigure_missing_entry(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-    source: str,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the async_reauth_helper."""
-    entry = MockConfigEntry(title="test_title", domain="test")
-    entry.add_to_hass(hass)
-
-    mock_setup_entry = AsyncMock(return_value=True)
-    mock_integration(hass, MockModule("test", async_setup_entry=mock_setup_entry))
-    mock_platform(hass, "test.config_flow", None)
-
-    await manager.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    with pytest.raises(
-        RuntimeError,
-        match=f"Detected code that initialises a {source} flow without a link "
-        "to the config entry. Please report this issue.",
-    ):
-        await manager.flow.async_init("test", context={"source": source})
-    await hass.async_block_till_done()
-
-    flows = hass.config_entries.flow.async_progress()
-    assert len(flows) == 0
-
-
-@pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
-@pytest.mark.parametrize(
-    "source", [config_entries.SOURCE_REAUTH, config_entries.SOURCE_RECONFIGURE]
-)
-async def test_reauth_reconfigure_missing_entry_component(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-    source: str,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the async_reauth_helper."""
-    entry = MockConfigEntry(title="test_title", domain="test")
-    entry.add_to_hass(hass)
-
-    mock_setup_entry = AsyncMock(return_value=True)
-    mock_integration(hass, MockModule("test", async_setup_entry=mock_setup_entry))
-    mock_platform(hass, "test.config_flow", None)
-
-    await manager.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    with patch.object(frame, "_REPORTED_INTEGRATIONS", set()):
-        await manager.flow.async_init("test", context={"source": source})
-        await hass.async_block_till_done()
-
-    # Flow still created, but deprecation logged
-    flows = hass.config_entries.flow.async_progress()
-    assert len(flows) == 1
-    assert flows[0]["context"]["source"] == source
-
-    assert (
-        f"Detected that integration 'hue' initialises a {source} flow"
-        " without a link to the config entry at homeassistant/components" in caplog.text
-    )
-
-
 async def test_reconfigure(
     hass: HomeAssistant, manager: config_entries.ConfigEntries
 ) -> None:
@@ -5040,46 +4939,20 @@ async def test_async_wait_component_startup(hass: HomeAssistant) -> None:
     assert "test" in hass.config.components
 
 
-@pytest.mark.parametrize(
-    "integration_frame_path",
-    ["homeassistant/components/my_integration", "homeassistant.core"],
-)
-@pytest.mark.usefixtures("mock_integration_frame")
-async def test_options_flow_with_config_entry_core() -> None:
-    """Test that OptionsFlowWithConfigEntry cannot be used in core."""
-    entry = MockConfigEntry(
-        domain="hue",
-        data={"first": True},
-        options={"sub_dict": {"1": "one"}, "sub_list": ["one"]},
-    )
-
-    with pytest.raises(RuntimeError, match="inherits from OptionsFlowWithConfigEntry"):
-        _ = config_entries.OptionsFlowWithConfigEntry(entry)
-
-
-@pytest.mark.parametrize("integration_frame_path", ["custom_components/my_integration"])
-@pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
-async def test_options_flow_with_config_entry(caplog: pytest.LogCaptureFixture) -> None:
+async def test_options_flow_options_not_mutated() -> None:
     """Test that OptionsFlowWithConfigEntry doesn't mutate entry options."""
     entry = MockConfigEntry(
-        domain="hue",
+        domain="test",
         data={"first": True},
         options={"sub_dict": {"1": "one"}, "sub_list": ["one"]},
     )
 
     options_flow = config_entries.OptionsFlowWithConfigEntry(entry)
-    assert caplog.text == ""  # No deprecation warning for custom components
 
-    # Ensure available at startup
-    assert options_flow.config_entry is entry
-    assert options_flow.options == entry.options
+    options_flow._options["sub_dict"]["2"] = "two"
+    options_flow._options["sub_list"].append("two")
 
-    options_flow.options["sub_dict"]["2"] = "two"
-    options_flow.options["sub_list"].append("two")
-
-    # Ensure it does not mutate the entry options
-    assert options_flow.options == {
+    assert options_flow._options == {
         "sub_dict": {"1": "one", "2": "two"},
         "sub_list": ["one", "two"],
     }
@@ -5107,9 +4980,7 @@ async def test_initializing_flows_canceled_on_shutdown(
         config_entries.HANDLERS, {"comp": MockFlowHandler, "test": MockFlowHandler}
     ):
         task = asyncio.create_task(
-            manager.flow.async_init(
-                "test", context={"source": "reauth", "entry_id": "abc"}
-            )
+            manager.flow.async_init("test", context={"source": "reauth"})
         )
         await hass.async_block_till_done()
         manager.flow.async_shutdown()
@@ -5446,10 +5317,10 @@ async def test_update_entry_and_reload(
 
 
 @pytest.mark.parametrize("unique_id", [["blah", "bleh"], {"key": "value"}])
-async def test_unhashable_unique_id_fails(
+async def test_unhashable_unique_id(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture, unique_id: Any
 ) -> None:
-    """Test the ConfigEntryItems user dict fails unhashable unique_id."""
+    """Test the ConfigEntryItems user dict handles unhashable unique_id."""
     entries = config_entries.ConfigEntryItems(hass)
     entry = config_entries.ConfigEntry(
         data={},
@@ -5464,97 +5335,23 @@ async def test_unhashable_unique_id_fails(
         version=1,
     )
 
-    unique_id_string = re.escape(str(unique_id))
-    with pytest.raises(
-        HomeAssistantError,
-        match=f"The entry unique id {unique_id_string} is not a string.",
-    ):
-        entries[entry.entry_id] = entry
-
-    assert entry.entry_id not in entries
-
-    with pytest.raises(
-        HomeAssistantError,
-        match=f"The entry unique id {unique_id_string} is not a string.",
-    ):
-        entries.get_entry_by_domain_and_unique_id("test", unique_id)
-
-
-@pytest.mark.parametrize("unique_id", [["blah", "bleh"], {"key": "value"}])
-async def test_unhashable_unique_id_fails_on_update(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, unique_id: Any
-) -> None:
-    """Test the ConfigEntryItems user dict fails non-hashable unique_id on update."""
-    entries = config_entries.ConfigEntryItems(hass)
-    entry = config_entries.ConfigEntry(
-        data={},
-        discovery_keys={},
-        domain="test",
-        entry_id="mock_id",
-        minor_version=1,
-        options={},
-        source="test",
-        title="title",
-        unique_id="123",
-        version=1,
-    )
-
     entries[entry.entry_id] = entry
-    assert entry.entry_id in entries
-
-    unique_id_string = re.escape(str(unique_id))
-    with pytest.raises(
-        HomeAssistantError,
-        match=f"The entry unique id {unique_id_string} is not a string.",
-    ):
-        entries.update_unique_id(entry, unique_id)
-
-
-async def test_string_unique_id_no_warning(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the ConfigEntryItems user dict string unique id doesn't log warning."""
-    entries = config_entries.ConfigEntryItems(hass)
-    entry = config_entries.ConfigEntry(
-        data={},
-        discovery_keys={},
-        domain="test",
-        entry_id="mock_id",
-        minor_version=1,
-        options={},
-        source="test",
-        title="title",
-        unique_id="123",
-        version=1,
-    )
-
-    entries[entry.entry_id] = entry
-
     assert (
-        "Config entry 'title' from integration test has an invalid unique_id"
-    ) not in caplog.text
+        "Config entry 'title' from integration test has an invalid unique_id "
+        f"'{unique_id!s}'"
+    ) in caplog.text
 
     assert entry.entry_id in entries
     assert entries[entry.entry_id] is entry
-    assert entries.get_entry_by_domain_and_unique_id("test", "123") == entry
+    assert entries.get_entry_by_domain_and_unique_id("test", unique_id) == entry
     del entries[entry.entry_id]
     assert not entries
-    assert entries.get_entry_by_domain_and_unique_id("test", "123") is None
+    assert entries.get_entry_by_domain_and_unique_id("test", unique_id) is None
 
 
-@pytest.mark.parametrize(
-    ("unique_id", "type_name"),
-    [
-        (123, "int"),
-        (2.3, "float"),
-    ],
-)
-async def test_hashable_unique_id(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    unique_id: Any,
-    type_name: str,
+@pytest.mark.parametrize("unique_id", [123])
+async def test_hashable_non_string_unique_id(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, unique_id: Any
 ) -> None:
     """Test the ConfigEntryItems user dict handles hashable non string unique_id."""
     entries = config_entries.ConfigEntryItems(hass)
@@ -5572,10 +5369,8 @@ async def test_hashable_unique_id(
     )
 
     entries[entry.entry_id] = entry
-
     assert (
         "Config entry 'title' from integration test has an invalid unique_id"
-        f" '{unique_id}' of type {type_name} when a string is expected"
     ) in caplog.text
 
     assert entry.entry_id in entries
@@ -5586,55 +5381,26 @@ async def test_hashable_unique_id(
     assert entries.get_entry_by_domain_and_unique_id("test", unique_id) is None
 
 
-async def test_no_unique_id_no_warning(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the ConfigEntryItems user dict don't log warning with no unique id."""
-    entries = config_entries.ConfigEntryItems(hass)
-    entry = config_entries.ConfigEntry(
-        data={},
-        discovery_keys={},
-        domain="test",
-        entry_id="mock_id",
-        minor_version=1,
-        options={},
-        source="test",
-        title="title",
-        unique_id=None,
-        version=1,
-    )
-
-    entries[entry.entry_id] = entry
-
-    assert (
-        "Config entry 'title' from integration test has an invalid unique_id"
-    ) not in caplog.text
-
-    assert entry.entry_id in entries
-    assert entries[entry.entry_id] is entry
-
-
 @pytest.mark.parametrize(
-    ("context", "user_input", "expected_result"),
+    ("source", "user_input", "expected_result"),
     [
         (
-            {"source": config_entries.SOURCE_IGNORE},
+            config_entries.SOURCE_IGNORE,
             {"unique_id": "blah", "title": "blah"},
             {"type": data_entry_flow.FlowResultType.CREATE_ENTRY},
         ),
         (
-            {"source": config_entries.SOURCE_REAUTH, "entry_id": "1234"},
+            config_entries.SOURCE_REAUTH,
             None,
             {"type": data_entry_flow.FlowResultType.FORM, "step_id": "reauth_confirm"},
         ),
         (
-            {"source": config_entries.SOURCE_RECONFIGURE, "entry_id": "1234"},
+            config_entries.SOURCE_RECONFIGURE,
             None,
             {"type": data_entry_flow.FlowResultType.FORM, "step_id": "reauth_confirm"},
         ),
         (
-            {"source": config_entries.SOURCE_USER},
+            config_entries.SOURCE_USER,
             None,
             {
                 "type": data_entry_flow.FlowResultType.ABORT,
@@ -5647,7 +5413,7 @@ async def test_no_unique_id_no_warning(
 async def test_starting_config_flow_on_single_config_entry(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
-    context: dict[str, Any],
+    source: str,
     user_input: dict,
     expected_result: dict,
 ) -> None:
@@ -5670,7 +5436,6 @@ async def test_starting_config_flow_on_single_config_entry(
     entry = MockConfigEntry(
         domain="comp",
         unique_id="1234",
-        entry_id="1234",
         title="Test",
         data={"vendor": "data"},
         options={"vendor": "options"},
@@ -5679,7 +5444,6 @@ async def test_starting_config_flow_on_single_config_entry(
     ignored_entry = MockConfigEntry(
         domain="comp",
         unique_id="2345",
-        entry_id="2345",
         title="Test",
         data={"vendor": "data"},
         options={"vendor": "options"},
@@ -5694,7 +5458,7 @@ async def test_starting_config_flow_on_single_config_entry(
         return_value=integration,
     ):
         result = await hass.config_entries.flow.async_init(
-            "comp", context=context, data=user_input
+            "comp", context={"source": source}, data=user_input
         )
 
     for key in expected_result:
@@ -5702,42 +5466,34 @@ async def test_starting_config_flow_on_single_config_entry(
 
 
 @pytest.mark.parametrize(
-    ("context", "user_input", "expected_result"),
+    ("source", "user_input", "expected_result"),
     [
         (
-            {"source": config_entries.SOURCE_IGNORE},
+            config_entries.SOURCE_IGNORE,
             {"unique_id": "blah", "title": "blah"},
             {"type": data_entry_flow.FlowResultType.CREATE_ENTRY},
         ),
         (
-            {"source": config_entries.SOURCE_REAUTH, "entry_id": "2345"},
+            config_entries.SOURCE_REAUTH,
             None,
             {"type": data_entry_flow.FlowResultType.FORM, "step_id": "reauth_confirm"},
         ),
         (
-            {"source": config_entries.SOURCE_RECONFIGURE, "entry_id": "2345"},
+            config_entries.SOURCE_RECONFIGURE,
             None,
             {"type": data_entry_flow.FlowResultType.FORM, "step_id": "reauth_confirm"},
         ),
         (
-            {"source": config_entries.SOURCE_USER},
+            config_entries.SOURCE_USER,
             None,
             {"type": data_entry_flow.FlowResultType.ABORT, "reason": "not_implemented"},
         ),
-        (
-            {"source": config_entries.SOURCE_ZEROCONF},
-            None,
-            {
-                "type": data_entry_flow.FlowResultType.ABORT,
-                "reason": "single_instance_allowed",
-            },
-        ),
     ],
 )
 async def test_starting_config_flow_on_single_config_entry_2(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
-    context: dict[str, Any],
+    source: str,
     user_input: dict,
     expected_result: dict,
 ) -> None:
@@ -5760,7 +5516,6 @@ async def test_starting_config_flow_on_single_config_entry_2(
     ignored_entry = MockConfigEntry(
         domain="comp",
         unique_id="2345",
-        entry_id="2345",
         title="Test",
         data={"vendor": "data"},
         options={"vendor": "options"},
@@ -5775,7 +5530,7 @@ async def test_starting_config_flow_on_single_config_entry_2(
         return_value=integration,
     ):
         result = await hass.config_entries.flow.async_init(
-            "comp", context=context, data=user_input
+            "comp", context={"source": source}, data=user_input
         )
 
     for key in expected_result:
@@ -5846,20 +5601,8 @@ async def test_avoid_adding_second_config_entry_on_single_config_entry(
         assert result["translation_domain"] == HOMEASSISTANT_DOMAIN
 
 
-@pytest.mark.parametrize(
-    ("flow_1_unique_id", "flow_2_unique_id"),
-    [
-        (None, None),
-        ("very_unique", "very_unique"),
-        (None, config_entries.DEFAULT_DISCOVERY_UNIQUE_ID),
-        ("very_unique", config_entries.DEFAULT_DISCOVERY_UNIQUE_ID),
-    ],
-)
 async def test_in_progress_get_canceled_when_entry_is_created(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-    flow_1_unique_id: str | None,
-    flow_2_unique_id: str | None,
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
 ) -> None:
     """Test that we abort all in progress flows when a new entry is created on a single instance only integration."""
     integration = loader.Integration(
@@ -5887,15 +5630,6 @@ async def test_in_progress_get_canceled_when_entry_is_created(
             if user_input is not None:
                 return self.async_create_entry(title="Test Title", data=user_input)
 
-            await self.async_set_unique_id(flow_1_unique_id, raise_on_progress=False)
-            return self.async_show_form(step_id="user")
-
-        async def async_step_zeroconfg(self, user_input=None):
-            """Test user step."""
-            if user_input is not None:
-                return self.async_create_entry(title="Test Title", data=user_input)
-
-            await self.async_set_unique_id(flow_2_unique_id, raise_on_progress=False)
             return self.async_show_form(step_id="user")
 
     with (
@@ -7181,13 +6915,8 @@ async def test_async_update_entry_unique_id_collision(
     hass: HomeAssistant,
     manager: config_entries.ConfigEntries,
     caplog: pytest.LogCaptureFixture,
-    issue_registry: ir.IssueRegistry,
 ) -> None:
-    """Test we warn when async_update_entry creates a unique_id collision.
-
-    Also test an issue registry issue is created.
-    """
-    assert len(issue_registry.issues) == 0
+    """Test we warn when async_update_entry creates a unique_id collision."""
 
     entry1 = MockConfigEntry(domain="test", unique_id=None)
     entry2 = MockConfigEntry(domain="test", unique_id="not none")
@@ -7199,11 +6928,9 @@ async def test_async_update_entry_unique_id_collision(
     entry4.add_to_manager(manager)
 
     manager.async_update_entry(entry2, unique_id=None)
-    assert len(issue_registry.issues) == 0
     assert len(caplog.record_tuples) == 0
 
     manager.async_update_entry(entry4, unique_id="very unique")
-    assert len(issue_registry.issues) == 1
     assert len(caplog.record_tuples) == 1
 
     assert (
@@ -7211,130 +6938,6 @@ async def test_async_update_entry_unique_id_collision(
         "'very unique' which is already in use"
     ) in caplog.text
 
-    issue_id = "config_entry_unique_id_collision_test_very unique"
-    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, issue_id)
-
-
-@pytest.mark.parametrize("domain", ["flipr"])
-async def test_async_update_entry_unique_id_collision_allowed_domain(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-    caplog: pytest.LogCaptureFixture,
-    issue_registry: ir.IssueRegistry,
-    domain: str,
-) -> None:
-    """Test we warn when async_update_entry creates a unique_id collision.
-
-    This tests we don't warn and don't create issues for domains which have
-    their own migration path.
-    """
-    assert len(issue_registry.issues) == 0
-
-    entry1 = MockConfigEntry(domain=domain, unique_id=None)
-    entry2 = MockConfigEntry(domain=domain, unique_id="not none")
-    entry3 = MockConfigEntry(domain=domain, unique_id="very unique")
-    entry4 = MockConfigEntry(domain=domain, unique_id="also very unique")
-    entry1.add_to_manager(manager)
-    entry2.add_to_manager(manager)
-    entry3.add_to_manager(manager)
-    entry4.add_to_manager(manager)
-
-    manager.async_update_entry(entry2, unique_id=None)
-    assert len(issue_registry.issues) == 0
-    assert len(caplog.record_tuples) == 0
-
-    manager.async_update_entry(entry4, unique_id="very unique")
-    assert len(issue_registry.issues) == 0
-    assert len(caplog.record_tuples) == 0
-
-    assert ("already in use") not in caplog.text
-
-
-async def test_unique_id_collision_issues(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-    caplog: pytest.LogCaptureFixture,
-    issue_registry: ir.IssueRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test issue registry issues are created and remove on unique id collision."""
-    assert len(issue_registry.issues) == 0
-
-    mock_setup_entry = AsyncMock(return_value=True)
-    for i in range(3):
-        mock_integration(
-            hass, MockModule(f"test{i+1}", async_setup_entry=mock_setup_entry)
-        )
-        mock_platform(hass, f"test{i+1}.config_flow", None)
-
-    test2_group_1: list[MockConfigEntry] = []
-    test2_group_2: list[MockConfigEntry] = []
-    test3: list[MockConfigEntry] = []
-    for _ in range(3):
-        await manager.async_add(MockConfigEntry(domain="test1", unique_id=None))
-        test2_group_1.append(MockConfigEntry(domain="test2", unique_id="group_1"))
-        test2_group_2.append(MockConfigEntry(domain="test2", unique_id="group_2"))
-        await manager.async_add(test2_group_1[-1])
-        await manager.async_add(test2_group_2[-1])
-    for _ in range(6):
-        test3.append(MockConfigEntry(domain="test3", unique_id="not_unique"))
-        await manager.async_add(test3[-1])
-    # Add an ignored config entry
-    await manager.async_add(
-        MockConfigEntry(
-            domain="test2", unique_id="group_1", source=config_entries.SOURCE_IGNORE
-        )
-    )
-
-    # Check we get one issue for domain test2 and one issue for domain test3
-    assert len(issue_registry.issues) == 2
-    issue_id = "config_entry_unique_id_collision_test2_group_1"
-    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, issue_id) == snapshot
-    issue_id = "config_entry_unique_id_collision_test3_not_unique"
-    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, issue_id) == snapshot
-
-    # Remove one config entry for domain test3, the translations should be updated
-    await manager.async_remove(test3[0].entry_id)
-    assert set(issue_registry.issues) == {
-        (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_1"),
-        (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test3_not_unique"),
-    }
-    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, issue_id) == snapshot
-
-    # Remove all but two config entries for domain test 3
-    for i in range(3):
-        await manager.async_remove(test3[1 + i].entry_id)
-        assert set(issue_registry.issues) == {
-            (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_1"),
-            (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test3_not_unique"),
-        }
-
-    # Remove the last test3 duplicate, the issue is cleared
-    await manager.async_remove(test3[-1].entry_id)
-    assert set(issue_registry.issues) == {
-        (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_1"),
-    }
-
-    await manager.async_remove(test2_group_1[0].entry_id)
-    assert set(issue_registry.issues) == {
-        (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_1"),
-    }
-
-    # Remove the last test2 group1 duplicate, a new issue is created
-    await manager.async_remove(test2_group_1[1].entry_id)
-    assert set(issue_registry.issues) == {
-        (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_2"),
-    }
-
-    await manager.async_remove(test2_group_2[0].entry_id)
-    assert set(issue_registry.issues) == {
-        (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_2"),
-    }
-
-    # Remove the last test2 group2 duplicate, the issue is cleared
-    await manager.async_remove(test2_group_2[1].entry_id)
-    assert not issue_registry.issues
-
 
 async def test_context_no_leak(hass: HomeAssistant) -> None:
     """Test ensure that config entry context does not leak.
@@ -7403,211 +7006,3 @@ async def test_context_no_leak(hass: HomeAssistant) -> None:
         assert entry.state is config_entries.ConfigEntryState.LOADED
         assert entry.runtime_data is entry
     assert config_entries.current_entry.get() is None
-
-
-async def test_options_flow_config_entry(
-    hass: HomeAssistant, manager: config_entries.ConfigEntries
-) -> None:
-    """Test _config_entry_id and config_entry properties in options flow."""
-    original_entry = MockConfigEntry(domain="test", data={})
-    original_entry.add_to_hass(hass)
-
-    mock_setup_entry = AsyncMock(return_value=True)
-
-    mock_integration(hass, MockModule("test", async_setup_entry=mock_setup_entry))
-    mock_platform(hass, "test.config_flow", None)
-
-    class TestFlow(config_entries.ConfigFlow):
-        """Test flow."""
-
-        @staticmethod
-        @callback
-        def async_get_options_flow(config_entry):
-            """Test options flow."""
-
-            class _OptionsFlow(config_entries.OptionsFlow):
-                """Test flow."""
-
-                def __init__(self) -> None:
-                    """Test initialisation."""
-                    try:
-                        self.init_entry_id = self._config_entry_id
-                    except ValueError as err:
-                        self.init_entry_id = err
-                    try:
-                        self.init_entry = self.config_entry
-                    except ValueError as err:
-                        self.init_entry = err
-
-                async def async_step_init(self, user_input=None):
-                    """Test user step."""
-                    errors = {}
-                    if user_input is not None:
-                        if user_input.get("abort"):
-                            return self.async_abort(reason="abort")
-
-                        errors["entry_id"] = self._config_entry_id
-                        try:
-                            errors["entry"] = self.config_entry
-                        except config_entries.UnknownEntry as err:
-                            errors["entry"] = err
-
-                    return self.async_show_form(step_id="init", errors=errors)
-
-            return _OptionsFlow()
-
-    with mock_config_flow("test", TestFlow):
-        result = await hass.config_entries.options.async_init(original_entry.entry_id)
-
-    options_flow = hass.config_entries.options._progress.get(result["flow_id"])
-    assert isinstance(options_flow, config_entries.OptionsFlow)
-    assert options_flow.handler == original_entry.entry_id
-    assert isinstance(options_flow.init_entry_id, ValueError)
-    assert (
-        str(options_flow.init_entry_id)
-        == "The config entry id is not available during initialisation"
-    )
-    assert isinstance(options_flow.init_entry, ValueError)
-    assert (
-        str(options_flow.init_entry)
-        == "The config entry is not available during initialisation"
-    )
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "init"
-    assert result["errors"] == {}
-
-    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "init"
-    assert result["errors"]["entry_id"] == original_entry.entry_id
-    assert result["errors"]["entry"] is original_entry
-
-    # Bad handler - not linked to a config entry
-    options_flow.handler = "123"
-    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
-    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "init"
-    assert result["errors"]["entry_id"] == "123"
-    assert isinstance(result["errors"]["entry"], config_entries.UnknownEntry)
-    # Reset handler
-    options_flow.handler = original_entry.entry_id
-
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"], {"abort": True}
-    )
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "abort"
-
-
-@pytest.mark.parametrize("integration_frame_path", ["custom_components/my_integration"])
-@pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
-async def test_options_flow_deprecated_config_entry_setter(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test that setting config_entry explicitly still works."""
-    original_entry = MockConfigEntry(domain="my_integration", data={})
-    original_entry.add_to_hass(hass)
-
-    mock_setup_entry = AsyncMock(return_value=True)
-
-    mock_integration(
-        hass, MockModule("my_integration", async_setup_entry=mock_setup_entry)
-    )
-    mock_platform(hass, "my_integration.config_flow", None)
-
-    class TestFlow(config_entries.ConfigFlow):
-        """Test flow."""
-
-        @staticmethod
-        @callback
-        def async_get_options_flow(config_entry):
-            """Test options flow."""
-
-            class _OptionsFlow(config_entries.OptionsFlow):
-                """Test flow."""
-
-                def __init__(self, entry) -> None:
-                    """Test initialisation."""
-                    self.config_entry = entry
-
-                async def async_step_init(self, user_input=None):
-                    """Test user step."""
-                    errors = {}
-                    if user_input is not None:
-                        if user_input.get("abort"):
-                            return self.async_abort(reason="abort")
-
-                        errors["entry_id"] = self._config_entry_id
-                        try:
-                            errors["entry"] = self.config_entry
-                        except config_entries.UnknownEntry as err:
-                            errors["entry"] = err
-
-                    return self.async_show_form(step_id="init", errors=errors)
-
-            return _OptionsFlow(config_entry)
-
-    with mock_config_flow("my_integration", TestFlow):
-        result = await hass.config_entries.options.async_init(original_entry.entry_id)
-
-    options_flow = hass.config_entries.options._progress.get(result["flow_id"])
-    assert options_flow.config_entry is original_entry
-
-    assert (
-        "Detected that custom integration 'my_integration' sets option flow "
-        "config_entry explicitly, which is deprecated and will stop working "
-        "in 2025.12" in caplog.text
-    )
-
-
-async def test_add_description_placeholder_automatically(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-) -> None:
-    """Test entry title is added automatically to reauth flows description placeholder."""
-
-    entry = MockConfigEntry(title="test_title", domain="test")
-
-    mock_setup_entry = AsyncMock(side_effect=ConfigEntryAuthFailed())
-    mock_integration(hass, MockModule("test", async_setup_entry=mock_setup_entry))
-    mock_platform(hass, "test.config_flow", None)
-
-    entry.add_to_hass(hass)
-    await manager.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    flows = hass.config_entries.flow.async_progress_by_handler("test")
-    assert len(flows) == 1
-
-    result = await hass.config_entries.flow.async_configure(flows[0]["flow_id"], None)
-    assert result["type"] == FlowResultType.FORM
-    assert result["description_placeholders"] == {"name": "test_title"}
-
-
-async def test_add_description_placeholder_automatically_not_overwrites(
-    hass: HomeAssistant,
-    manager: config_entries.ConfigEntries,
-) -> None:
-    """Test entry title is not added automatically to reauth flows when custom name exist."""
-
-    entry = MockConfigEntry(title="test_title", domain="test2")
-
-    mock_setup_entry = AsyncMock(side_effect=ConfigEntryAuthFailed())
-    mock_integration(hass, MockModule("test2", async_setup_entry=mock_setup_entry))
-    mock_platform(hass, "test2.config_flow", None)
-
-    entry.add_to_hass(hass)
-    await manager.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-    flows = hass.config_entries.flow.async_progress_by_handler("test2")
-    assert len(flows) == 1
-
-    result = await hass.config_entries.flow.async_configure(flows[0]["flow_id"], None)
-    assert result["type"] == FlowResultType.FORM
-    assert result["description_placeholders"] == {"name": "Custom title"}
diff --git a/tests/test_const.py b/tests/test_const.py
index 87a14ecfe9c..4f604a268c0 100644
--- a/tests/test_const.py
+++ b/tests/test_const.py
@@ -8,7 +8,7 @@ from unittest.mock import Mock, patch
 import pytest
 
 from homeassistant import const
-from homeassistant.components import alarm_control_panel, lock, sensor
+from homeassistant.components import lock, sensor
 
 from .common import (
     extract_stack_to_frame,
@@ -66,14 +66,7 @@ def test_all() -> None:
         "DEVICE_CLASS_",
     )
     + _create_tuples(const.UnitOfApparentPower, "POWER_")
-    + _create_tuples(
-        [
-            const.UnitOfPower.WATT,
-            const.UnitOfPower.KILO_WATT,
-            const.UnitOfPower.BTU_PER_HOUR,
-        ],
-        "POWER_",
-    )
+    + _create_tuples(const.UnitOfPower, "POWER_")
     + _create_tuples(
         [
             const.UnitOfEnergy.KILO_WATT_HOUR,
@@ -225,38 +218,6 @@ def test_deprecated_constants_lock(
     )
 
 
-def _create_tuples_alarm_states(
-    enum: type[Enum], constant_prefix: str, remove_in_version: str
-) -> list[tuple[Enum, str]]:
-    return [
-        (enum_field, constant_prefix, remove_in_version)
-        for enum_field in enum
-        if enum_field
-        not in [
-            lock.LockState.OPEN,
-            lock.LockState.OPENING,
-        ]
-    ]
-
-
-@pytest.mark.parametrize(
-    ("enum", "constant_prefix", "remove_in_version"),
-    _create_tuples_lock_states(
-        alarm_control_panel.AlarmControlPanelState, "STATE_ALARM_", "2025.11"
-    ),
-)
-def test_deprecated_constants_alarm(
-    caplog: pytest.LogCaptureFixture,
-    enum: Enum,
-    constant_prefix: str,
-    remove_in_version: str,
-) -> None:
-    """Test deprecated constants."""
-    import_and_test_deprecated_constant_enum(
-        caplog, const, enum, constant_prefix, remove_in_version
-    )
-
-
 def test_deprecated_unit_of_conductivity_alias() -> None:
     """Test UnitOfConductivity deprecation."""
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 67ed99daa09..9f19a372634 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -9,11 +9,13 @@ import functools
 import gc
 import logging
 import os
+from pathlib import Path
 import re
+from tempfile import TemporaryDirectory
 import threading
 import time
 from typing import Any
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, Mock, PropertyMock, patch
 
 from freezegun import freeze_time
 import pytest
@@ -22,6 +24,7 @@ import voluptuous as vol
 
 from homeassistant.const import (
     ATTR_FRIENDLY_NAME,
+    CONF_UNIT_SYSTEM,
     EVENT_CALL_SERVICE,
     EVENT_CORE_CONFIG_UPDATE,
     EVENT_HOMEASSISTANT_CLOSE,
@@ -34,6 +37,7 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED,
     EVENT_STATE_REPORTED,
     MATCH_ALL,
+    __version__,
 )
 import homeassistant.core as ha
 from homeassistant.core import (
@@ -48,7 +52,6 @@ from homeassistant.core import (
     callback,
     get_release_channel,
 )
-from homeassistant.core_config import Config
 from homeassistant.exceptions import (
     HomeAssistantError,
     InvalidEntityFormatError,
@@ -62,12 +65,12 @@ from homeassistant.setup import async_setup_component
 from homeassistant.util.async_ import create_eager_task
 import homeassistant.util.dt as dt_util
 from homeassistant.util.read_only_dict import ReadOnlyDict
+from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from .common import (
     async_capture_events,
     async_mock_service,
     help_test_all,
-    import_and_test_deprecated_alias,
     import_and_test_deprecated_constant_enum,
 )
 
@@ -1915,6 +1918,173 @@ async def test_serviceregistry_return_response_optional(
     assert response_data == expected_response_data
 
 
+async def test_config_defaults() -> None:
+    """Test config defaults."""
+    hass = Mock()
+    hass.data = {}
+    config = ha.Config(hass, "/test/ha-config")
+    assert config.hass is hass
+    assert config.latitude == 0
+    assert config.longitude == 0
+    assert config.elevation == 0
+    assert config.location_name == "Home"
+    assert config.time_zone == "UTC"
+    assert config.internal_url is None
+    assert config.external_url is None
+    assert config.config_source is ha.ConfigSource.DEFAULT
+    assert config.skip_pip is False
+    assert config.skip_pip_packages == []
+    assert config.components == set()
+    assert config.api is None
+    assert config.config_dir == "/test/ha-config"
+    assert config.allowlist_external_dirs == set()
+    assert config.allowlist_external_urls == set()
+    assert config.media_dirs == {}
+    assert config.recovery_mode is False
+    assert config.legacy_templates is False
+    assert config.currency == "EUR"
+    assert config.country is None
+    assert config.language == "en"
+    assert config.radius == 100
+
+
+async def test_config_path_with_file() -> None:
+    """Test get_config_path method."""
+    hass = Mock()
+    hass.data = {}
+    config = ha.Config(hass, "/test/ha-config")
+    assert config.path("test.conf") == "/test/ha-config/test.conf"
+
+
+async def test_config_path_with_dir_and_file() -> None:
+    """Test get_config_path method."""
+    hass = Mock()
+    hass.data = {}
+    config = ha.Config(hass, "/test/ha-config")
+    assert config.path("dir", "test.conf") == "/test/ha-config/dir/test.conf"
+
+
+async def test_config_as_dict() -> None:
+    """Test as dict."""
+    hass = Mock()
+    hass.data = {}
+    config = ha.Config(hass, "/test/ha-config")
+    type(config.hass.state).value = PropertyMock(return_value="RUNNING")
+    expected = {
+        "latitude": 0,
+        "longitude": 0,
+        "elevation": 0,
+        CONF_UNIT_SYSTEM: METRIC_SYSTEM.as_dict(),
+        "location_name": "Home",
+        "time_zone": "UTC",
+        "components": [],
+        "config_dir": "/test/ha-config",
+        "whitelist_external_dirs": [],
+        "allowlist_external_dirs": [],
+        "allowlist_external_urls": [],
+        "version": __version__,
+        "config_source": ha.ConfigSource.DEFAULT,
+        "recovery_mode": False,
+        "state": "RUNNING",
+        "external_url": None,
+        "internal_url": None,
+        "currency": "EUR",
+        "country": None,
+        "language": "en",
+        "safe_mode": False,
+        "debug": False,
+        "radius": 100,
+    }
+
+    assert expected == config.as_dict()
+
+
+async def test_config_is_allowed_path() -> None:
+    """Test is_allowed_path method."""
+    hass = Mock()
+    hass.data = {}
+    config = ha.Config(hass, "/test/ha-config")
+    with TemporaryDirectory() as tmp_dir:
+        # The created dir is in /tmp. This is a symlink on OS X
+        # causing this test to fail unless we resolve path first.
+        config.allowlist_external_dirs = {os.path.realpath(tmp_dir)}
+
+        test_file = os.path.join(tmp_dir, "test.jpg")
+        await asyncio.get_running_loop().run_in_executor(
+            None, Path(test_file).write_text, "test"
+        )
+
+        valid = [test_file, tmp_dir, os.path.join(tmp_dir, "notfound321")]
+        for path in valid:
+            assert config.is_allowed_path(path)
+
+        config.allowlist_external_dirs = {"/home", "/var"}
+
+        invalid = [
+            "/hass/config/secure",
+            "/etc/passwd",
+            "/root/secure_file",
+            "/var/../etc/passwd",
+            test_file,
+        ]
+        for path in invalid:
+            assert not config.is_allowed_path(path)
+
+        with pytest.raises(AssertionError):
+            config.is_allowed_path(None)
+
+
+async def test_config_is_allowed_external_url() -> None:
+    """Test is_allowed_external_url method."""
+    hass = Mock()
+    hass.data = {}
+    config = ha.Config(hass, "/test/ha-config")
+    config.allowlist_external_urls = [
+        "http://x.com/",
+        "https://y.com/bla/",
+        "https://z.com/images/1.jpg/",
+    ]
+
+    valid = [
+        "http://x.com/1.jpg",
+        "http://x.com",
+        "https://y.com/bla/",
+        "https://y.com/bla/2.png",
+        "https://z.com/images/1.jpg",
+    ]
+    for url in valid:
+        assert config.is_allowed_external_url(url)
+
+    invalid = [
+        "https://a.co",
+        "https://y.com/bla_wrong",
+        "https://y.com/bla/../image.jpg",
+        "https://z.com/images",
+    ]
+    for url in invalid:
+        assert not config.is_allowed_external_url(url)
+
+
+async def test_event_on_update(hass: HomeAssistant) -> None:
+    """Test that event is fired on update."""
+    events = async_capture_events(hass, EVENT_CORE_CONFIG_UPDATE)
+
+    assert hass.config.latitude != 12
+
+    await hass.config.async_update(latitude=12)
+    await hass.async_block_till_done()
+
+    assert hass.config.latitude == 12
+    assert len(events) == 1
+    assert events[0].data == {"latitude": 12}
+
+
+async def test_bad_timezone_raises_value_error(hass: HomeAssistant) -> None:
+    """Test bad timezone raises ValueError."""
+    with pytest.raises(ValueError):
+        await hass.config.async_update(time_zone="not_a_timezone")
+
+
 async def test_start_taking_too_long(caplog: pytest.LogCaptureFixture) -> None:
     """Test when async_start takes too long."""
     hass = ha.HomeAssistant("/test/ha-config")
@@ -2129,6 +2299,53 @@ def test_valid_domain() -> None:
         assert ha.valid_domain(valid), valid
 
 
+async def test_additional_data_in_core_config(
+    hass: HomeAssistant, hass_storage: dict[str, Any]
+) -> None:
+    """Test that we can handle additional data in core configuration."""
+    config = ha.Config(hass, "/test/ha-config")
+    config.async_initialize()
+    hass_storage[ha.CORE_STORAGE_KEY] = {
+        "version": 1,
+        "data": {"location_name": "Test Name", "additional_valid_key": "value"},
+    }
+    await config.async_load()
+    assert config.location_name == "Test Name"
+
+
+async def test_incorrect_internal_external_url(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test that we warn when detecting invalid internal/external url."""
+    config = ha.Config(hass, "/test/ha-config")
+    config.async_initialize()
+
+    hass_storage[ha.CORE_STORAGE_KEY] = {
+        "version": 1,
+        "data": {
+            "internal_url": None,
+            "external_url": None,
+        },
+    }
+    await config.async_load()
+    assert "Invalid external_url set" not in caplog.text
+    assert "Invalid internal_url set" not in caplog.text
+
+    config = ha.Config(hass, "/test/ha-config")
+    config.async_initialize()
+
+    hass_storage[ha.CORE_STORAGE_KEY] = {
+        "version": 1,
+        "data": {
+            "internal_url": "https://community.home-assistant.io/profile",
+            "external_url": "https://www.home-assistant.io/blue",
+        },
+    }
+    await config.async_load()
+    assert "Invalid external_url set" in caplog.text
+    assert "Invalid internal_url set" in caplog.text
+
+
 async def test_start_events(hass: HomeAssistant) -> None:
     """Test events fired when starting Home Assistant."""
     hass.state = ha.CoreState.not_running
@@ -2996,11 +3213,6 @@ def test_deprecated_constants(
     import_and_test_deprecated_constant_enum(caplog, ha, enum, "SOURCE_", "2025.1")
 
 
-def test_deprecated_config(caplog: pytest.LogCaptureFixture) -> None:
-    """Test deprecated Config class."""
-    import_and_test_deprecated_alias(caplog, ha, "Config", Config, "2025.11")
-
-
 def test_one_time_listener_repr(hass: HomeAssistant) -> None:
     """Test one time listener repr."""
 
@@ -3250,6 +3462,28 @@ async def test_async_listen_with_run_immediately_deprecated(
     ) in caplog.text
 
 
+async def test_top_level_components(hass: HomeAssistant) -> None:
+    """Test top level components are updated when components change."""
+    hass.config.components.add("homeassistant")
+    assert hass.config.components == {"homeassistant"}
+    assert hass.config.top_level_components == {"homeassistant"}
+    hass.config.components.add("homeassistant.scene")
+    assert hass.config.components == {"homeassistant", "homeassistant.scene"}
+    assert hass.config.top_level_components == {"homeassistant"}
+    hass.config.components.remove("homeassistant")
+    assert hass.config.components == {"homeassistant.scene"}
+    assert hass.config.top_level_components == set()
+    with pytest.raises(ValueError):
+        hass.config.components.remove("homeassistant.scene")
+    with pytest.raises(NotImplementedError):
+        hass.config.components.discard("homeassistant")
+
+
+async def test_debug_mode_defaults_to_off(hass: HomeAssistant) -> None:
+    """Test debug mode defaults to off."""
+    assert not hass.config.debug
+
+
 async def test_async_fire_thread_safety(hass: HomeAssistant) -> None:
     """Test async_fire thread safety."""
     events = async_capture_events(hass, "test_event")
@@ -3316,6 +3550,19 @@ async def test_thread_safety_message(hass: HomeAssistant) -> None:
         await hass.async_add_executor_job(hass.verify_event_loop_thread, "test")
 
 
+async def test_set_time_zone_deprecated(hass: HomeAssistant) -> None:
+    """Test set_time_zone is deprecated."""
+    with pytest.raises(
+        RuntimeError,
+        match=re.escape(
+            "Detected code that set the time zone using set_time_zone instead of "
+            "async_set_time_zone which will stop working in Home Assistant 2025.6. "
+            "Please report this issue.",
+        ),
+    ):
+        await hass.config.set_time_zone("America/New_York")
+
+
 async def test_async_set_updates_last_reported(hass: HomeAssistant) -> None:
     """Test async_set method updates last_reported AND last_reported_timestamp."""
     hass.states.async_set("light.bowl", "on", {})
diff --git a/tests/test_core_config.py b/tests/test_core_config.py
deleted file mode 100644
index 3e0c0999ad3..00000000000
--- a/tests/test_core_config.py
+++ /dev/null
@@ -1,1083 +0,0 @@
-"""Test core_config."""
-
-import asyncio
-from collections import OrderedDict
-import copy
-import os
-from pathlib import Path
-import re
-from tempfile import TemporaryDirectory
-from typing import Any
-from unittest.mock import Mock, PropertyMock, patch
-
-import pytest
-from voluptuous import Invalid, MultipleInvalid
-from webrtc_models import RTCConfiguration, RTCIceServer
-
-from homeassistant.const import (
-    ATTR_ASSUMED_STATE,
-    ATTR_FRIENDLY_NAME,
-    CONF_AUTH_MFA_MODULES,
-    CONF_AUTH_PROVIDERS,
-    CONF_CUSTOMIZE,
-    CONF_LATITUDE,
-    CONF_LONGITUDE,
-    CONF_NAME,
-    CONF_UNIT_SYSTEM,
-    EVENT_CORE_CONFIG_UPDATE,
-    __version__,
-)
-from homeassistant.core import HomeAssistant, State
-from homeassistant.core_config import (
-    _CUSTOMIZE_DICT_SCHEMA,
-    CORE_CONFIG_SCHEMA,
-    CORE_STORAGE_KEY,
-    DATA_CUSTOMIZE,
-    Config,
-    ConfigSource,
-    _validate_stun_or_turn_url,
-    async_process_ha_core_config,
-)
-from homeassistant.helpers import issue_registry as ir
-from homeassistant.helpers.entity import Entity
-from homeassistant.util.unit_system import (
-    METRIC_SYSTEM,
-    US_CUSTOMARY_SYSTEM,
-    UnitSystem,
-)
-
-from .common import MockUser, async_capture_events
-
-
-def test_core_config_schema() -> None:
-    """Test core config schema."""
-    for value in (
-        {"unit_system": "K"},
-        {"time_zone": "non-exist"},
-        {"latitude": "91"},
-        {"longitude": -181},
-        {"external_url": "not an url"},
-        {"internal_url": "not an url"},
-        {"currency", 100},
-        {"customize": "bla"},
-        {"customize": {"light.sensor": 100}},
-        {"customize": {"entity_id": []}},
-        {"country": "xx"},
-        {"language": "xx"},
-        {"radius": -10},
-        {"webrtc": "bla"},
-        {"webrtc": {}},
-    ):
-        with pytest.raises(MultipleInvalid):
-            CORE_CONFIG_SCHEMA(value)
-
-    CORE_CONFIG_SCHEMA(
-        {
-            "name": "Test name",
-            "latitude": "-23.45",
-            "longitude": "123.45",
-            "external_url": "https://www.example.com",
-            "internal_url": "http://example.local",
-            "unit_system": "metric",
-            "currency": "USD",
-            "customize": {"sensor.temperature": {"hidden": True}},
-            "country": "SE",
-            "language": "sv",
-            "radius": "10",
-            "webrtc": {"ice_servers": [{"url": "stun:custom_stun_server:3478"}]},
-        }
-    )
-
-
-def test_core_config_schema_internal_external_warning(
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test that we warn for internal/external URL with path."""
-    CORE_CONFIG_SCHEMA(
-        {
-            "external_url": "https://www.example.com/bla",
-            "internal_url": "http://example.local/yo",
-        }
-    )
-
-    assert "Invalid external_url set" in caplog.text
-    assert "Invalid internal_url set" in caplog.text
-
-
-def test_customize_dict_schema() -> None:
-    """Test basic customize config validation."""
-    values = ({ATTR_FRIENDLY_NAME: None}, {ATTR_ASSUMED_STATE: "2"})
-
-    for val in values:
-        with pytest.raises(MultipleInvalid):
-            _CUSTOMIZE_DICT_SCHEMA(val)
-
-    assert _CUSTOMIZE_DICT_SCHEMA({ATTR_FRIENDLY_NAME: 2, ATTR_ASSUMED_STATE: "0"}) == {
-        ATTR_FRIENDLY_NAME: "2",
-        ATTR_ASSUMED_STATE: False,
-    }
-
-
-def test_webrtc_schema() -> None:
-    """Test webrtc config validation."""
-    invalid_webrtc_configs = (
-        "bla",
-        {},
-        {"ice_servers": [], "unknown_key": 123},
-        {"ice_servers": [{}]},
-        {"ice_servers": [{"invalid_key": 123}]},
-    )
-
-    valid_webrtc_configs = (
-        (
-            {"ice_servers": []},
-            {"ice_servers": []},
-        ),
-        (
-            {"ice_servers": {"url": "stun:custom_stun_server:3478"}},
-            {"ice_servers": [{"url": ["stun:custom_stun_server:3478"]}]},
-        ),
-        (
-            {"ice_servers": [{"url": "stun:custom_stun_server:3478"}]},
-            {"ice_servers": [{"url": ["stun:custom_stun_server:3478"]}]},
-        ),
-        (
-            {"ice_servers": [{"url": ["stun:custom_stun_server:3478"]}]},
-            {"ice_servers": [{"url": ["stun:custom_stun_server:3478"]}]},
-        ),
-        (
-            {
-                "ice_servers": [
-                    {
-                        "url": ["stun:custom_stun_server:3478"],
-                        "username": "bla",
-                        "credential": "hunter2",
-                    }
-                ]
-            },
-            {
-                "ice_servers": [
-                    {
-                        "url": ["stun:custom_stun_server:3478"],
-                        "username": "bla",
-                        "credential": "hunter2",
-                    }
-                ]
-            },
-        ),
-    )
-
-    for config in invalid_webrtc_configs:
-        with pytest.raises(MultipleInvalid):
-            CORE_CONFIG_SCHEMA({"webrtc": config})
-
-    for config, validated_webrtc in valid_webrtc_configs:
-        validated = CORE_CONFIG_SCHEMA({"webrtc": config})
-        assert validated["webrtc"] == validated_webrtc
-
-
-def test_validate_stun_or_turn_url() -> None:
-    """Test _validate_stun_or_turn_url."""
-    invalid_urls = (
-        "custom_stun_server",
-        "custom_stun_server:3478",
-        "bum:custom_stun_server:3478" "http://blah.com:80",
-    )
-
-    valid_urls = (
-        "stun:custom_stun_server:3478",
-        "turn:custom_stun_server:3478",
-        "stuns:custom_stun_server:3478",
-        "turns:custom_stun_server:3478",
-        # The validator does not reject urls with path
-        "stun:custom_stun_server:3478/path",
-        "turn:custom_stun_server:3478/path",
-        "stuns:custom_stun_server:3478/path",
-        "turns:custom_stun_server:3478/path",
-        # The validator allows any query
-        "stun:custom_stun_server:3478?query",
-        "turn:custom_stun_server:3478?query",
-        "stuns:custom_stun_server:3478?query",
-        "turns:custom_stun_server:3478?query",
-    )
-
-    for url in invalid_urls:
-        with pytest.raises(Invalid):
-            _validate_stun_or_turn_url(url)
-
-    for url in valid_urls:
-        assert _validate_stun_or_turn_url(url) == url
-
-
-def test_customize_glob_is_ordered() -> None:
-    """Test that customize_glob preserves order."""
-    conf = CORE_CONFIG_SCHEMA({"customize_glob": OrderedDict()})
-    assert isinstance(conf["customize_glob"], OrderedDict)
-
-
-async def _compute_state(hass: HomeAssistant, config: dict[str, Any]) -> State | None:
-    await async_process_ha_core_config(hass, config)
-
-    entity = Entity()
-    entity.entity_id = "test.test"
-    entity.hass = hass
-    entity.schedule_update_ha_state()
-
-    await hass.async_block_till_done()
-
-    return hass.states.get("test.test")
-
-
-async def test_entity_customization(hass: HomeAssistant) -> None:
-    """Test entity customization through configuration."""
-    config = {
-        CONF_LATITUDE: 50,
-        CONF_LONGITUDE: 50,
-        CONF_NAME: "Test",
-        CONF_CUSTOMIZE: {"test.test": {"hidden": True}},
-    }
-
-    state = await _compute_state(hass, config)
-
-    assert state.attributes["hidden"]
-
-
-async def test_loading_configuration_from_storage(
-    hass: HomeAssistant, hass_storage: dict[str, Any]
-) -> None:
-    """Test loading core config onto hass object."""
-    hass_storage["core.config"] = {
-        "data": {
-            "elevation": 10,
-            "latitude": 55,
-            "location_name": "Home",
-            "longitude": 13,
-            "time_zone": "Europe/Copenhagen",
-            "unit_system": "metric",
-            "external_url": "https://www.example.com",
-            "internal_url": "http://example.local",
-            "currency": "EUR",
-            "country": "SE",
-            "language": "sv",
-            "radius": 150,
-        },
-        "key": "core.config",
-        "version": 1,
-        "minor_version": 4,
-    }
-    await async_process_ha_core_config(hass, {"allowlist_external_dirs": "/etc"})
-
-    assert hass.config.latitude == 55
-    assert hass.config.longitude == 13
-    assert hass.config.elevation == 10
-    assert hass.config.location_name == "Home"
-    assert hass.config.units is METRIC_SYSTEM
-    assert hass.config.time_zone == "Europe/Copenhagen"
-    assert hass.config.external_url == "https://www.example.com"
-    assert hass.config.internal_url == "http://example.local"
-    assert hass.config.currency == "EUR"
-    assert hass.config.country == "SE"
-    assert hass.config.language == "sv"
-    assert hass.config.radius == 150
-    assert len(hass.config.allowlist_external_dirs) == 3
-    assert "/etc" in hass.config.allowlist_external_dirs
-    assert hass.config.config_source is ConfigSource.STORAGE
-
-
-async def test_loading_configuration_from_storage_with_yaml_only(
-    hass: HomeAssistant, hass_storage: dict[str, Any]
-) -> None:
-    """Test loading core and YAML config onto hass object."""
-    hass_storage["core.config"] = {
-        "data": {
-            "elevation": 10,
-            "latitude": 55,
-            "location_name": "Home",
-            "longitude": 13,
-            "time_zone": "Europe/Copenhagen",
-            "unit_system": "metric",
-        },
-        "key": "core.config",
-        "version": 1,
-    }
-    await async_process_ha_core_config(
-        hass, {"media_dirs": {"mymedia": "/usr"}, "allowlist_external_dirs": "/etc"}
-    )
-
-    assert hass.config.latitude == 55
-    assert hass.config.longitude == 13
-    assert hass.config.elevation == 10
-    assert hass.config.location_name == "Home"
-    assert hass.config.units is METRIC_SYSTEM
-    assert hass.config.time_zone == "Europe/Copenhagen"
-    assert len(hass.config.allowlist_external_dirs) == 3
-    assert "/etc" in hass.config.allowlist_external_dirs
-    assert hass.config.media_dirs == {"mymedia": "/usr"}
-    assert hass.config.config_source is ConfigSource.STORAGE
-
-
-async def test_migration_and_updating_configuration(
-    hass: HomeAssistant, hass_storage: dict[str, Any]
-) -> None:
-    """Test updating configuration stores the new configuration."""
-    core_data = {
-        "data": {
-            "elevation": 10,
-            "latitude": 55,
-            "location_name": "Home",
-            "longitude": 13,
-            "time_zone": "Europe/Copenhagen",
-            "unit_system": "imperial",
-            "external_url": "https://www.example.com",
-            "internal_url": "http://example.local",
-            "currency": "BTC",
-        },
-        "key": "core.config",
-        "version": 1,
-        "minor_version": 1,
-    }
-    hass_storage["core.config"] = dict(core_data)
-    await async_process_ha_core_config(hass, {"allowlist_external_dirs": "/etc"})
-    await hass.config.async_update(latitude=50, currency="USD")
-
-    expected_new_core_data = copy.deepcopy(core_data)
-    # From async_update above
-    expected_new_core_data["data"]["latitude"] = 50
-    expected_new_core_data["data"]["currency"] = "USD"
-    # 1.1 -> 1.2 store migration with migrated unit system
-    expected_new_core_data["data"]["unit_system_v2"] = "us_customary"
-    # 1.1 -> 1.3 defaults for country and language
-    expected_new_core_data["data"]["country"] = None
-    expected_new_core_data["data"]["language"] = "en"
-    # 1.1 -> 1.4 defaults for zone radius
-    expected_new_core_data["data"]["radius"] = 100
-    # Bumped minor version
-    expected_new_core_data["minor_version"] = 4
-    assert hass_storage["core.config"] == expected_new_core_data
-    assert hass.config.latitude == 50
-    assert hass.config.currency == "USD"
-    assert hass.config.country is None
-    assert hass.config.language == "en"
-    assert hass.config.radius == 100
-
-
-async def test_override_stored_configuration(
-    hass: HomeAssistant, hass_storage: dict[str, Any]
-) -> None:
-    """Test loading core and YAML config onto hass object."""
-    hass_storage["core.config"] = {
-        "data": {
-            "elevation": 10,
-            "latitude": 55,
-            "location_name": "Home",
-            "longitude": 13,
-            "time_zone": "Europe/Copenhagen",
-            "unit_system": "metric",
-        },
-        "key": "core.config",
-        "version": 1,
-    }
-    await async_process_ha_core_config(
-        hass, {"latitude": 60, "allowlist_external_dirs": "/etc"}
-    )
-
-    assert hass.config.latitude == 60
-    assert hass.config.longitude == 13
-    assert hass.config.elevation == 10
-    assert hass.config.location_name == "Home"
-    assert hass.config.units is METRIC_SYSTEM
-    assert hass.config.time_zone == "Europe/Copenhagen"
-    assert len(hass.config.allowlist_external_dirs) == 3
-    assert "/etc" in hass.config.allowlist_external_dirs
-    assert hass.config.config_source is ConfigSource.YAML
-
-
-async def test_loading_configuration(hass: HomeAssistant) -> None:
-    """Test loading core config onto hass object."""
-    await async_process_ha_core_config(
-        hass,
-        {
-            "latitude": 60,
-            "longitude": 50,
-            "elevation": 25,
-            "name": "Huis",
-            "unit_system": "imperial",
-            "time_zone": "America/New_York",
-            "allowlist_external_dirs": "/etc",
-            "external_url": "https://www.example.com",
-            "internal_url": "http://example.local",
-            "media_dirs": {"mymedia": "/usr"},
-            "debug": True,
-            "currency": "EUR",
-            "country": "SE",
-            "language": "sv",
-            "radius": 150,
-            "webrtc": {"ice_servers": [{"url": "stun:custom_stun_server:3478"}]},
-        },
-    )
-
-    assert hass.config.latitude == 60
-    assert hass.config.longitude == 50
-    assert hass.config.elevation == 25
-    assert hass.config.location_name == "Huis"
-    assert hass.config.units is US_CUSTOMARY_SYSTEM
-    assert hass.config.time_zone == "America/New_York"
-    assert hass.config.external_url == "https://www.example.com"
-    assert hass.config.internal_url == "http://example.local"
-    assert len(hass.config.allowlist_external_dirs) == 3
-    assert "/etc" in hass.config.allowlist_external_dirs
-    assert "/usr" in hass.config.allowlist_external_dirs
-    assert hass.config.media_dirs == {"mymedia": "/usr"}
-    assert hass.config.config_source is ConfigSource.YAML
-    assert hass.config.debug is True
-    assert hass.config.currency == "EUR"
-    assert hass.config.country == "SE"
-    assert hass.config.language == "sv"
-    assert hass.config.radius == 150
-    assert hass.config.webrtc == RTCConfiguration(
-        [RTCIceServer(urls=["stun:custom_stun_server:3478"])]
-    )
-
-
-@pytest.mark.parametrize(
-    ("minor_version", "users", "user_data", "default_language"),
-    [
-        (2, (), {}, "en"),
-        (2, ({"is_owner": True},), {}, "en"),
-        (
-            2,
-            ({"id": "user1", "is_owner": True},),
-            {"user1": {"language": {"language": "sv"}}},
-            "sv",
-        ),
-        (
-            2,
-            ({"id": "user1", "is_owner": False},),
-            {"user1": {"language": {"language": "sv"}}},
-            "en",
-        ),
-        (3, (), {}, "en"),
-        (3, ({"is_owner": True},), {}, "en"),
-        (
-            3,
-            ({"id": "user1", "is_owner": True},),
-            {"user1": {"language": {"language": "sv"}}},
-            "en",
-        ),
-        (
-            3,
-            ({"id": "user1", "is_owner": False},),
-            {"user1": {"language": {"language": "sv"}}},
-            "en",
-        ),
-    ],
-)
-async def test_language_default(
-    hass: HomeAssistant,
-    hass_storage: dict[str, Any],
-    minor_version,
-    users,
-    user_data,
-    default_language,
-) -> None:
-    """Test language config default to owner user's language during migration.
-
-    This should only happen if the core store version < 1.3
-    """
-    core_data = {
-        "data": {},
-        "key": "core.config",
-        "version": 1,
-        "minor_version": minor_version,
-    }
-    hass_storage["core.config"] = dict(core_data)
-
-    for user_config in users:
-        user = MockUser(**user_config).add_to_hass(hass)
-        if user.id not in user_data:
-            continue
-        storage_key = f"frontend.user_data_{user.id}"
-        hass_storage[storage_key] = {
-            "key": storage_key,
-            "version": 1,
-            "data": user_data[user.id],
-        }
-
-    await async_process_ha_core_config(
-        hass,
-        {},
-    )
-    assert hass.config.language == default_language
-
-
-async def test_loading_configuration_default_media_dirs_docker(
-    hass: HomeAssistant,
-) -> None:
-    """Test loading core config onto hass object."""
-    with patch("homeassistant.core_config.is_docker_env", return_value=True):
-        await async_process_ha_core_config(
-            hass,
-            {
-                "name": "Huis",
-            },
-        )
-
-    assert hass.config.location_name == "Huis"
-    assert len(hass.config.allowlist_external_dirs) == 2
-    assert "/media" in hass.config.allowlist_external_dirs
-    assert hass.config.media_dirs == {"local": "/media"}
-
-
-async def test_loading_configuration_from_packages(hass: HomeAssistant) -> None:
-    """Test loading packages config onto hass object config."""
-    await async_process_ha_core_config(
-        hass,
-        {
-            "latitude": 39,
-            "longitude": -1,
-            "elevation": 500,
-            "name": "Huis",
-            "unit_system": "metric",
-            "time_zone": "Europe/Madrid",
-            "external_url": "https://www.example.com",
-            "internal_url": "http://example.local",
-            "packages": {
-                "package_1": {"wake_on_lan": None},
-                "package_2": {
-                    "light": {"platform": "hue"},
-                    "media_extractor": None,
-                    "sun": None,
-                },
-            },
-        },
-    )
-
-    # Empty packages not allowed
-    with pytest.raises(MultipleInvalid):
-        await async_process_ha_core_config(
-            hass,
-            {
-                "latitude": 39,
-                "longitude": -1,
-                "elevation": 500,
-                "name": "Huis",
-                "unit_system": "metric",
-                "time_zone": "Europe/Madrid",
-                "packages": {"empty_package": None},
-            },
-        )
-
-
-@pytest.mark.parametrize(
-    ("unit_system_name", "expected_unit_system"),
-    [
-        ("metric", METRIC_SYSTEM),
-        ("imperial", US_CUSTOMARY_SYSTEM),
-        ("us_customary", US_CUSTOMARY_SYSTEM),
-    ],
-)
-async def test_loading_configuration_unit_system(
-    hass: HomeAssistant, unit_system_name: str, expected_unit_system: UnitSystem
-) -> None:
-    """Test backward compatibility when loading core config."""
-    await async_process_ha_core_config(
-        hass,
-        {
-            "latitude": 60,
-            "longitude": 50,
-            "elevation": 25,
-            "name": "Huis",
-            "unit_system": unit_system_name,
-            "time_zone": "America/New_York",
-            "external_url": "https://www.example.com",
-            "internal_url": "http://example.local",
-        },
-    )
-
-    assert hass.config.units is expected_unit_system
-
-
-async def test_merge_customize(hass: HomeAssistant) -> None:
-    """Test loading core config onto hass object."""
-    core_config = {
-        "latitude": 60,
-        "longitude": 50,
-        "elevation": 25,
-        "name": "Huis",
-        "unit_system": "imperial",
-        "time_zone": "GMT",
-        "customize": {"a.a": {"friendly_name": "A"}},
-        "packages": {
-            "pkg1": {"homeassistant": {"customize": {"b.b": {"friendly_name": "BB"}}}}
-        },
-    }
-    await async_process_ha_core_config(hass, core_config)
-
-    assert hass.data[DATA_CUSTOMIZE].get("b.b") == {"friendly_name": "BB"}
-
-
-async def test_auth_provider_config(hass: HomeAssistant) -> None:
-    """Test loading auth provider config onto hass object."""
-    core_config = {
-        "latitude": 60,
-        "longitude": 50,
-        "elevation": 25,
-        "name": "Huis",
-        "unit_system": "imperial",
-        "time_zone": "GMT",
-        CONF_AUTH_PROVIDERS: [
-            {"type": "homeassistant"},
-        ],
-        CONF_AUTH_MFA_MODULES: [{"type": "totp"}, {"type": "totp", "id": "second"}],
-    }
-    if hasattr(hass, "auth"):
-        del hass.auth
-    await async_process_ha_core_config(hass, core_config)
-
-    assert len(hass.auth.auth_providers) == 1
-    assert hass.auth.auth_providers[0].type == "homeassistant"
-    assert len(hass.auth.auth_mfa_modules) == 2
-    assert hass.auth.auth_mfa_modules[0].id == "totp"
-    assert hass.auth.auth_mfa_modules[1].id == "second"
-
-
-async def test_auth_provider_config_default(hass: HomeAssistant) -> None:
-    """Test loading default auth provider config."""
-    core_config = {
-        "latitude": 60,
-        "longitude": 50,
-        "elevation": 25,
-        "name": "Huis",
-        "unit_system": "imperial",
-        "time_zone": "GMT",
-    }
-    if hasattr(hass, "auth"):
-        del hass.auth
-    await async_process_ha_core_config(hass, core_config)
-
-    assert len(hass.auth.auth_providers) == 1
-    assert hass.auth.auth_providers[0].type == "homeassistant"
-    assert len(hass.auth.auth_mfa_modules) == 1
-    assert hass.auth.auth_mfa_modules[0].id == "totp"
-
-
-async def test_disallowed_auth_provider_config(hass: HomeAssistant) -> None:
-    """Test loading insecure example auth provider is disallowed."""
-    core_config = {
-        "latitude": 60,
-        "longitude": 50,
-        "elevation": 25,
-        "name": "Huis",
-        "unit_system": "imperial",
-        "time_zone": "GMT",
-        CONF_AUTH_PROVIDERS: [
-            {
-                "type": "insecure_example",
-                "users": [
-                    {
-                        "username": "test-user",
-                        "password": "test-pass",
-                        "name": "Test Name",
-                    }
-                ],
-            }
-        ],
-    }
-    with pytest.raises(Invalid):
-        await async_process_ha_core_config(hass, core_config)
-
-
-async def test_disallowed_duplicated_auth_provider_config(hass: HomeAssistant) -> None:
-    """Test loading insecure example auth provider is disallowed."""
-    core_config = {
-        "latitude": 60,
-        "longitude": 50,
-        "elevation": 25,
-        "name": "Huis",
-        "unit_system": "imperial",
-        "time_zone": "GMT",
-        CONF_AUTH_PROVIDERS: [{"type": "homeassistant"}, {"type": "homeassistant"}],
-    }
-    with pytest.raises(Invalid):
-        await async_process_ha_core_config(hass, core_config)
-
-
-async def test_disallowed_auth_mfa_module_config(hass: HomeAssistant) -> None:
-    """Test loading insecure example auth mfa module is disallowed."""
-    core_config = {
-        "latitude": 60,
-        "longitude": 50,
-        "elevation": 25,
-        "name": "Huis",
-        "unit_system": "imperial",
-        "time_zone": "GMT",
-        CONF_AUTH_MFA_MODULES: [
-            {
-                "type": "insecure_example",
-                "data": [{"user_id": "mock-user", "pin": "test-pin"}],
-            }
-        ],
-    }
-    with pytest.raises(Invalid):
-        await async_process_ha_core_config(hass, core_config)
-
-
-async def test_disallowed_duplicated_auth_mfa_module_config(
-    hass: HomeAssistant,
-) -> None:
-    """Test loading insecure example auth mfa module is disallowed."""
-    core_config = {
-        "latitude": 60,
-        "longitude": 50,
-        "elevation": 25,
-        "name": "Huis",
-        "unit_system": "imperial",
-        "time_zone": "GMT",
-        CONF_AUTH_MFA_MODULES: [{"type": "totp"}, {"type": "totp"}],
-    }
-    with pytest.raises(Invalid):
-        await async_process_ha_core_config(hass, core_config)
-
-
-async def test_core_config_schema_historic_currency(
-    hass: HomeAssistant, issue_registry: ir.IssueRegistry
-) -> None:
-    """Test core config schema."""
-    await async_process_ha_core_config(hass, {"currency": "LTT"})
-
-    issue = issue_registry.async_get_issue("homeassistant", "historic_currency")
-    assert issue
-    assert issue.translation_placeholders == {"currency": "LTT"}
-
-
-async def test_core_store_historic_currency(
-    hass: HomeAssistant, hass_storage: dict[str, Any], issue_registry: ir.IssueRegistry
-) -> None:
-    """Test core config store."""
-    core_data = {
-        "data": {
-            "currency": "LTT",
-        },
-        "key": "core.config",
-        "version": 1,
-        "minor_version": 1,
-    }
-    hass_storage["core.config"] = dict(core_data)
-    await async_process_ha_core_config(hass, {})
-
-    issue_id = "historic_currency"
-    issue = issue_registry.async_get_issue("homeassistant", issue_id)
-    assert issue
-    assert issue.translation_placeholders == {"currency": "LTT"}
-
-    await hass.config.async_update(currency="EUR")
-    issue = issue_registry.async_get_issue("homeassistant", issue_id)
-    assert not issue
-
-
-async def test_core_config_schema_no_country(
-    hass: HomeAssistant, issue_registry: ir.IssueRegistry
-) -> None:
-    """Test core config schema."""
-    await async_process_ha_core_config(hass, {})
-
-    issue = issue_registry.async_get_issue("homeassistant", "country_not_configured")
-    assert issue
-
-
-async def test_core_store_no_country(
-    hass: HomeAssistant, hass_storage: dict[str, Any], issue_registry: ir.IssueRegistry
-) -> None:
-    """Test core config store."""
-    core_data = {
-        "data": {},
-        "key": "core.config",
-        "version": 1,
-        "minor_version": 1,
-    }
-    hass_storage["core.config"] = dict(core_data)
-    await async_process_ha_core_config(hass, {})
-
-    issue_id = "country_not_configured"
-    issue = issue_registry.async_get_issue("homeassistant", issue_id)
-    assert issue
-
-    await hass.config.async_update(country="SE")
-    issue = issue_registry.async_get_issue("homeassistant", issue_id)
-    assert not issue
-
-
-async def test_configuration_legacy_template_is_removed(hass: HomeAssistant) -> None:
-    """Test loading core config onto hass object."""
-    await async_process_ha_core_config(
-        hass,
-        {
-            "latitude": 60,
-            "longitude": 50,
-            "elevation": 25,
-            "name": "Huis",
-            "unit_system": "imperial",
-            "time_zone": "America/New_York",
-            "allowlist_external_dirs": "/etc",
-            "external_url": "https://www.example.com",
-            "internal_url": "http://example.local",
-            "media_dirs": {"mymedia": "/usr"},
-            "legacy_templates": True,
-            "debug": True,
-            "currency": "EUR",
-            "country": "SE",
-            "language": "sv",
-            "radius": 150,
-        },
-    )
-
-    assert not getattr(hass.config, "legacy_templates")
-
-
-async def test_config_defaults() -> None:
-    """Test config defaults."""
-    hass = Mock()
-    hass.data = {}
-    config = Config(hass, "/test/ha-config")
-    assert config.hass is hass
-    assert config.latitude == 0
-    assert config.longitude == 0
-    assert config.elevation == 0
-    assert config.location_name == "Home"
-    assert config.time_zone == "UTC"
-    assert config.internal_url is None
-    assert config.external_url is None
-    assert config.config_source is ConfigSource.DEFAULT
-    assert config.skip_pip is False
-    assert config.skip_pip_packages == []
-    assert config.components == set()
-    assert config.api is None
-    assert config.config_dir == "/test/ha-config"
-    assert config.allowlist_external_dirs == set()
-    assert config.allowlist_external_urls == set()
-    assert config.media_dirs == {}
-    assert config.recovery_mode is False
-    assert config.legacy_templates is False
-    assert config.currency == "EUR"
-    assert config.country is None
-    assert config.language == "en"
-    assert config.radius == 100
-
-
-async def test_config_path_with_file() -> None:
-    """Test get_config_path method."""
-    hass = Mock()
-    hass.data = {}
-    config = Config(hass, "/test/ha-config")
-    assert config.path("test.conf") == "/test/ha-config/test.conf"
-
-
-async def test_config_path_with_dir_and_file() -> None:
-    """Test get_config_path method."""
-    hass = Mock()
-    hass.data = {}
-    config = Config(hass, "/test/ha-config")
-    assert config.path("dir", "test.conf") == "/test/ha-config/dir/test.conf"
-
-
-async def test_config_as_dict() -> None:
-    """Test as dict."""
-    hass = Mock()
-    hass.data = {}
-    config = Config(hass, "/test/ha-config")
-    type(config.hass.state).value = PropertyMock(return_value="RUNNING")
-    expected = {
-        "latitude": 0,
-        "longitude": 0,
-        "elevation": 0,
-        CONF_UNIT_SYSTEM: METRIC_SYSTEM.as_dict(),
-        "location_name": "Home",
-        "time_zone": "UTC",
-        "components": [],
-        "config_dir": "/test/ha-config",
-        "whitelist_external_dirs": [],
-        "allowlist_external_dirs": [],
-        "allowlist_external_urls": [],
-        "version": __version__,
-        "config_source": ConfigSource.DEFAULT,
-        "recovery_mode": False,
-        "state": "RUNNING",
-        "external_url": None,
-        "internal_url": None,
-        "currency": "EUR",
-        "country": None,
-        "language": "en",
-        "safe_mode": False,
-        "debug": False,
-        "radius": 100,
-    }
-
-    assert expected == config.as_dict()
-
-
-async def test_config_is_allowed_path() -> None:
-    """Test is_allowed_path method."""
-    hass = Mock()
-    hass.data = {}
-    config = Config(hass, "/test/ha-config")
-    with TemporaryDirectory() as tmp_dir:
-        # The created dir is in /tmp. This is a symlink on OS X
-        # causing this test to fail unless we resolve path first.
-        config.allowlist_external_dirs = {os.path.realpath(tmp_dir)}
-
-        test_file = os.path.join(tmp_dir, "test.jpg")
-        await asyncio.get_running_loop().run_in_executor(
-            None, Path(test_file).write_text, "test"
-        )
-
-        valid = [test_file, tmp_dir, os.path.join(tmp_dir, "notfound321")]
-        for path in valid:
-            assert config.is_allowed_path(path)
-
-        config.allowlist_external_dirs = {"/home", "/var"}
-
-        invalid = [
-            "/hass/config/secure",
-            "/etc/passwd",
-            "/root/secure_file",
-            "/var/../etc/passwd",
-            test_file,
-        ]
-        for path in invalid:
-            assert not config.is_allowed_path(path)
-
-        with pytest.raises(AssertionError):
-            config.is_allowed_path(None)
-
-
-async def test_config_is_allowed_external_url() -> None:
-    """Test is_allowed_external_url method."""
-    hass = Mock()
-    hass.data = {}
-    config = Config(hass, "/test/ha-config")
-    config.allowlist_external_urls = [
-        "http://x.com/",
-        "https://y.com/bla/",
-        "https://z.com/images/1.jpg/",
-    ]
-
-    valid = [
-        "http://x.com/1.jpg",
-        "http://x.com",
-        "https://y.com/bla/",
-        "https://y.com/bla/2.png",
-        "https://z.com/images/1.jpg",
-    ]
-    for url in valid:
-        assert config.is_allowed_external_url(url)
-
-    invalid = [
-        "https://a.co",
-        "https://y.com/bla_wrong",
-        "https://y.com/bla/../image.jpg",
-        "https://z.com/images",
-    ]
-    for url in invalid:
-        assert not config.is_allowed_external_url(url)
-
-
-async def test_event_on_update(hass: HomeAssistant) -> None:
-    """Test that event is fired on update."""
-    events = async_capture_events(hass, EVENT_CORE_CONFIG_UPDATE)
-
-    assert hass.config.latitude != 12
-
-    await hass.config.async_update(latitude=12)
-    await hass.async_block_till_done()
-
-    assert hass.config.latitude == 12
-    assert len(events) == 1
-    assert events[0].data == {"latitude": 12}
-
-
-async def test_bad_timezone_raises_value_error(hass: HomeAssistant) -> None:
-    """Test bad timezone raises ValueError."""
-    with pytest.raises(ValueError):
-        await hass.config.async_update(time_zone="not_a_timezone")
-
-
-async def test_additional_data_in_core_config(
-    hass: HomeAssistant, hass_storage: dict[str, Any]
-) -> None:
-    """Test that we can handle additional data in core configuration."""
-    config = Config(hass, "/test/ha-config")
-    config.async_initialize()
-    hass_storage[CORE_STORAGE_KEY] = {
-        "version": 1,
-        "data": {"location_name": "Test Name", "additional_valid_key": "value"},
-    }
-    await config.async_load()
-    assert config.location_name == "Test Name"
-
-
-async def test_incorrect_internal_external_url(
-    hass: HomeAssistant, hass_storage: dict[str, Any], caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test that we warn when detecting invalid internal/external url."""
-    config = Config(hass, "/test/ha-config")
-    config.async_initialize()
-
-    hass_storage[CORE_STORAGE_KEY] = {
-        "version": 1,
-        "data": {
-            "internal_url": None,
-            "external_url": None,
-        },
-    }
-    await config.async_load()
-    assert "Invalid external_url set" not in caplog.text
-    assert "Invalid internal_url set" not in caplog.text
-
-    config = Config(hass, "/test/ha-config")
-    config.async_initialize()
-
-    hass_storage[CORE_STORAGE_KEY] = {
-        "version": 1,
-        "data": {
-            "internal_url": "https://community.home-assistant.io/profile",
-            "external_url": "https://www.home-assistant.io/blue",
-        },
-    }
-    await config.async_load()
-    assert "Invalid external_url set" in caplog.text
-    assert "Invalid internal_url set" in caplog.text
-
-
-async def test_top_level_components(hass: HomeAssistant) -> None:
-    """Test top level components are updated when components change."""
-    hass.config.components.add("homeassistant")
-    assert hass.config.components == {"homeassistant"}
-    assert hass.config.top_level_components == {"homeassistant"}
-    hass.config.components.add("homeassistant.scene")
-    assert hass.config.components == {"homeassistant", "homeassistant.scene"}
-    assert hass.config.top_level_components == {"homeassistant"}
-    hass.config.components.remove("homeassistant")
-    assert hass.config.components == {"homeassistant.scene"}
-    assert hass.config.top_level_components == set()
-    with pytest.raises(ValueError):
-        hass.config.components.remove("homeassistant.scene")
-    with pytest.raises(NotImplementedError):
-        hass.config.components.discard("homeassistant")
-
-
-async def test_debug_mode_defaults_to_off(hass: HomeAssistant) -> None:
-    """Test debug mode defaults to off."""
-    assert not hass.config.debug
-
-
-async def test_set_time_zone_deprecated(hass: HomeAssistant) -> None:
-    """Test set_time_zone is deprecated."""
-    with pytest.raises(
-        RuntimeError,
-        match=re.escape(
-            "Detected code that set the time zone using set_time_zone instead of "
-            "async_set_time_zone which will stop working in Home Assistant 2025.6. "
-            "Please report this issue.",
-        ),
-    ):
-        await hass.config.set_time_zone("America/New_York")
diff --git a/tests/test_loader.py b/tests/test_loader.py
index 57d3d6fa832..c4bcbed0107 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -6,7 +6,7 @@ import pathlib
 import sys
 import threading
 from typing import Any
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 from awesomeversion import AwesomeVersion
 import pytest
@@ -1295,29 +1295,26 @@ async def test_config_folder_not_in_path() -> None:
     import tests.testing_config.check_config_not_in_path  # noqa: F401
 
 
-@pytest.mark.parametrize(
-    ("integration_frame_path", "expected"),
-    [
-        pytest.param(
-            "custom_components/test_integration_frame", True, id="custom integration"
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            False,
-            id="core integration",
-        ),
-        pytest.param("homeassistant/test_integration_frame", False, id="core"),
-    ],
-)
-@pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_hass_components_use_reported(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    expected: bool,
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_integration_frame: Mock
 ) -> None:
-    """Test whether use of hass.components is reported."""
+    """Test that use of hass.components is reported."""
+    mock_integration_frame.filename = (
+        "/home/paulus/homeassistant/custom_components/demo/light.py"
+    )
+    integration_frame = frame.IntegrationFrame(
+        custom_integration=True,
+        frame=mock_integration_frame,
+        integration="test_integration_frame",
+        module="custom_components.test_integration_frame",
+        relative_filename="custom_components/test_integration_frame/__init__.py",
+    )
+
     with (
+        patch(
+            "homeassistant.helpers.frame.get_integration_frame",
+            return_value=integration_frame,
+        ),
         patch(
             "homeassistant.components.http.start_http_server_and_save_config",
             return_value=None,
@@ -1325,11 +1322,10 @@ async def test_hass_components_use_reported(
     ):
         await hass.components.http.start_http_server_and_save_config(hass, [], None)
 
-        reported = (
+        assert (
             "Detected that custom integration 'test_integration_frame'"
             " accesses hass.components.http. This is deprecated"
         ) in caplog.text
-        assert reported == expected
 
 
 async def test_async_get_component_preloads_config_and_config_flow(
@@ -1991,29 +1987,24 @@ async def test_has_services(hass: HomeAssistant) -> None:
     assert integration.has_services is True
 
 
-@pytest.mark.parametrize(
-    ("integration_frame_path", "expected"),
-    [
-        pytest.param(
-            "custom_components/test_integration_frame", True, id="custom integration"
-        ),
-        pytest.param(
-            "homeassistant/components/test_integration_frame",
-            False,
-            id="core integration",
-        ),
-        pytest.param("homeassistant/test_integration_frame", False, id="core"),
-    ],
-)
-@pytest.mark.usefixtures("mock_integration_frame")
-@patch.object(frame, "_REPORTED_INTEGRATIONS", set())
 async def test_hass_helpers_use_reported(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    expected: bool,
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, mock_integration_frame: Mock
 ) -> None:
-    """Test whether use of hass.helpers is reported."""
+    """Test that use of hass.components is reported."""
+    integration_frame = frame.IntegrationFrame(
+        custom_integration=True,
+        frame=mock_integration_frame,
+        integration="test_integration_frame",
+        module="custom_components.test_integration_frame",
+        relative_filename="custom_components/test_integration_frame/__init__.py",
+    )
+
     with (
+        patch.object(frame, "_REPORTED_INTEGRATIONS", new=set()),
+        patch(
+            "homeassistant.helpers.frame.get_integration_frame",
+            return_value=integration_frame,
+        ),
         patch(
             "homeassistant.helpers.aiohttp_client.async_get_clientsession",
             return_value=None,
@@ -2021,11 +2012,10 @@ async def test_hass_helpers_use_reported(
     ):
         hass.helpers.aiohttp_client.async_get_clientsession()
 
-        reported = (
+        assert (
             "Detected that custom integration 'test_integration_frame' "
             "accesses hass.helpers.aiohttp_client. This is deprecated"
         ) in caplog.text
-        assert reported == expected
 
 
 async def test_manifest_json_fragment_round_trip(hass: HomeAssistant) -> None:
diff --git a/tests/test_main.py b/tests/test_main.py
index d32ca59a846..080787311a0 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -3,7 +3,7 @@
 from unittest.mock import PropertyMock, patch
 
 from homeassistant import __main__ as main
-from homeassistant.const import REQUIRED_PYTHON_VER, RESTART_EXIT_CODE
+from homeassistant.const import REQUIRED_PYTHON_VER
 
 
 @patch("sys.exit")
@@ -86,13 +86,3 @@ def test_skip_pip_mutually_exclusive(mock_exit) -> None:
     assert mock_exit.called is False
     args = parse_args("--skip-pip", "--skip-pip-packages", "foo")
     assert mock_exit.called is True
-
-
-def test_restart_after_backup_restore() -> None:
-    """Test restarting if we restored a backup."""
-    with (
-        patch("sys.argv", ["python"]),
-        patch("homeassistant.__main__.restore_backup", return_value=True),
-    ):
-        exit_code = main.main()
-        assert exit_code == RESTART_EXIT_CODE
diff --git a/tests/test_requirements.py b/tests/test_requirements.py
index 191e1b7368c..2885fa30036 100644
--- a/tests/test_requirements.py
+++ b/tests/test_requirements.py
@@ -585,8 +585,7 @@ async def test_discovery_requirements_mqtt(hass: HomeAssistant) -> None:
     ) as mock_process:
         await async_get_integration_with_requirements(hass, "mqtt_comp")
 
-    assert len(mock_process.mock_calls) == 2
-    # one for mqtt and one for hassio
+    assert len(mock_process.mock_calls) == 1
     assert mock_process.mock_calls[0][1][1] == mqtt.requirements
 
 
diff --git a/tests/util/test_timeout.py b/tests/util/test_timeout.py
index 5e8261c4c02..1c4b06d99b4 100644
--- a/tests/util/test_timeout.py
+++ b/tests/util/test_timeout.py
@@ -146,62 +146,6 @@ async def test_simple_global_timeout_freeze_with_executor_job(
         await hass.async_add_executor_job(time.sleep, 0.3)
 
 
-async def test_simple_global_timeout_does_not_leak_upward(
-    hass: HomeAssistant,
-) -> None:
-    """Test a global timeout does not leak upward."""
-    timeout = TimeoutManager()
-    current_task = asyncio.current_task()
-    assert current_task is not None
-    cancelling_inside_timeout = None
-
-    with pytest.raises(asyncio.TimeoutError):  # noqa: PT012
-        async with timeout.async_timeout(0.1):
-            cancelling_inside_timeout = current_task.cancelling()
-            await asyncio.sleep(0.3)
-
-    assert cancelling_inside_timeout == 0
-    # After the context manager exits, the task should no longer be cancelling
-    assert current_task.cancelling() == 0
-
-
-async def test_simple_global_timeout_does_swallow_cancellation(
-    hass: HomeAssistant,
-) -> None:
-    """Test a global timeout does not swallow cancellation."""
-    timeout = TimeoutManager()
-    current_task = asyncio.current_task()
-    assert current_task is not None
-    cancelling_inside_timeout = None
-
-    async def task_with_timeout() -> None:
-        nonlocal cancelling_inside_timeout
-        new_task = asyncio.current_task()
-        assert new_task is not None
-        with pytest.raises(asyncio.TimeoutError):  # noqa: PT012
-            cancelling_inside_timeout = new_task.cancelling()
-            async with timeout.async_timeout(0.1):
-                await asyncio.sleep(0.3)
-
-    # After the context manager exits, the task should no longer be cancelling
-    assert current_task.cancelling() == 0
-
-    task = asyncio.create_task(task_with_timeout())
-    await asyncio.sleep(0)
-    task.cancel()
-    assert task.cancelling() == 1
-
-    assert cancelling_inside_timeout == 0
-    # Cancellation should not leak into the current task
-    assert current_task.cancelling() == 0
-    # Cancellation should not be swallowed if the task is cancelled
-    # and it also times out
-    await asyncio.sleep(0)
-    with pytest.raises(asyncio.CancelledError):
-        await task
-    assert task.cancelling() == 1
-
-
 async def test_simple_global_timeout_freeze_reset() -> None:
     """Test a simple global timeout freeze reset."""
     timeout = TimeoutManager()
@@ -222,62 +166,6 @@ async def test_simple_zone_timeout() -> None:
             await asyncio.sleep(0.3)
 
 
-async def test_simple_zone_timeout_does_not_leak_upward(
-    hass: HomeAssistant,
-) -> None:
-    """Test a zone timeout does not leak upward."""
-    timeout = TimeoutManager()
-    current_task = asyncio.current_task()
-    assert current_task is not None
-    cancelling_inside_timeout = None
-
-    with pytest.raises(asyncio.TimeoutError):  # noqa: PT012
-        async with timeout.async_timeout(0.1, "test"):
-            cancelling_inside_timeout = current_task.cancelling()
-            await asyncio.sleep(0.3)
-
-    assert cancelling_inside_timeout == 0
-    # After the context manager exits, the task should no longer be cancelling
-    assert current_task.cancelling() == 0
-
-
-async def test_simple_zone_timeout_does_swallow_cancellation(
-    hass: HomeAssistant,
-) -> None:
-    """Test a zone timeout does not swallow cancellation."""
-    timeout = TimeoutManager()
-    current_task = asyncio.current_task()
-    assert current_task is not None
-    cancelling_inside_timeout = None
-
-    async def task_with_timeout() -> None:
-        nonlocal cancelling_inside_timeout
-        new_task = asyncio.current_task()
-        assert new_task is not None
-        with pytest.raises(asyncio.TimeoutError):  # noqa: PT012
-            async with timeout.async_timeout(0.1, "test"):
-                cancelling_inside_timeout = current_task.cancelling()
-                await asyncio.sleep(0.3)
-
-    # After the context manager exits, the task should no longer be cancelling
-    assert current_task.cancelling() == 0
-
-    task = asyncio.create_task(task_with_timeout())
-    await asyncio.sleep(0)
-    task.cancel()
-    assert task.cancelling() == 1
-
-    # Cancellation should not leak into the current task
-    assert cancelling_inside_timeout == 0
-    assert current_task.cancelling() == 0
-    # Cancellation should not be swallowed if the task is cancelled
-    # and it also times out
-    await asyncio.sleep(0)
-    with pytest.raises(asyncio.CancelledError):
-        await task
-    assert task.cancelling() == 1
-
-
 async def test_multiple_zone_timeout() -> None:
     """Test a simple zone timeout."""
     timeout = TimeoutManager()
@@ -439,7 +327,7 @@ async def test_simple_zone_timeout_freeze_without_timeout_exeption() -> None:
             await asyncio.sleep(0.4)
 
 
-async def test_simple_zone_timeout_zone_with_timeout_exception() -> None:
+async def test_simple_zone_timeout_zone_with_timeout_exeption() -> None:
     """Test a simple zone timeout freeze on a zone that does not have a timeout set."""
     timeout = TimeoutManager()
 
diff --git a/tests/util/test_unit_conversion.py b/tests/util/test_unit_conversion.py
index 609809a96e8..3b8fd3bc466 100644
--- a/tests/util/test_unit_conversion.py
+++ b/tests/util/test_unit_conversion.py
@@ -11,7 +11,6 @@ from homeassistant.const import (
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
-    UnitOfBloodGlucoseConcentration,
     UnitOfConductivity,
     UnitOfDataRate,
     UnitOfElectricCurrent,
@@ -33,7 +32,6 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.util import unit_conversion
 from homeassistant.util.unit_conversion import (
     BaseUnitConverter,
-    BloodGlucoseConcentrationConverter,
     ConductivityConverter,
     DataRateConverter,
     DistanceConverter,
@@ -61,7 +59,6 @@ INVALID_SYMBOL = "bob"
 _ALL_CONVERTERS: dict[type[BaseUnitConverter], list[str | None]] = {
     converter: sorted(converter.VALID_UNITS, key=lambda x: (x is None, x))
     for converter in (
-        BloodGlucoseConcentrationConverter,
         ConductivityConverter,
         DataRateConverter,
         DistanceConverter,
@@ -83,11 +80,6 @@ _ALL_CONVERTERS: dict[type[BaseUnitConverter], list[str | None]] = {
 
 # Dict containing all converters with a corresponding unit ratio.
 _GET_UNIT_RATIO: dict[type[BaseUnitConverter], tuple[str | None, str | None, float]] = {
-    BloodGlucoseConcentrationConverter: (
-        UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER,
-        UnitOfBloodGlucoseConcentration.MILLIMOLE_PER_LITER,
-        18,
-    ),
     ConductivityConverter: (
         UnitOfConductivity.MICROSIEMENS_PER_CM,
         UnitOfConductivity.MILLISIEMENS_PER_CM,
@@ -138,20 +130,6 @@ _GET_UNIT_RATIO: dict[type[BaseUnitConverter], tuple[str | None, str | None, flo
 _CONVERTED_VALUE: dict[
     type[BaseUnitConverter], list[tuple[float, str | None, float, str | None]]
 ] = {
-    BloodGlucoseConcentrationConverter: [
-        (
-            90,
-            UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER,
-            5,
-            UnitOfBloodGlucoseConcentration.MILLIMOLE_PER_LITER,
-        ),
-        (
-            1,
-            UnitOfBloodGlucoseConcentration.MILLIMOLE_PER_LITER,
-            18,
-            UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER,
-        ),
-    ],
     ConductivityConverter: [
         # Deprecated to deprecated
         (5, UnitOfConductivity.SIEMENS, 5e3, UnitOfConductivity.MILLISIEMENS),
@@ -379,16 +357,10 @@ _CONVERTED_VALUE: dict[
     EnergyConverter: [
         (10, UnitOfEnergy.WATT_HOUR, 0.01, UnitOfEnergy.KILO_WATT_HOUR),
         (10, UnitOfEnergy.WATT_HOUR, 0.00001, UnitOfEnergy.MEGA_WATT_HOUR),
-        (10, UnitOfEnergy.WATT_HOUR, 0.00000001, UnitOfEnergy.GIGA_WATT_HOUR),
-        (10, UnitOfEnergy.WATT_HOUR, 0.00000000001, UnitOfEnergy.TERA_WATT_HOUR),
         (10, UnitOfEnergy.KILO_WATT_HOUR, 10000, UnitOfEnergy.WATT_HOUR),
         (10, UnitOfEnergy.KILO_WATT_HOUR, 0.01, UnitOfEnergy.MEGA_WATT_HOUR),
         (10, UnitOfEnergy.MEGA_WATT_HOUR, 10000000, UnitOfEnergy.WATT_HOUR),
         (10, UnitOfEnergy.MEGA_WATT_HOUR, 10000, UnitOfEnergy.KILO_WATT_HOUR),
-        (10, UnitOfEnergy.GIGA_WATT_HOUR, 10e6, UnitOfEnergy.KILO_WATT_HOUR),
-        (10, UnitOfEnergy.GIGA_WATT_HOUR, 10e9, UnitOfEnergy.WATT_HOUR),
-        (10, UnitOfEnergy.TERA_WATT_HOUR, 10e9, UnitOfEnergy.KILO_WATT_HOUR),
-        (10, UnitOfEnergy.TERA_WATT_HOUR, 10e12, UnitOfEnergy.WATT_HOUR),
         (10, UnitOfEnergy.GIGA_JOULE, 2777.78, UnitOfEnergy.KILO_WATT_HOUR),
         (10, UnitOfEnergy.GIGA_JOULE, 2.77778, UnitOfEnergy.MEGA_WATT_HOUR),
         (10, UnitOfEnergy.MEGA_JOULE, 2.77778, UnitOfEnergy.KILO_WATT_HOUR),
@@ -467,9 +439,6 @@ _CONVERTED_VALUE: dict[
     ],
     PowerConverter: [
         (10, UnitOfPower.KILO_WATT, 10000, UnitOfPower.WATT),
-        (10, UnitOfPower.MEGA_WATT, 10e6, UnitOfPower.WATT),
-        (10, UnitOfPower.GIGA_WATT, 10e9, UnitOfPower.WATT),
-        (10, UnitOfPower.TERA_WATT, 10e12, UnitOfPower.WATT),
         (10, UnitOfPower.WATT, 0.01, UnitOfPower.KILO_WATT),
     ],
     PressureConverter: [
diff --git a/tests/util/yaml/test_init.py b/tests/util/yaml/test_init.py
index 12a7eca5f9d..8db3f49ab8e 100644
--- a/tests/util/yaml/test_init.py
+++ b/tests/util/yaml/test_init.py
@@ -494,6 +494,31 @@ def mock_integration_frame() -> Generator[Mock]:
         yield correct_frame
 
 
+@pytest.mark.parametrize(
+    ("loader_class", "message"),
+    [
+        (yaml.loader.SafeLoader, "'SafeLoader' instead of 'FastSafeLoader'"),
+        (
+            yaml.loader.SafeLineLoader,
+            "'SafeLineLoader' instead of 'PythonSafeLoader'",
+        ),
+    ],
+)
+@pytest.mark.usefixtures("mock_integration_frame")
+async def test_deprecated_loaders(
+    caplog: pytest.LogCaptureFixture,
+    loader_class: type,
+    message: str,
+) -> None:
+    """Test instantiating the deprecated yaml loaders logs a warning."""
+    with (
+        pytest.raises(TypeError),
+        patch("homeassistant.helpers.frame._REPORTED_INTEGRATIONS", set()),
+    ):
+        loader_class()
+    assert (f"Detected that integration 'hue' uses deprecated {message}") in caplog.text
+
+
 @pytest.mark.usefixtures("try_both_loaders")
 def test_string_annotated() -> None:
     """Test strings are annotated with file + line."""