diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/MsgAck.java b/dao/src/main/java/org/thingsboard/server/dao/queue/db/MsgAck.java
similarity index 94%
rename from dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/MsgAck.java
rename to dao/src/main/java/org/thingsboard/server/dao/queue/db/MsgAck.java
index 1b1cd3f467..a1b039a1a7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/MsgAck.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/db/MsgAck.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.queue.db.nosql;
+package org.thingsboard.server.dao.queue.db;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilter.java b/dao/src/main/java/org/thingsboard/server/dao/queue/db/UnprocessedMsgFilter.java
similarity index 92%
rename from dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilter.java
rename to dao/src/main/java/org/thingsboard/server/dao/queue/db/UnprocessedMsgFilter.java
index c912e8e114..66eaa6d46b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilter.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/db/UnprocessedMsgFilter.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.queue.db.nosql;
+package org.thingsboard.server.dao.queue.db;
 
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.dao.queue.db.MsgAck;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/CassandraMsgQueue.java b/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/CassandraMsgQueue.java
index ceaab586cf..ce481b78b8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/CassandraMsgQueue.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/CassandraMsgQueue.java
@@ -26,6 +26,8 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.dao.queue.MsgQueue;
+import org.thingsboard.server.dao.queue.db.MsgAck;
+import org.thingsboard.server.dao.queue.db.UnprocessedMsgFilter;
 import org.thingsboard.server.dao.queue.db.repository.AckRepository;
 import org.thingsboard.server.dao.queue.db.repository.MsgRepository;
 import org.thingsboard.server.dao.util.NoSqlDao;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepository.java b/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepository.java
index 1ffbec3d81..ab7de0415b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepository.java
@@ -22,7 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.dao.nosql.CassandraAbstractDao;
-import org.thingsboard.server.dao.queue.db.nosql.MsgAck;
+import org.thingsboard.server.dao.queue.db.MsgAck;
 import org.thingsboard.server.dao.queue.db.repository.AckRepository;
 import org.thingsboard.server.dao.util.NoSqlDao;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/db/repository/AckRepository.java b/dao/src/main/java/org/thingsboard/server/dao/queue/db/repository/AckRepository.java
index 458dba81cb..6fbd2da57e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/db/repository/AckRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/db/repository/AckRepository.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.queue.db.repository;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.dao.queue.db.nosql.MsgAck;
+import org.thingsboard.server.dao.queue.db.MsgAck;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilterTest.java b/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilterTest.java
index 39a432d244..fd9bf21164 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilterTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilterTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.queue.db.nosql;
 import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.dao.queue.db.nosql.MsgAck;
-import org.thingsboard.server.dao.queue.db.nosql.UnprocessedMsgFilter;
+import org.thingsboard.server.dao.queue.db.MsgAck;
+import org.thingsboard.server.dao.queue.db.UnprocessedMsgFilter;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepositoryTest.java b/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepositoryTest.java
index f2b8c88f01..b2f38dc539 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepositoryTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepositoryTest.java
@@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.server.dao.service.AbstractServiceTest;
 import org.thingsboard.server.dao.service.DaoNoSqlTest;
-import org.thingsboard.server.dao.queue.db.nosql.MsgAck;
+import org.thingsboard.server.dao.queue.db.MsgAck;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties
index dbd8b84a4b..f2dab45491 100644
--- a/dao/src/test/resources/application-test.properties
+++ b/dao/src/test/resources/application-test.properties
@@ -30,4 +30,3 @@ redis.connection.db=0
 redis.connection.password=
 
 rule.queue.type=memory
-rule.queue.max_size=10000
\ No newline at end of file