diff --git a/Tests/unit/core/test_message_unit.cpp b/Tests/unit/core/test_message_unit.cpp
index e2586d622..084e36196 100644
--- a/Tests/unit/core/test_message_unit.cpp
+++ b/Tests/unit/core/test_message_unit.cpp
@@ -541,11 +541,8 @@ namespace Core {
             }
         }
 
-        if (modules.size() > 0) {
-            EXPECT_TRUE(enabled);
-        } else {
-            EXPECT_FALSE(enabled);
-        }
+        EXPECT_GT(modules.size(), 0)
+        EXPECT_TRUE(enabled);
 
         // Effective only for exsting modules / controls for this category
         // Disable all controls within a category via metadata