diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
index 25231f822f..8f0122aa4d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
@@ -20,6 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
 import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
@@ -29,8 +31,12 @@ import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.dao.AbstractJpaDaoTest;
 import org.thingsboard.server.dao.alarm.AlarmDao;
+import org.thingsboard.server.dao.tenant.TenantDao;
+import org.thingsboard.server.dao.tenant.TenantProfileDao;
 
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -54,6 +60,11 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
     @Autowired
     private AlarmDao alarmDao;
 
+    @Autowired
+    protected TenantProfileDao tenantProfileDao;
+
+    @Autowired
+    protected TenantDao tenantDao;
 
     @Test
     public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException, TimeoutException {
@@ -88,7 +99,8 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
 
     @Test
     public void createOrUpdateActiveAlarm() {
-        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        Tenant tenant = createTenant();
+        TenantId tenantId = tenant.getId();
         DeviceId deviceId = new DeviceId(UUID.randomUUID());
 
         AlarmCreateOrUpdateActiveRequest request = AlarmCreateOrUpdateActiveRequest.builder()
@@ -156,6 +168,9 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
         assertTrue(result.isModified());
         assertNotNull(result.getAlarm());
         assertNotEquals(newAlarmId, result.getAlarm().getUuidId());
+
+        tenantDao.removeById(TenantId.SYS_TENANT_ID, tenant.getUuidId());
+        tenantProfileDao.removeById(TenantId.SYS_TENANT_ID, tenant.getTenantProfileId().getId());
     }
 
     @Test
@@ -329,4 +344,23 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
         return alarmDao.save(TenantId.fromUUID(tenantId), alarm);
     }
 
+    private Tenant createTenant() {
+        TenantProfile tenantProfile = new TenantProfile();
+        tenantProfile.setName("My tenant profile " + UUID.randomUUID());
+        TenantProfileData profileData = new TenantProfileData();
+        profileData.setConfiguration(new DefaultTenantProfileConfiguration());
+        tenantProfile.setProfileData(profileData);
+        var savedTenantProfile = tenantProfileDao.save(TenantId.SYS_TENANT_ID, tenantProfile);
+        assertNotNull(savedTenantProfile);
+
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant " + UUID.randomUUID());
+        tenant.setTenantProfileId(savedTenantProfile.getId());
+        Tenant savedTenant = tenantDao.save(TenantId.SYS_TENANT_ID, tenant);
+
+        assertNotNull(savedTenant);
+
+        return savedTenant;
+    }
+
 }
diff --git a/dao/src/test/resources/sql/psql/drop-all-tables.sql b/dao/src/test/resources/sql/psql/drop-all-tables.sql
index 75b892452a..9c772df45b 100644
--- a/dao/src/test/resources/sql/psql/drop-all-tables.sql
+++ b/dao/src/test/resources/sql/psql/drop-all-tables.sql
@@ -19,6 +19,7 @@ DROP TABLE IF EXISTS admin_settings;
 DROP TABLE IF EXISTS entity_alarm;
 DROP TABLE IF EXISTS alarm_comment;
 DROP TABLE IF EXISTS alarm;
+DROP TABLE IF EXISTS alarm_type;
 DROP TABLE IF EXISTS asset;
 DROP TABLE IF EXISTS audit_log;
 DROP TABLE IF EXISTS attribute_kv;