diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
index 7d318f5522..08ac826c51 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
@@ -439,14 +439,14 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         assertThat(processedTemplates.get(NotificationDeliveryMethod.SLACK)).asInstanceOf(type(SlackDeliveryMethodNotificationTemplate.class))
                 .satisfies(template -> {
                     assertThat(template.getBody())
-                            .isEqualTo("Message for SLACK: ${recipientEmail}"); // ${recipientEmail} should not be processed
+                            .isEqualTo("Message for SLACK: "); // ${recipientEmail} should be removed
                 });
     }
 
     @Test
     public void testNotificationRequestInfo() throws Exception {
         NotificationDeliveryMethod[] deliveryMethods = new NotificationDeliveryMethod[]{
-                NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.EMAIL
+                NotificationDeliveryMethod.WEB
         };
         NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, "Test subject", "Test text", deliveryMethods);
         NotificationTarget target = createNotificationTarget(tenantAdminUserId);
@@ -465,8 +465,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
         wsClient.registerWaitForUpdate();
         NotificationTarget notificationTarget = createNotificationTarget(customerUserId);
-        NotificationRequest notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test :)",
-                NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.SMS);
+        NotificationRequest notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test :)", NotificationDeliveryMethod.WEB);
         wsClient.waitForUpdate();
 
         await().atMost(2, TimeUnit.SECONDS)
@@ -474,7 +473,6 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         NotificationRequestStats stats = getStats(notificationRequest.getId());
 
         assertThat(stats.getSent().get(NotificationDeliveryMethod.WEB)).hasValue(1);
-        assertThat(stats.getErrors().get(NotificationDeliveryMethod.SMS)).size().isOne();
     }
 
     @Test
@@ -559,7 +557,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         NotificationRequest successfulNotificationRequest = submitNotificationRequest(List.of(notificationTarget.getId()), notificationTemplate.getId(), 0);
         await().atMost(2, TimeUnit.SECONDS)
                 .until(() -> findNotificationRequest(successfulNotificationRequest.getId()).isSent());
-        verify(slackService).sendMessage(eq(tenantId), eq(slackToken), eq(conversationId), eq(slackNotificationTemplate.getBody()));
+        verify(slackService).sendMessage(eq(tenantId), eq(slackToken), eq(conversationId), eq("To Slack :)  "));
         NotificationRequestStats stats = getStats(successfulNotificationRequest.getId());
         assertThat(stats.getSent().get(NotificationDeliveryMethod.SLACK)).hasValue(1);
 
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
index f355d9072c..fdcb5e754c 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
@@ -232,20 +232,17 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
             double actualDelay = (double) (notification.getCreatedTime() - ts) / 1000;
             assertThat(actualDelay).isCloseTo(expectedDelay, offset(0.5));
 
-            AlarmStatus expectedStatus = AlarmStatus.ACTIVE_UNACK;
-            String expectedSeverity = AlarmSeverity.CRITICAL.toString().toLowerCase();
-
-            assertThat(notification.getSubject()).isEqualTo("Alarm type: " + alarmType + ", status: " + expectedStatus + ", " +
-                    "severity: " + expectedSeverity + ", deviceId: " + device.getId());
-            assertThat(notification.getText()).isEqualTo("Status: " + expectedStatus + ", severity: " + expectedSeverity);
+            assertThat(notification.getSubject()).isEqualTo("Alarm type: " + alarmType + ", status: " + AlarmStatus.ACTIVE_UNACK + ", " +
+                    "severity: " + AlarmSeverity.CRITICAL.toString().toLowerCase() + ", deviceId: " + device.getId());
+            assertThat(notification.getText()).isEqualTo("Status: " + AlarmStatus.ACTIVE_UNACK + ", severity: " + AlarmSeverity.CRITICAL.toString().toLowerCase());
 
             assertThat(notification.getType()).isEqualTo(NotificationType.ALARM);
             assertThat(notification.getInfo()).isInstanceOf(AlarmNotificationInfo.class);
             AlarmNotificationInfo info = (AlarmNotificationInfo) notification.getInfo();
             assertThat(info.getAlarmId()).isEqualTo(alarm.getUuidId());
             assertThat(info.getAlarmType()).isEqualTo(alarmType);
-            assertThat(info.getAlarmSeverity()).isEqualTo(expectedSeverity);
-            assertThat(info.getAlarmStatus()).isEqualTo(expectedStatus);
+            assertThat(info.getAlarmSeverity()).isEqualTo(AlarmSeverity.CRITICAL);
+            assertThat(info.getAlarmStatus()).isEqualTo(AlarmStatus.ACTIVE_UNACK);
         });
 
         clients.values().forEach(wsClient -> wsClient.registerWaitForUpdate());
@@ -256,8 +253,8 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
             wsClient.waitForUpdate(true);
             Notification updatedNotification = wsClient.getLastDataUpdate().getUpdate();
             assertThat(updatedNotification.getSubject()).isEqualTo("Alarm type: " + alarmType + ", status: " + expectedStatus + ", " +
-                    "severity: " + expectedSeverity + ", deviceId: " + device.getId());
-            assertThat(updatedNotification.getText()).isEqualTo("Status: " + expectedStatus + ", severity: " + expectedSeverity);
+                    "severity: " + expectedSeverity.toString().toLowerCase() + ", deviceId: " + device.getId());
+            assertThat(updatedNotification.getText()).isEqualTo("Status: " + expectedStatus + ", severity: " + expectedSeverity.toString().toLowerCase());
 
             wsClient.close();
         });
@@ -325,7 +322,7 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
         alarmSubscriptionService.clearAlarm(tenantId, alarm.getId(), System.currentTimeMillis(), null);
         getWsClient().waitForUpdate(true);
         notification = getWsClient().getLastDataUpdate().getUpdate();
-        assertThat(notification.getSubject()).isEqualTo("CRITICAL alarm '" + alarmType + "' is CLEARED_UNACK");
+        assertThat(notification.getSubject()).isEqualTo("critical alarm '" + alarmType + "' is CLEARED_UNACK");
 
         assertThat(findNotificationRequests(EntityType.ALARM).getData()).filteredOn(NotificationRequest::isScheduled).isEmpty();
     }