diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java
index 577193ff94..428a21299d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java
@@ -152,6 +152,20 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queueService.saveQueue(queue);
     }
 
+    @Test(expected = DataValidationException.class)
+    public void testSaveQueueWithInvalidName() {
+        Queue queue = new Queue();
+        queue.setTenantId(tenantId);
+        queue.setName("Test 1");
+        queue.setTopic("tb_rule_engine.test");
+        queue.setPollInterval(25);
+        queue.setPartitions(1);
+        queue.setPackProcessingTimeout(2000);
+        queue.setSubmitStrategy(createTestSubmitStrategy());
+        queue.setProcessingStrategy(createTestProcessingStrategy());
+        queueService.saveQueue(queue);
+    }
+
     @Test(expected = DataValidationException.class)
     public void testSaveQueueWithEmptyTopic() {
         Queue queue = new Queue();
@@ -165,6 +179,20 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest {
         queueService.saveQueue(queue);
     }
 
+    @Test(expected = DataValidationException.class)
+    public void testSaveQueueWithInvalidTopic() {
+        Queue queue = new Queue();
+        queue.setTenantId(tenantId);
+        queue.setName("Test");
+        queue.setTopic("tb rule engine test");
+        queue.setPollInterval(25);
+        queue.setPartitions(1);
+        queue.setPackProcessingTimeout(2000);
+        queue.setSubmitStrategy(createTestSubmitStrategy());
+        queue.setProcessingStrategy(createTestProcessingStrategy());
+        queueService.saveQueue(queue);
+    }
+
     @Test(expected = DataValidationException.class)
     public void testSaveQueueWithEmptyPollInterval() {
         Queue queue = new Queue();