diff --git a/tests/components/atag/test_sensors.py b/tests/components/atag/test_sensor.py
similarity index 100%
rename from tests/components/atag/test_sensors.py
rename to tests/components/atag/test_sensor.py
diff --git a/tests/components/broadlink/test_sensors.py b/tests/components/broadlink/test_sensor.py
similarity index 100%
rename from tests/components/broadlink/test_sensors.py
rename to tests/components/broadlink/test_sensor.py
diff --git a/tests/components/cert_expiry/test_sensors.py b/tests/components/cert_expiry/test_sensor.py
similarity index 100%
rename from tests/components/cert_expiry/test_sensors.py
rename to tests/components/cert_expiry/test_sensor.py
diff --git a/tests/components/idasen_desk/test_buttons.py b/tests/components/idasen_desk/test_button.py
similarity index 100%
rename from tests/components/idasen_desk/test_buttons.py
rename to tests/components/idasen_desk/test_button.py
diff --git a/tests/components/idasen_desk/test_sensors.py b/tests/components/idasen_desk/test_sensor.py
similarity index 100%
rename from tests/components/idasen_desk/test_sensors.py
rename to tests/components/idasen_desk/test_sensor.py
diff --git a/tests/components/madvr/snapshots/test_binary_sensors.ambr b/tests/components/madvr/snapshots/test_binary_sensor.ambr
similarity index 100%
rename from tests/components/madvr/snapshots/test_binary_sensors.ambr
rename to tests/components/madvr/snapshots/test_binary_sensor.ambr
diff --git a/tests/components/madvr/snapshots/test_sensors.ambr b/tests/components/madvr/snapshots/test_sensor.ambr
similarity index 100%
rename from tests/components/madvr/snapshots/test_sensors.ambr
rename to tests/components/madvr/snapshots/test_sensor.ambr
diff --git a/tests/components/madvr/test_binary_sensors.py b/tests/components/madvr/test_binary_sensor.py
similarity index 100%
rename from tests/components/madvr/test_binary_sensors.py
rename to tests/components/madvr/test_binary_sensor.py
diff --git a/tests/components/madvr/test_sensors.py b/tests/components/madvr/test_sensor.py
similarity index 100%
rename from tests/components/madvr/test_sensors.py
rename to tests/components/madvr/test_sensor.py
diff --git a/tests/components/tesla_fleet/snapshots/test_binary_sensors.ambr b/tests/components/tesla_fleet/snapshots/test_binary_sensor.ambr
similarity index 100%
rename from tests/components/tesla_fleet/snapshots/test_binary_sensors.ambr
rename to tests/components/tesla_fleet/snapshots/test_binary_sensor.ambr
diff --git a/tests/components/tesla_fleet/test_binary_sensors.py b/tests/components/tesla_fleet/test_binary_sensor.py
similarity index 100%
rename from tests/components/tesla_fleet/test_binary_sensors.py
rename to tests/components/tesla_fleet/test_binary_sensor.py
diff --git a/tests/components/teslemetry/snapshots/test_binary_sensors.ambr b/tests/components/teslemetry/snapshots/test_binary_sensor.ambr
similarity index 100%
rename from tests/components/teslemetry/snapshots/test_binary_sensors.ambr
rename to tests/components/teslemetry/snapshots/test_binary_sensor.ambr
diff --git a/tests/components/teslemetry/test_binary_sensors.py b/tests/components/teslemetry/test_binary_sensor.py
similarity index 100%
rename from tests/components/teslemetry/test_binary_sensors.py
rename to tests/components/teslemetry/test_binary_sensor.py
diff --git a/tests/components/tessie/snapshots/test_binary_sensors.ambr b/tests/components/tessie/snapshots/test_binary_sensor.ambr
similarity index 100%
rename from tests/components/tessie/snapshots/test_binary_sensors.ambr
rename to tests/components/tessie/snapshots/test_binary_sensor.ambr
diff --git a/tests/components/tessie/test_binary_sensors.py b/tests/components/tessie/test_binary_sensor.py
similarity index 100%
rename from tests/components/tessie/test_binary_sensors.py
rename to tests/components/tessie/test_binary_sensor.py