diff --git a/src/config/config.service.spec.ts b/src/config/config.service.spec.ts
index a28d6f86..7245463b 100644
--- a/src/config/config.service.spec.ts
+++ b/src/config/config.service.spec.ts
@@ -112,7 +112,7 @@ describe('ConfigService', () => {
     errorPaths.forEach((path) =>
       expect(loggerService.error).toHaveBeenCalledWith(
         expect.stringContaining(path),
-        'ConfigService'
+        ConfigService.name
       )
     );
   });
diff --git a/src/integration-support/bluetooth/bluetooth.service.spec.ts b/src/integration-support/bluetooth/bluetooth.service.spec.ts
index 642e4ed7..3778ff70 100644
--- a/src/integration-support/bluetooth/bluetooth.service.spec.ts
+++ b/src/integration-support/bluetooth/bluetooth.service.spec.ts
@@ -632,30 +632,32 @@ Requesting information ...
         CHARACTERISTIC_UUID
       );
 
+      expect(loggerService.error).toHaveBeenCalledTimes(1);
       expect(loggerService.error).toHaveBeenCalledWith(
         expect.stringContaining(
           'Permission to query abcd1234 has not been acquired'
         ),
-        '',
-        'BluetoothService'
+        BluetoothService.name
       );
       expect(response).toBeNull();
 
       service.acquireQueryMutex();
       service.releaseQueryMutex();
 
+      jest.clearAllMocks();
+
       response = await service.queryLowEnergyDevice(
         peripheral,
         SERVICE_UUID,
         CHARACTERISTIC_UUID
       );
 
+      expect(loggerService.error).toHaveBeenCalledTimes(1);
       expect(loggerService.error).toHaveBeenCalledWith(
         expect.stringContaining(
           'Permission to query abcd1234 has not been acquired'
         ),
-        '',
-        'BluetoothService'
+        BluetoothService.name
       );
       expect(response).toBeNull();
     });
diff --git a/src/integrations/home-assistant/home-assistant.service.spec.ts b/src/integrations/home-assistant/home-assistant.service.spec.ts
index 17404fb6..53f2675b 100644
--- a/src/integrations/home-assistant/home-assistant.service.spec.ts
+++ b/src/integrations/home-assistant/home-assistant.service.spec.ts
@@ -501,7 +501,7 @@ describe('HomeAssistantService', () => {
 
       expect(loggerService.warn).toHaveBeenCalledWith(
         expect.stringContaining('test-instance-fictitious'),
-        expect.anything()
+        HomeAssistantService.name
       );
     });
   });
diff --git a/src/integrations/xiaomi-mi/xiaomi-mi.service.spec.ts b/src/integrations/xiaomi-mi/xiaomi-mi.service.spec.ts
index 196de09e..99294b28 100644
--- a/src/integrations/xiaomi-mi/xiaomi-mi.service.spec.ts
+++ b/src/integrations/xiaomi-mi/xiaomi-mi.service.spec.ts
@@ -114,7 +114,7 @@ describe('XiaomiMiService', () => {
     expect(loggerService.warn).toHaveBeenCalledTimes(1);
     expect(loggerService.warn).toHaveBeenCalledWith(
       expect.stringContaining('No sensors entries in the config'),
-      'XiaomiMiService'
+      XiaomiMiService.name
     );
   });
 
@@ -363,7 +363,7 @@ describe('XiaomiMiService', () => {
     expect(loggerService.error).toHaveBeenCalledTimes(1);
     expect(loggerService.error).toHaveBeenCalledWith(
       expect.stringContaining('Please configure a bindKey'),
-      'XiaomiMiService'
+      XiaomiMiService.name
     );
   });
 
@@ -373,7 +373,7 @@ describe('XiaomiMiService', () => {
     expect(loggerService.error).toHaveBeenCalledTimes(1);
     expect(loggerService.error).toHaveBeenCalledWith(
       expect.stringContaining('Service data length must be >= 5 bytes'),
-      'XiaomiMiService'
+      XiaomiMiService.name
     );
   });
 
@@ -388,7 +388,7 @@ describe('XiaomiMiService', () => {
     expect(loggerService.debug).toHaveBeenCalled();
     expect(loggerService.debug).toHaveBeenCalledWith(
       expect.stringContaining('supported data format not present'),
-      'XiaomiMiService'
+      XiaomiMiService.name
     );
   });
 
@@ -400,7 +400,7 @@ describe('XiaomiMiService', () => {
     expect(loggerService.error).toHaveBeenCalled();
     expect(loggerService.error).toHaveBeenCalledWith(
       expect.stringContaining('Unknown event type'),
-      'XiaomiMiService'
+      XiaomiMiService.name
     );
   });
 
@@ -537,7 +537,7 @@ describe('XiaomiMiService', () => {
     expect(loggerService.warn).toHaveBeenCalledTimes(1);
     expect(loggerService.warn).toHaveBeenCalledWith(
       expect.stringContaining('Error reading battery level'),
-      'XiaomiMiService'
+      XiaomiMiService.name
     );
   });