diff --git a/src/app/tests/suites/DL_UsersAndCredentials.yaml b/src/app/tests/suites/DL_UsersAndCredentials.yaml
index 0a344d4883eba6..e86fbbe56dc053 100644
--- a/src/app/tests/suites/DL_UsersAndCredentials.yaml
+++ b/src/app/tests/suites/DL_UsersAndCredentials.yaml
@@ -562,7 +562,7 @@ tests:
               - name: "UserUniqueID"
                 value: 0xBABA
               - name: "UserStatus"
-                value: 2
+                value: UserStatusEnum.UnknownEnumValue(2)
               - name: "UserType"
                 value: null
               - name: "CredentialRule"
@@ -1031,7 +1031,7 @@ tests:
               - name: "UserIndex"
                 value: null
               - name: "UserStatus"
-                value: 2
+                value: UserStatusEnum.UnknownEnumValue(2)
               - name: "UserType"
                 value: null
       response:
diff --git a/src/app/tests/suites/TestAccessControlConstraints.yaml b/src/app/tests/suites/TestAccessControlConstraints.yaml
index 82e66b8d347c10..1a54ea48f92365 100644
--- a/src/app/tests/suites/TestAccessControlConstraints.yaml
+++ b/src/app/tests/suites/TestAccessControlConstraints.yaml
@@ -130,7 +130,7 @@ tests:
                   {
                       FabricIndex: 0,
                       Privilege: 3,
-                      AuthMode: 4, # INVALID
+                      AuthMode: AccessControlEntryAuthModeEnum.UnknownEnumValue,
                       Subjects: [],
                       Targets: null,
                   },
@@ -231,7 +231,7 @@ tests:
                   },
                   {
                       FabricIndex: 0,
-                      Privilege: 6, # INVALID
+                      Privilege: AccessControlEntryPrivilegeEnum.UnknownEnumValue,
                       AuthMode: 2, # CASE
                       Subjects: null,
                       Targets: null,
diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
index d51aea86b777f6..017d6ce6b6daf4 100644
--- a/src/app/tests/suites/TestCluster.yaml
+++ b/src/app/tests/suites/TestCluster.yaml
@@ -1066,7 +1066,7 @@ tests:
               - name: "arg1"
                 value: 20003
               - name: "arg2"
-                value: 101
+                value: SimpleEnum.UnknownEnumValue
       response:
           # Attempting to echo back the invalid enum value should fail.
           error: FAILURE
@@ -2814,7 +2814,7 @@ tests:
       command: "writeAttribute"
       attribute: "nullable_enum_attr"
       arguments:
-          value: 255
+          value: SimpleEnum.UnknownEnumValue(255)
       response:
           error: CONSTRAINT_ERROR
 
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
index bd173e7eb81427..12a6829c642048 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
@@ -1164,7 +1164,7 @@ tests:
                       FabricIndex: CurrentFabricIndexValue,
                   },
                   {
-                      Privilege: 6,
+                      Privilege: AccessControlEntryPrivilegeEnum.UnknownEnumValue,
                       AuthMode: 2,
                       Subjects: null,
                       Targets: null,
@@ -1192,7 +1192,7 @@ tests:
                   },
                   {
                       Privilege: 3,
-                      AuthMode: 4,
+                      AuthMode: AccessControlEntryAuthModeEnum.UnknownEnumValue,
                       Subjects: null,
                       Targets: null,
                       FabricIndex: CurrentFabricIndexValue,
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml
index 22ce1c1451f5a4..d2db93f33b1cd8 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml
@@ -66,8 +66,8 @@ tests:
           value:
               [
                   {
-                      Privilege: "4",
-                      AuthMode: "2",
+                      Privilege: AccessControlEntryPrivilegeEnum.Manage,
+                      AuthMode: AccessControlEntryAuthModeEnum.CASE,
                       Subjects: [CommissionerNodeId],
                       Targets: null,
                       FabricIndex: CurrentFabricIndexValue,
@@ -94,8 +94,8 @@ tests:
           value:
               [
                   {
-                      Privilege: "5",
-                      AuthMode: "2",
+                      Privilege: AccessControlEntryPrivilegeEnum.Administer,
+                      AuthMode: AccessControlEntryAuthModeEnum.CASE,
                       Subjects: [CommissionerNodeId],
                       Targets: null,
                       FabricIndex: CurrentFabricIndexValue,
diff --git a/src/app/tests/suites/certification/Test_TC_DRYERCTRL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DRYERCTRL_2_1.yaml
index e0a490cd60ec1c..ccd3b361249eb0 100644
--- a/src/app/tests/suites/certification/Test_TC_DRYERCTRL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRYERCTRL_2_1.yaml
@@ -60,7 +60,7 @@ tests:
           constraints:
               type: enum8
               minValue: 0
-              maxValue: 15
+              maxValue: 3
 
     - label:
           "Step 4:TH writes a supported SelectedDrynessLevel attribute that is
diff --git a/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml
index 6afdb920658f94..741fc878e8880f 100644
--- a/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml
@@ -86,4 +86,4 @@ tests:
           constraints:
               type: enum8
               minValue: 0
-              maxValue: 254
+              maxValue: LightSensorTypeEnum.UnknownEnumValue(254)
diff --git a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
index 379ed424638c9b..343539ce69e624 100644
--- a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
@@ -237,7 +237,7 @@ tests:
               - name: "EffectIdentifier"
                 value: 0
               - name: "EffectVariant"
-                value: 66
+                value: EffectVariantEnum.UnknownEnumValue(66)
 
     - label: "Check DUT executes a blink effect."
       cluster: "LogCommands"
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
index 7e365a9fae6ed5..4c6aaf38cdeb50 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
@@ -336,7 +336,7 @@ tests:
       command: "writeAttribute"
       attribute: "ActiveCalendarType"
       arguments:
-          value: 50
+          value: CalendarTypeEnum.UnknownEnumValue(50)
       response:
           error: CONSTRAINT_ERROR
 
@@ -345,6 +345,6 @@ tests:
       command: "writeAttribute"
       attribute: "HourFormat"
       arguments:
-          value: 5
+          value: HourFormatEnum.UnknownEnumValue(5)
       response:
           error: CONSTRAINT_ERROR
diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml
index a572f7e143dc43..b67c22a871ced9 100644
--- a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml
@@ -94,6 +94,6 @@ tests:
       arguments:
           # Per spec, if [TEMP] feature is enabled, then this attribute can be
           # one of 0 (Farenheit), 1 (Celsius) or 2 (Kelvin)
-          value: 5 # INVALID
+          value: TempUnitEnum.UnknownEnumValue(5)
       response:
           error: CONSTRAINT_ERROR
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
index 63aba52fe3f3f6..faf34fdea43e92 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
@@ -468,8 +468,12 @@ tests:
       response:
           constraints:
               type: enum8
-              minValue: 0
-              maxValue: 9
+              anyOf:
+                  [
+                      ThermostatRunningModeEnum.Off(0),
+                      ThermostatRunningModeEnum.Cool(3),
+                      ThermostatRunningModeEnum.Heat(4),
+                  ]
 
     - label: "Step 27: TH reads the StartOfWeek attribute from the DUT"
       PICS: TSTAT.S.F03