diff --git a/scripts/tools/must.py b/scripts/tools/must.py
index 62d2d898ff93a4fd2457015c55ea5a07ca673aa2..2375bfe56128ec0019e8505367b161f2d7f8e517 100644
--- a/scripts/tools/must.py
+++ b/scripts/tools/must.py
@@ -130,16 +130,16 @@ class V18(AbstractTool):
             "MUST_ERROR_INTEGER_PRODUCT_GREATER_COMM_SIZE": ["InvalidParam"],
             "MUST_ERROR_GROUP_RANGE_RANK": ["InvalidParam"],
             "MUST_ERROR_GROUP_RANGE_STRIDE": ["InvalidParam"],
-            "MUST_ERROR_REQUEST_ACTIVE": ["DEADLOCK", "RequestLifeCycle", "InvalidParam"],
-            "MUST_ERROR_REQUEST_ACTIVE_ARRAY": ["DEADLOCK", "RequestLifeCycle"],
-            "MUST_ERROR_REQUEST_PARTITION_ACTIVE": ["DEADLOCK", "RequestLifeCycle"],
-            "MUST_ERROR_REQUEST_NOT_PARTITIONED_SEND": ["DEADLOCK", "RequestLifeCycle"],
-            "MUST_ERROR_REQUEST_NOT_PARTITIONED_RECV": ["DEADLOCK", "RequestLifeCycle"],
-            "MUST_ERROR_REQUEST_NOT_KNOWN": ["InvalidParam", "DEADLOCK", "RequestLifeCycle"],
-            "MUST_ERROR_REQUEST_NOT_KNOWN_ARRAY": ["InvalidParam", "DEADLOCK", "RequestLifeCycle"],
-            "MUST_ERROR_REQUEST_NULL": ["InvalidParam", "DEADLOCK", "RequestLifeCycle", "CallOrdering"],
-            "MUST_ERROR_REQUEST_NULL_ARRAY": ["DEADLOCK", "RequestLifeCycle"],
-            "MUST_ERROR_REQUEST_PERSISTENT_BUT_INACTIVE": ["DEADLOCK", "RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_ACTIVE": [ "RequestLifeCycle", "InvalidParam"],
+            "MUST_ERROR_REQUEST_ACTIVE_ARRAY": [ "RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_PARTITION_ACTIVE": ["RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_NOT_PARTITIONED_SEND": ["RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_NOT_PARTITIONED_RECV": ["RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_NOT_KNOWN": ["InvalidParam",  "RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_NOT_KNOWN_ARRAY": ["InvalidParam", "RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_NULL": ["InvalidParam", "RequestLifeCycle", "CallOrdering"],
+            "MUST_ERROR_REQUEST_NULL_ARRAY": [ "RequestLifeCycle"],
+            "MUST_ERROR_REQUEST_PERSISTENT_BUT_INACTIVE": [ "RequestLifeCycle"],
             "MUST_ERROR_COMM_UNKNWOWN": ["InvalidParam"],
             "MUST_ERROR_COMM_NULL": ["InvalidParam"],
             "MUST_ERROR_NOT_CART_COMM": ["InvalidParam"],
@@ -186,12 +186,12 @@ class V18(AbstractTool):
             "MUST_ERROR_TYPEMATCH_MISMATCH_BYTE": ["GlobalParameterMissmatch"],
             "MUST_ERROR_TYPEMATCH_LENGTH": ["InvalidParam", "LocalParameterMissmatch", "GlobalParameterMissmatch"],
             "MUST_ERROR_TYPEMATCH_ALIGNMENT": ["InvalidParam", "LocalParameterMissmatch"],
-            "MUST_ERROR_MESSAGE_LOST": ["DEADLOCK", "CallOrdering"],
-            "MUST_ERROR_COLLECTIVE_CALL_MISMATCH": ["DEADLOCK", "CallOrdering"],
+            "MUST_ERROR_MESSAGE_LOST": [ "CallOrdering"],
+            "MUST_ERROR_COLLECTIVE_CALL_MISMATCH": ["CallOrdering"],
             "MUST_ERROR_COLLECTIVE_OP_MISMATCH": ["GlobalParameterMissmatch"],
             "MUST_ERROR_COLLECTIVE_ROOT_MISMATCH": ["GlobalParameterMissmatch"],
             "MUST_ERROR_COLLECTIVE_BLOCKING_NONBLOCKING_MISMATCH": ["GlobalParameterMissmatch", "CallOrdering"],
-            "MUST_ERROR_DEADLOCK": ["DEADLOCK", "CallOrdering", "GlobalParameterMissmatch", "MissingCall", "InvalidParam"],
+            "MUST_ERROR_DEADLOCK": ["DEADLOCK"],
             "MUST_ERROR_BUFFER_REATTACH": ["TODO"],
             "MUST_ERROR_BUFFER_NOATTACHED": ["InvalidParam"],
             "MUST_ERROR_COUNTS_ARRAYS_DIFFER": ["TODO"],