diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/audit/ActionTypeTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/audit/ActionTypeTest.java
index b76b0fc2b7..8c602c3cff 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/audit/ActionTypeTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/audit/ActionTypeTest.java
@@ -56,6 +56,8 @@ class ActionTypeTest {
         for (var type : types) {
             if (typesWithNullRuleEngineMsgType.contains(type)) {
                 assertThat(type.getRuleEngineMsgType()).isEmpty();
+            } else {
+                assertThat(type.getRuleEngineMsgType()).isPresent();
             }
         }
     }
diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
index 1323b7359d..a37eb31d72 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
@@ -62,6 +62,8 @@ class TbMsgTypeTest {
         for (var type : tbMsgTypes) {
             if (typesWithNullRuleNodeConnection.contains(type)) {
                 assertThat(type.getRuleNodeConnection()).isNull();
+            } else {
+                assertThat(type.getRuleNodeConnection()).isNotNull();
             }
         }
     }